summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 11:04:30 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 11:04:30 +0000
commit1a89ef9c1411199ebdfdf87837613a35b72914f1 (patch)
treed62b4d4734df140d036c5b58aa6c018088b56a47 /src/map/script.c
parent6f305abdd5de99afd4114d9ed1d9b4df1f166980 (diff)
downloadhercules-1a89ef9c1411199ebdfdf87837613a35b72914f1.tar.gz
hercules-1a89ef9c1411199ebdfdf87837613a35b72914f1.tar.bz2
hercules-1a89ef9c1411199ebdfdf87837613a35b72914f1.tar.xz
hercules-1a89ef9c1411199ebdfdf87837613a35b72914f1.zip
* Some NPC event related cleaning.
- Made event label deprecation message a warning rather than an error, as the scripts still work regardless of whether '::On' is used or not (since r6592). - Introduced constant EVENT_NAME_LENGTH (51) for all event name struct fields to eliminate size inconsistency across all objects (was 50 and 51). - Fixed event names, that are considered special attributes, were not wiped when the value was 0 (since r5707). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14817 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 739104f32..bf0b4f652 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -585,7 +585,7 @@ static void check_event(struct script_state *st, const char *evt)
}
else
{
- ShowError("NPC event parameter deprecated! Please use 'NPCNAME::OnEVENT' instead of '%s'.\n", evt);
+ ShowWarning("NPC event parameter deprecated! Please use 'NPCNAME::OnEVENT' instead of '%s'.\n", evt);
script_reportsrc(st);
}
}
@@ -8187,8 +8187,8 @@ BUILDIN_FUNC(cmdothernpc) // Added by RoVeRT
{
const char* npc = script_getstr(st,2);
const char* command = script_getstr(st,3);
- char event[51];
- snprintf(event, 51, "%s::OnCommand%s", npc, command);
+ char event[EVENT_NAME_LENGTH];
+ snprintf(event, sizeof(event), "%s::OnCommand%s", npc, command);
check_event(st, event);
npc_event_do(event);
return 0;