diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | The Mana World.dev | 32 | ||||
| -rw-r--r-- | src/gui/npc.cpp | 24 |
3 files changed, 45 insertions, 17 deletions
@@ -1,3 +1,8 @@ +2005-09-17 Eugenio Favalli <elvenprogrammer@gmail.com> + + * The Mana World.dev, src/gui/npc.cpp: Updated dev-cpp project file to + last changes, and fixed the bug with npc lists I introduced earlier. + 2005-09-18 Duane Bailey <nayryeliab@gmail.com> * game.cpp: added weight notice; now notifies person when they @@ -35,7 +40,6 @@ png. 2005-09-17 Duane Bailey <nayryeliab@gmail.com> ->>>>>>> 1.203 * src/net/messagin.cpp, src/net/messageout.cpp, src/net/network.cpp: removed replaced MACOSX defines with big endian defines diff --git a/The Mana World.dev b/The Mana World.dev index 75512155..17fc2249 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -1,7 +1,7 @@ [Project] FileName=The Mana World.dev Name=tmw -UnitCount=171 +UnitCount=173 Type=0 Ver=1 ObjFiles= @@ -12,7 +12,7 @@ ResourceIncludes= MakeIncludes= Compiler= CppCompiler=-DUSE_OPENGL_@@_ -Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lSDL_net_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-lxml2_@@_-lopengl32_@@_-lz_@@_-lphysfs_@@_-lcurl_@@_ +Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lSDL_net_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-lxml2_@@_-lopengl32_@@_-lpng_@@_-lz_@@_-lphysfs_@@_-lcurl_@@_ IsCpp=1 Icon=The Mana World.ico ExeOutput= @@ -1730,7 +1730,7 @@ BuildCmd= [Unit168] FileName=src\gui\menuwindow.cpp CompileCpp=1 -Folder=gui +Folder=gui/source Compile=1 Link=1 Priority=1000 @@ -1740,7 +1740,7 @@ BuildCmd= [Unit169] FileName=src\gui\menuwindow.h CompileCpp=1 -Folder=gui +Folder=gui/header Compile=1 Link=1 Priority=1000 @@ -1750,7 +1750,7 @@ BuildCmd= [Unit170] FileName=src\gui\ministatus.cpp CompileCpp=1 -Folder=gui +Folder=gui/source Compile=1 Link=1 Priority=1000 @@ -1760,7 +1760,27 @@ BuildCmd= [Unit171] FileName=src\gui\ministatus.h CompileCpp=1 -Folder=gui +Folder=gui/header +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit172] +FileName=src\resources\imagewriter.cpp +CompileCpp=1 +Folder=resources +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit173] +FileName=src\resources\imagewriter.h +CompileCpp=1 +Folder=resources Compile=1 Link=1 Priority=1000 diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp index 696b2825..122cffa6 100644 --- a/src/gui/npc.cpp +++ b/src/gui/npc.cpp @@ -111,7 +111,7 @@ NpcListDialog::reset() void NpcListDialog::action(const std::string& eventId) { - int choice = 0xff; // 0xff means cancel + int choice = 0; if (eventId == "ok") { @@ -123,15 +123,19 @@ NpcListDialog::action(const std::string& eventId) } } else if (eventId == "cancel") - { + { + choice = 0xff; // 0xff means cancel } - MessageOut outMsg; - outMsg.writeShort(CMSG_NPC_LIST_CHOICE); - outMsg.writeLong(current_npc); - outMsg.writeByte(choice); - writeSet(7); - setVisible(false); - reset(); - current_npc = 0; + if (choice) + { + MessageOut outMsg; + outMsg.writeShort(CMSG_NPC_LIST_CHOICE); + outMsg.writeLong(current_npc); + outMsg.writeByte(choice); + writeSet(7); + setVisible(false); + reset(); + current_npc = 0; + } } |