summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-07-03 17:19:19 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-07-03 17:19:19 +0000
commitdedaa5562180bd874afddb7dca909f45b75a5ca4 (patch)
treef0ea926299d5bfc0bc633686a2b49ca915ee3be2 /src/game.cpp
parent1b834b68e187cf77f2d04dcf51f8aca0d4dfe4c8 (diff)
downloadmana-dedaa5562180bd874afddb7dca909f45b75a5ca4.tar.gz
mana-dedaa5562180bd874afddb7dca909f45b75a5ca4.tar.bz2
mana-dedaa5562180bd874afddb7dca909f45b75a5ca4.tar.xz
mana-dedaa5562180bd874afddb7dca909f45b75a5ca4.zip
Minor fixes and cleanups
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp10
1 files changed, 3 insertions, 7 deletions
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: