diff options
| author | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
| commit | 0e990045fc308ca58421eda25838d3b9e7a10afa (patch) | |
| tree | 7966898e283b6759f226bd8222de161fb64772c2 /src | |
| parent | e95c473c694f4fccb40584f3e6a00323f91e36ee (diff) | |
| parent | 32a42eeee18b16d9f904a409974dda575f3966c2 (diff) | |
| download | hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.gz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.bz2 hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.xz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.zip | |
Merge branch 'AnnieRuru-request_29' into hercules
Closes #1000 as merged
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/npc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 09e5c0f46..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; @@ -2947,7 +2946,7 @@ const char* npc_skip_script(const char* start, const char* buffer, const char* f * * Example: * @code - * -<TAB>script<TAB><NPC Name><TAB>-1,{ + * -<TAB>script<TAB><NPC Name><TAB>FAKE_NPC,{ * <code> * } * <map name>,<x>,<y>,<facing><TAB>script<TAB><NPC Name><TAB><sprite id>,{ |