diff options
-rw-r--r-- | src/game.cpp | 6 | ||||
-rw-r--r-- | src/graphic/graphic.cpp | 5 | ||||
-rw-r--r-- | tmw.ini | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp index 834d475b..ab50a863 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -410,7 +410,7 @@ void do_parse() { break; // Monster moving case 0x007b: - case 0x01da: + //case 0x01da: node = find_node(RFIFOL(2)); if(node==NULL) { node = create_node(); @@ -429,7 +429,7 @@ void do_parse() { } break; // Being moving - /*case 0x01da: + case 0x01da: node = find_node(RFIFOL(2)); if(node==NULL) { node = create_node(); @@ -449,7 +449,7 @@ void do_parse() { if(node->action==WALK)node->tick_time = tick_time; set_coordinates(node->coordinates, get_dest_x(RFIFOP(50)), get_dest_y(RFIFOP(50)), direction); } - break;*/ + break; // NPC dialog case 0x00b4: if(!strstr(npc_text, RFIFOP(8))) { diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 4840e0a9..bda6a7dc 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -313,6 +313,10 @@ void do_graphic(void) { break; case 4: sell_dialog[3].d1 = get_item_quantity(sell_dialog[4].d1); + /*if(sell_dialog[3].d2>sell_dialog[3].d1) { + sell_dialog[3].d2 = sell_dialog[3].d1; + sprintf((char *)sell_dialog[5].dp, "%i %i", sell_dialog[3].d1, sell_dialog[3].d2); + }*/ dialog_message(sell_dialog, MSG_DRAW, 0, 0); if(!gui_update(sell_player)) { show_npc_dialog = shutdown_dialog(sell_player); @@ -325,6 +329,7 @@ void do_graphic(void) { WFIFOSET(8); } show_npc_dialog = 0; + sell_dialog[3].d2 = 0; sell_player = init_dialog(sell_dialog, -1); close_shop(); } @@ -29,4 +29,4 @@ stretch = 1 [login] remember = 1 -username = test2 +username = elven |