From b4c99db7d5a500770383e24ef2fd1f956b19da74 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 29 Dec 2015 02:16:49 +0100 Subject: Replaced leftover -1 view IDs with FAKE_NPC Signed-off-by: Haru --- src/map/npc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/map/npc.c b/src/map/npc.c index 09e5c0f46..5cb128b25 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2947,7 +2947,7 @@ const char* npc_skip_script(const char* start, const char* buffer, const char* f * * Example: * @code - * -script-1,{ + * -scriptFAKE_NPC,{ * * } * ,,,script,{ -- cgit v1.2.3-70-g09d2 From 32a42eeee18b16d9f904a409974dda575f3966c2 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 29 Dec 2015 02:17:26 +0100 Subject: Extended the numeric view ID deprecation to '-1' (FAKE_NPC) Signed-off-by: Haru --- src/map/npc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/npc.c b/src/map/npc.c index 5cb128b25..a7d4cdab0 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2569,8 +2569,7 @@ int npc_parseview(const char* w4, const char* start, const char* buffer, const c } else { // NPC has an ID specified for view id. val = atoi(w4); - if (val != FAKE_NPC) // TODO: Add this to the constants table and replace -1 with FAKE_NPC in the scripts, then remove this check. - ShowWarning("npc_parseview: Use of numeric NPC view IDs is deprecated and may be removed in a future update. Please use NPC view constants instead. ID '%d' specified in file '%s', line '%d'.\n", val, filepath, strline(buffer, start-buffer)); + ShowWarning("npc_parseview: Use of numeric NPC view IDs is deprecated and may be removed in a future update. Please use NPC view constants instead. ID '%d' specified in file '%s', line '%d'.\n", val, filepath, strline(buffer, start-buffer)); } return val; -- cgit v1.2.3-70-g09d2