shop_sell #4

Merged
jake merged 3 commits from shop_sell into master 4 years ago
  1. 18
      src/packet/messages.rs

18
src/packet/messages.rs

@ -810,12 +810,12 @@ pub struct GiveCharacterExp {
exp: u32, exp: u32,
} }
//#[pso_message(0xC0)]
//pub struct PlayerSoldItem {
// client_id: u16,
// item_id: u8,
// amount: u8,
//}
#[pso_message(0xC0)]
pub struct PlayerSoldItem {
item_id: u32,
amount: u8,
// TODO: other data?
}
//#[pso_message(0xC1)] //#[pso_message(0xC1)]
//pub struct TeamInvite { //pub struct TeamInvite {
@ -1098,7 +1098,7 @@ pub enum GameMessage {
TekAccept(TekAccept), TekAccept(TekAccept),
BankRequest(BankRequest), BankRequest(BankRequest),
BankInteraction(BankInteraction), BankInteraction(BankInteraction),
//PlayerSoldItem(PlayerSoldItem),
PlayerSoldItem(PlayerSoldItem),
//TeamInvite(TeamInvite), //TeamInvite(TeamInvite),
//AcceptTeamInvite(AcceptTeamInvite), //AcceptTeamInvite(AcceptTeamInvite),
CreateItem(CreateItem), CreateItem(CreateItem),
@ -1263,7 +1263,7 @@ impl PSOPacketData for GameMessage {
TekAccept::CMD => Ok(GameMessage::TekAccept(TekAccept::from_bytes(&mut cur)?)), TekAccept::CMD => Ok(GameMessage::TekAccept(TekAccept::from_bytes(&mut cur)?)),
BankRequest::CMD => Ok(GameMessage::BankRequest(BankRequest::from_bytes(&mut cur)?)), BankRequest::CMD => Ok(GameMessage::BankRequest(BankRequest::from_bytes(&mut cur)?)),
BankInteraction::CMD => Ok(GameMessage::BankInteraction(BankInteraction::from_bytes(&mut cur)?)), BankInteraction::CMD => Ok(GameMessage::BankInteraction(BankInteraction::from_bytes(&mut cur)?)),
//PlayerSoldItem::CMD => Ok(GameMessage::PlayerSoldItem(PlayerSoldItem::from_bytes(&mut cur)?)),
PlayerSoldItem::CMD => Ok(GameMessage::PlayerSoldItem(PlayerSoldItem::from_bytes(&mut cur)?)),
//TeamInvite::CMD => Ok(GameMessage::TeamInvite(TeamInvite::from_bytes(&mut cur)?)), //TeamInvite::CMD => Ok(GameMessage::TeamInvite(TeamInvite::from_bytes(&mut cur)?)),
//AcceptTeamInvite::CMD => Ok(GameMessage::AcceptTeamInvite(AcceptTeamInvite::from_bytes(&mut cur)?)), //AcceptTeamInvite::CMD => Ok(GameMessage::AcceptTeamInvite(AcceptTeamInvite::from_bytes(&mut cur)?)),
CreateItem::CMD => Ok(GameMessage::CreateItem(CreateItem::from_bytes(&mut cur)?)), CreateItem::CMD => Ok(GameMessage::CreateItem(CreateItem::from_bytes(&mut cur)?)),
@ -1430,7 +1430,7 @@ impl PSOPacketData for GameMessage {
GameMessage::TekAccept(data) => data.as_bytes(), GameMessage::TekAccept(data) => data.as_bytes(),
GameMessage::BankRequest(data) => data.as_bytes(), GameMessage::BankRequest(data) => data.as_bytes(),
GameMessage::BankInteraction(data) => data.as_bytes(), GameMessage::BankInteraction(data) => data.as_bytes(),
//GameMessage::PlayerSoldItem(data) => data.as_bytes(),
GameMessage::PlayerSoldItem(data) => data.as_bytes(),
//GameMessage::TeamInvite(data) => data.as_bytes(), //GameMessage::TeamInvite(data) => data.as_bytes(),
//GameMessage::AcceptTeamInvite(data) => data.as_bytes(), //GameMessage::AcceptTeamInvite(data) => data.as_bytes(),
GameMessage::CreateItem(data) => data.as_bytes(), GameMessage::CreateItem(data) => data.as_bytes(),

Loading…
Cancel
Save