diff options
| author | Mateusz Kaduk <mateusz.kaduk@gmail.com> | 2005-06-16 08:30:34 +0000 |
|---|---|---|
| committer | Mateusz Kaduk <mateusz.kaduk@gmail.com> | 2005-06-16 08:30:34 +0000 |
| commit | 8d801b2c43f7dfd0b279bb263480d38f5694ac06 (patch) | |
| tree | 82b3382ad67d297373cec74a74d7db60b3dd4def /src/game.cpp | |
| parent | 06afc063b8538b90b8dd8eb662a9ae0e11812963 (diff) | |
| download | mana-8d801b2c43f7dfd0b279bb263480d38f5694ac06.tar.gz mana-8d801b2c43f7dfd0b279bb263480d38f5694ac06.tar.bz2 mana-8d801b2c43f7dfd0b279bb263480d38f5694ac06.tar.xz mana-8d801b2c43f7dfd0b279bb263480d38f5694ac06.zip | |
Added action menu (moved trading to menu)
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index f6a2133f..95a74568 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -61,6 +61,8 @@ Engine *engine = NULL; OkDialog *deathNotice = NULL; ConfirmDialog *exitConfirm = NULL; +Being *target = NULL; + #define EMOTION_TIME 150 #define MAX_TIME 10000 @@ -322,10 +324,6 @@ void do_input() // buddyWindow->setVisible(!buddyWindow->isVisible()); // used = true; //} - //else if (keysym.sym == SDLK_m) { - // menu->setVisible(!menu->isVisible()); - // used = true; - //} } if (event.key.keysym.sym == SDLK_ESCAPE) @@ -416,10 +414,10 @@ void do_input() attack(target); } else if (target->isPlayer()) { - // Begin a trade - WFIFOW(0) = net_w_value(0x00e4); - WFIFOL(2) = net_l_value(target->id); - WFIFOSET(6); + // Show menu + menu->setVisible(!menu->isVisible()); + // Pass target to menu + menu->setBeing(target); } } } |