diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-04-08 08:00:44 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-04-08 08:00:44 +0000 |
| commit | 7c2c4d75a1f459b46c08883c282af0afb61fceb9 (patch) | |
| tree | 382da0652e90cf985ba3617facc111542ff2caf5 | |
| parent | dd3c4cd4ca9a36c001a0b46691b457e0bf1a2fd5 (diff) | |
| download | mana-7c2c4d75a1f459b46c08883c282af0afb61fceb9.tar.gz mana-7c2c4d75a1f459b46c08883c282af0afb61fceb9.tar.bz2 mana-7c2c4d75a1f459b46c08883c282af0afb61fceb9.tar.xz mana-7c2c4d75a1f459b46c08883c282af0afb61fceb9.zip | |
Reenabling trade
| -rw-r--r-- | The Mana World.dev | 7 | ||||
| -rw-r--r-- | src/game.cpp | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/The Mana World.dev b/The Mana World.dev index 76b36a90..9b5309c3 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -1193,7 +1193,7 @@ BuildCmd= Compile=1 [Unit114] -FileName=src\gui\requesttrade.cpp +FileName=src\gui\requesttrade.h CompileCpp=1 Folder=gui Compile=1 @@ -1203,11 +1203,12 @@ OverrideBuildCmd=0 BuildCmd= [Unit115] -FileName=src\gui\requesttrade.h +FileName=src\gui\requesttrade.cpp CompileCpp=1 Folder=gui +Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 BuildCmd= -Compile=1 + diff --git a/src/game.cpp b/src/game.cpp index 40118805..d4e1ed6f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -358,7 +358,7 @@ void do_input() WFIFOSET(7); current_npc = id; } - } /* + } else { id = find_pc(mx, my); if (id != 0) { @@ -367,7 +367,7 @@ void do_input() WFIFOL(2) = net_l_value(id); WFIFOSET(6); } - } */ + } } } else if (event.type == SDL_QUIT) |