summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-08-22 11:12:25 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-08-22 11:12:25 +0100
commit191114cfa6774d7024cf392794ffa7fd97ee8ebd (patch)
tree38b010eb878deef1ffa40ec9cf50edb5cbae3d28
parente713cfd91f9781bd22c1fafbc613bcc1b89e94db (diff)
downloadmanamarket-191114cfa6774d7024cf392794ffa7fd97ee8ebd.tar.gz
manamarket-191114cfa6774d7024cf392794ffa7fd97ee8ebd.tar.bz2
manamarket-191114cfa6774d7024cf392794ffa7fd97ee8ebd.tar.xz
manamarket-191114cfa6774d7024cf392794ffa7fd97ee8ebd.zip
Clean up more of the packet code.
-rwxr-xr-xmain.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/main.py b/main.py
index 9150ea1..6aff6ef 100755
--- a/main.py
+++ b/main.py
@@ -589,14 +589,7 @@ def main():
player_node.id = packet.read_int32()
player_node.EXP = packet.read_int32()
player_node.MONEY = packet.read_int32()
- packet.skip(30)
- player_node.HP = packet.read_int16()
- player_node.MAX_HP = packet.read_int16()
- player_node.MP = packet.read_int16()
- player_node.MAX_MP = packet.read_int16()
- packet.skip(8)
- player_node.LEVEL = packet.read_int16()
- packet.skip(14)
+ packet.skip(62)
player_node.name = packet.read_string(24)
packet.skip(6)
slot = packet.read_int8()
@@ -830,7 +823,7 @@ def main():
mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
trader_state.complete = 1
- elif response == 4:
+ else:
logging.info("Trade response: Trade cancelled")
trader_state.reset()