Merge pull request 'traps' (#5) from traps into master

Reviewed-on: #5
Reviewed-by: jake <jake@sharnoth.com>

src/packet/messages.rs

@@ -584,10 +584,10 @@ pub struct KillMonster {
 
 //}
 
-//#[pso_message(0x80)]
-//pub struct PlayerTrapActivate {
-
-//}
+#[pso_message(0x80)]
+pub struct PlayerTrapActivate {
+    data: [u8; 4],
+}
 
 #[pso_message(0x83)]
 pub struct PlayerTrapSet {
@@ -1069,7 +1069,7 @@ pub enum GameMessage {
     //BmodeData(BmodeData),
     PlayerTrapSet(PlayerTrapSet),
     //Unknown84(Unknown84),
-    //PlayerTrapActivate(PlayerTrapActivate),
+    PlayerTrapActivate(PlayerTrapActivate),
     //PlayerShrink(PlayerShrink),
     //PlayerUnshrink(PlayerUnshrink),
     PlayerKilledByMonster(PlayerKilledByMonster),
@@ -1236,7 +1236,7 @@ impl PSOPacketData for GameMessage {
             //BmodeData::CMD => Ok(GameMessage::BmodeData(BmodeData::from_bytes(&mut cur)?)),
             PlayerTrapSet::CMD => Ok(GameMessage::PlayerTrapSet(PlayerTrapSet::from_bytes(&mut cur)?)),
             //Unknown84::CMD => Ok(GameMessage::Unknown84(Unknown84::from_bytes(&mut cur)?)),
-            //PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)),
+            PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)),
             //PlayerShrink::CMD => Ok(GameMessage::PlayerShrink(PlayerShrink::from_bytes(&mut cur)?)),
             //PlayerUnshrink::CMD => Ok(GameMessage::PlayerUnshrink(PlayerUnshrink::from_bytes(&mut cur)?)),
             PlayerKilledByMonster::CMD => Ok(GameMessage::PlayerKilledByMonster(PlayerKilledByMonster::from_bytes(&mut cur)?)),
@@ -1405,7 +1405,7 @@ impl PSOPacketData for GameMessage {
             //GameMessage::BmodeData(data) => data.as_bytes(),
             GameMessage::PlayerTrapSet(data) => data.as_bytes(),
             //GameMessage::Unknown84(data) => data.as_bytes(),
-            //GameMessage::PlayerTrapActivate(data) => data.as_bytes(),
+            GameMessage::PlayerTrapActivate(data) => data.as_bytes(),
             //GameMessage::PlayerShrink(data) => data.as_bytes(),
             //GameMessage::PlayerUnshrink(data) => data.as_bytes(),
             GameMessage::PlayerKilledByMonster(data) => data.as_bytes(),