summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-07-17 22:00:10 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-07-17 22:00:10 +0000
commit35b1b1f16978017a39e0951c9ee74115567a0407 (patch)
tree4b6ee8018db97cf28e880bcfb4b56cef7d79eaa1 /src
parent9bf3338f82bfbd425debb2855d015c7bd0e33989 (diff)
downloadmana-35b1b1f16978017a39e0951c9ee74115567a0407.tar.gz
mana-35b1b1f16978017a39e0951c9ee74115567a0407.tar.bz2
mana-35b1b1f16978017a39e0951c9ee74115567a0407.tar.xz
mana-35b1b1f16978017a39e0951c9ee74115567a0407.zip
Fixing linking issues
Diffstat (limited to 'src')
-rw-r--r--src/engine.cpp2
-rw-r--r--src/game.cpp22
-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
4 files changed, 23 insertions, 3 deletions
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