From 2c6d82abe3c82041991066ca84ac067771756818 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Mon, 15 Nov 2010 12:14:30 +0100 Subject: Added Message::NullBase and Message::BoostBase. Edited Message::GameStart to contain list of players. --- common/message.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 14 deletions(-) (limited to 'common/message.cpp') diff --git a/common/message.cpp b/common/message.cpp index 526a3fd..a72bac9 100644 --- a/common/message.cpp +++ b/common/message.cpp @@ -1,6 +1,51 @@ #include "message.h" +#include +#include + #include +#include + +Message::Base::Base(Type t) : type(t) { + +} + +Message::NullBase::NullBase(Type t) : Base(t) { + +} + +std::pair Message::NullBase::serialize() { + return std::pair(0, 0); +} + +void Message::NullBase::deserialize(uint8_t* data, std::size_t bytes) { + +} + +Message::BoostBase::BoostBase(Type t) : Base(t) { + +} + +std::pair Message::BoostBase::serialize() { + std::ostringstream os; + boost::archive::text_oarchive oa(os); + + serialize(oa); + + std::size_t s = os.str().size(); + uint8_t* buf = new uint8_t[s]; + + memcpy(buf, os.str().c_str(), s); + + return std::pair(buf, s); +} + +void Message::BoostBase::deserialize(uint8_t* data, std::size_t bytes) { + std::istringstream is(std::string((char*)data, bytes)); + boost::archive::text_iarchive ia(is); + + deserialize(ia); +} Message::Hello::Hello() : Base(Types::Hello) { @@ -64,26 +109,18 @@ void Message::LoginResponse::deserialize(uint8_t* data, std::size_t bytes) { login_ok = bool(data[0]); } -Message::GameStart::GameStart() : Base(Types::GameStart) { +Message::GameStart::GameStart() : BoostBase(Types::GameStart) { } -std::pair Message::GameStart::serialize() { - return std::pair(0, 0); -} - -void Message::GameStart::deserialize(uint8_t* data, std::size_t bytes) { - +void Message::GameStart::serialize(boost::archive::text_oarchive& ar) { + ar & players; } -Message::Ready::Ready() : Base(Types::Ready) { - -} - -std::pair Message::Ready::serialize() { - return std::pair(0, 0); +void Message::GameStart::deserialize(boost::archive::text_iarchive& ar) { + ar & players; } -void Message::Ready::deserialize(uint8_t* data, std::size_t bytes) { +Message::Ready::Ready() : NullBase(Types::Ready) { } -- cgit v1.2.3