diff options
| -rw-r--r-- | src/being.cpp | 4 | ||||
| -rw-r--r-- | src/engine.cpp | 2 | ||||
| -rw-r--r-- | src/engine.h | 2 | ||||
| -rw-r--r-- | src/game.cpp | 10 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/being.cpp b/src/being.cpp index cd0a31c9..578d4be0 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -395,10 +395,10 @@ bool Being::isPlayer() bool Being::isNpc() { - return job > 45 && job < 126; + return job >= 100 && job < 200; } bool Being::isMonster() { - return job > 200; + return job >= 1000 && job < 1200; } diff --git a/src/engine.cpp b/src/engine.cpp index 3fb50276..a7317708 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -37,7 +37,7 @@ char itemCurrenyQ[10] = "0"; int map_x, map_y, camera_x, camera_y; -char npc_button[10] = "Close"; +//char npc_button[10] = "Close"; gcn::Label *debugInfo; diff --git a/src/engine.h b/src/engine.h index 1d0e6d3a..eb99237e 100644 --- a/src/engine.h +++ b/src/engine.h @@ -49,7 +49,7 @@ #include "graphic/spriteset.h" extern int map_x, map_y, camera_x, camera_y; -extern char npc_button[10]; +//extern char npc_button[10]; extern ChatWindow *chatWindow; extern StatusWindow *statusWindow; diff --git a/src/game.cpp b/src/game.cpp index bee62b0c..181b7d6f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -788,7 +788,7 @@ void do_parse() { if (RFIFOB(6) == 1) { // Death - if (being->job > 110) + if (being->isMonster()) { being->action = MONSTER_DEAD; being->frame = 0; @@ -1459,14 +1459,10 @@ void do_parse() remove_floor_item(net_l_value(RFIFOL(2))); } break; - // Next button in NPC dialog + // Next/Close button in NPC dialog case 0x00b5: - strcpy(npc_button, "Next"); - current_npc = RFIFOL(2); - break; - // Close button in NPC dialog case 0x00b6: - strcpy(npc_button, "Close"); + // Unused break; // List in NPC dialog case 0x00b7: |