diff options
| -rw-r--r-- | The Mana World.dev | 48 | ||||
| -rw-r--r-- | src/engine.cpp | 2 | ||||
| -rw-r--r-- | src/game.cpp | 22 | ||||
| -rw-r--r-- | src/gui/equipmentwindow.cpp (renamed from src/gui/equipment.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/equipmentwindow.h (renamed from src/gui/equipment.h) | 0 |
5 files changed, 67 insertions, 7 deletions
diff --git a/The Mana World.dev b/The Mana World.dev index 653456ad..0f7eb3be 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -1,7 +1,7 @@ [Project] FileName=The Mana World.dev Name=tmw -UnitCount=147 +UnitCount=151 Type=0 Ver=1 ObjFiles= @@ -12,7 +12,7 @@ ResourceIncludes= MakeIncludes= Compiler=-Dmain=SDL_main_@@_ CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_-DUSE_OPENGL_@@_ -Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lz_@@_-lphysfs_@@_-lcurl_@@_ +Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lz_@@_-lphysfs_@@_-lcurl_@@_-lwinmm_@@_ IsCpp=1 Icon=The Mana World.ico ExeOutput= @@ -228,7 +228,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit49] -FileName=src\gui\equipment.h +FileName=src\gui\equipmentwindow.h CompileCpp=1 Folder=gui Compile=1 @@ -1128,7 +1128,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit48] -FileName=src\gui\equipment.cpp +FileName=src\gui\equipmentwindow.cpp CompileCpp=1 Folder=gui Compile=1 @@ -1527,3 +1527,43 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= +[Unit148] +FileName=src\item.h +CompileCpp=1 +Folder=tmw +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit149] +FileName=src\equipment.cpp +CompileCpp=1 +Folder=tmw +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit150] +FileName=src\equipment.h +CompileCpp=1 +Folder=tmw +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit151] +FileName=src\item.cpp +CompileCpp=1 +Folder=tmw +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + diff --git a/src/engine.cpp b/src/engine.cpp index 8992dfc8..a92805b3 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -43,7 +43,7 @@ #include "gui/npc.h" #include "gui/stats.h" #include "gui/setup.h" -#include "gui/equipment.h" +#include "gui/equipmentwindow.h" #include "gui/popupmenu.h" //#include "gui/buddywindow.h" #include "gui/help.h" diff --git a/src/game.cpp b/src/game.cpp index 0b5411a1..5ab9470f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -36,7 +36,7 @@ #include "gui/npc.h" #include "gui/stats.h" #include "gui/setup.h" -#include "gui/equipment.h" +#include "gui/equipmentwindow.h" #include "gui/popupmenu.h" #include "gui/npc_text.h" #include "gui/trade.h" @@ -950,6 +950,8 @@ void do_parse() being->direction = get_direction(RFIFOP(46)); being->walk_time = tick_time; being->frame = 0; + + logger->log("0x01d8% i %i", RFIFOW(18), RFIFOW(20)); if (RFIFOB(51) == 2) { @@ -1600,6 +1602,21 @@ void do_parse() break; // Equipment related case 0x01d7: + being = findNode(RFIFOL(2)); + if (being != NULL) { + case 529: + case 1199: + break; + case 521: + case 522: + case 530: + case 536: + case 1200: + case 1201: + being->weapon = 0; + break; + } + logger->log("1d7 %i %i %i %i", RFIFOL(2), RFIFOB(6), RFIFOW(7), RFIFOW(9)); break; // Answer to unequip item @@ -1733,6 +1750,9 @@ void do_parse() if (being) strcpy(being->name, RFIFOP(6)); break; + // Change in players look + case 0x0119: + std::cout << RFIFOL(2) << " " << RFIFOW(6) << " " << RFIFOW(8) << " " << RFIFOW(10) << " " << RFIFOB(12) << std::endl; // Manage non implemented packets default: logger->log("Unhandled packet: %x", id); diff --git a/src/gui/equipment.cpp b/src/gui/equipmentwindow.cpp index dbfc4f8d..8410750c 100644 --- a/src/gui/equipment.cpp +++ b/src/gui/equipmentwindow.cpp @@ -22,7 +22,7 @@ */ #include <guichan.hpp> -#include "gui/equipment.h" +#include "equipmentwindow.h" #include "../equipment.h" #include "../log.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/equipment.h b/src/gui/equipmentwindow.h index 5670d065..5670d065 100644 --- a/src/gui/equipment.h +++ b/src/gui/equipmentwindow.h |