diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-14 10:05:49 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-14 10:05:49 +0000 |
| commit | eda1e14f9d7de0c4123f7d823a774d818fa75148 (patch) | |
| tree | 52fd30eb75b7c7c3f81a41626ddf9d810fae9f54 /src/map/script.c | |
| parent | 7a8dc0434b420af441041e2ec2fe32ee614c4555 (diff) | |
| download | hercules-eda1e14f9d7de0c4123f7d823a774d818fa75148.tar.gz hercules-eda1e14f9d7de0c4123f7d823a774d818fa75148.tar.bz2 hercules-eda1e14f9d7de0c4123f7d823a774d818fa75148.tar.xz hercules-eda1e14f9d7de0c4123f7d823a774d818fa75148.zip | |
* Fixed map-server printing deprecation message, when monster event label was used as transport for special attributes (small/large monsters etc.) in script command 'monster' and related commands (bugreport:1274, since r6592, related r5707).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14814 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c index 39daede0e..739104f32 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -577,9 +577,17 @@ static void disp_error_message2(const char *mes,const char *pos,int report) /// Checks event parameter validity static void check_event(struct script_state *st, const char *evt) { - if( evt != NULL && *evt != '\0' && !stristr(evt,"::On") ){ - ShowError("NPC event parameter deprecated! Please use 'NPCNAME::OnEVENT' instead of '%s'.\n",evt); - script_reportsrc(st); + if( evt && evt[0] && !stristr(evt, "::On") ) + { + if( npc_event_isspecial(evt) ) + { + ; // portable small/large monsters or other attributes + } + else + { + ShowError("NPC event parameter deprecated! Please use 'NPCNAME::OnEVENT' instead of '%s'.\n", evt); + script_reportsrc(st); + } } } |