summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-08-22 10:58:00 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-08-22 10:58:00 +0100
commite713cfd91f9781bd22c1fafbc613bcc1b89e94db (patch)
tree33500dc42d6b8915343c7d720d62f32b21001f39
parent5aa34d1f2b0034f0f07009a83c611fa7de41a63e (diff)
downloadmanamarket-e713cfd91f9781bd22c1fafbc613bcc1b89e94db.tar.gz
manamarket-e713cfd91f9781bd22c1fafbc613bcc1b89e94db.tar.bz2
manamarket-e713cfd91f9781bd22c1fafbc613bcc1b89e94db.tar.xz
manamarket-e713cfd91f9781bd22c1fafbc613bcc1b89e94db.zip
Remove some more unnecessary packet handling.
-rwxr-xr-xmain.py50
1 files changed, 2 insertions, 48 deletions
diff --git a/main.py b/main.py
index a6c5a03..9150ea1 100755
--- a/main.py
+++ b/main.py
@@ -675,36 +675,10 @@ def main():
if nick != "guild":
process_whisper(nick, utils.remove_colors(message), mapserv)
- elif packet.is_type(SMSG_PLAYER_CHAT): # server speech
- msg_len = packet.read_int16() - 2
- being_id = packet.read_int32()
- message = packet.read_string(msg_len)
-
- elif packet.is_type(SMSG_BEING_CHAT): # char speech
- msg_len = packet.read_int16() - 2
- being_id = packet.read_int32()
- message = packet.read_string(msg_len)
-
- elif packet.is_type(SMSG_WALK_RESPONSE):
- packet.read_int32()
- coord_data = packet.read_coord_pair()
- player_node.x = coord_data[2]
- player_node.y = coord_data[3]
-
elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
stat_type = packet.read_int16()
value = packet.read_int32()
- if stat_type == 0x0005:
- player_node.HP = value
- elif stat_type == 0x0006:
- player_node.MaxHP = value
- elif stat_type == 0x0007:
- player_node.MP = value
- elif stat_type == 0x0008:
- player_node.MaxMP = value
- elif stat_type == 0x000b:
- player_node.LEVEL = value
- elif stat_type == 0x0018:
+ if stat_type == 0x0018:
logging.info("Weight changed from %s/%s to %s/%s", \
player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
player_node.WEIGHT = value
@@ -715,9 +689,7 @@ def main():
elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
stat_type = packet.read_int16()
value = packet.read_int32()
- if stat_type == 0x0001:
- player_node.EXP = value
- elif stat_type == 0x0014:
+ if stat_type == 0x0014:
logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
player_node.MONEY = value
@@ -737,23 +709,6 @@ def main():
requestName.write_int32(being_id)
mapserv.sendall(str(requestName))
- packet.skip(8)
-
- if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
- packet.read_int32()
-
- packet.skip(22)
-
- if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
- coord_data = packet.read_coord_pair()
- beingManager.container[being_id].dst_x = coord_data[2]
- beingManager.container[being_id].dst_y = coord_data[3]
- else:
- coord_data = packet.read_coord_dir()
- beingManager.container[being_id].x = coord_data[0]
- beingManager.container[being_id].y = coord_data[1]
- beingManager.container[being_id].direction = coord_data[2]
-
elif packet.is_type(SMSG_BEING_NAME_RESPONSE):
being_id = packet.read_int32()
if being_id in beingManager.container:
@@ -999,7 +954,6 @@ def main():
logging.info("Trade Complete.")
else:
pass
- #print "Unhandled Packet: %s" % hex(packet.get_type())
# On Disconnect/Exit
shop_broadcaster.stop()