[gunzemulator] r353 committed - Removed a dependance on a privately declared MUID type.

[gunzem...@googlecode.com]

Revision: 353
Author: cg.wowus.cg
Date: Mon Jun 28 08:58:55 2010
Log: Removed a dependance on a privately declared MUID type.
http://code.google.com/p/gunzemulator/source/detail?r=353

Modified:
/trunk/gogo/src/GoGoClient.h
/trunk/gogo/src/modules/OnCharCreate.cpp
/trunk/gogo/src/modules/OnCharDelete.cpp
/trunk/gogo/src/modules/OnMatchLogin.cpp
/trunk/gogo/src/modules/handshake.cpp

=======================================
--- /trunk/gogo/src/GoGoClient.h Mon Jun 28 08:53:44 2010
+++ /trunk/gogo/src/GoGoClient.h Mon Jun 28 08:58:55 2010
@@ -4,6 +4,8 @@
#include <database/AccountInfo.h>
#include <database/CharacterInfo.h>

+#include <gunz/simple_types.h>
+
#include <string>

#include <boost/cstdint.hpp>
@@ -14,11 +16,9 @@
}

namespace gunz { class MUIDSanta; }
+
class GunzDB;

-typedef boost::uint64_t MUID;
-
-using namespace boost;
class GoGoClient : public cockpit::ClientHandler
{
private:
@@ -28,7 +28,7 @@
GunzDB* database;

gunz::MUIDSanta* santa;
- MUID myMUID;
+ gunz::MUID myMUID;
AccountInfo myAccount;
CharacterInfo myCharacter;

@@ -44,10 +44,10 @@

void OnMatchLogin(const std::string& username, const std::string&
password, boost::int32_t commandVersion, boost::uint32_t nChecksumPack);
void OnCharList();
- void OnCharCreate(MUID uidPlayer, uint32_t charMarker, const std::string&
charName, uint32_t charSex, uint32_t charHair, uint32_t charFace, uint32_t
charCostume);
- void OnCharDelete(MUID uid, uint32_t marker, const std::string& name);
+ void OnCharCreate(gunz::MUID uidPlayer, uint32_t charMarker, const
std::string& charName, uint32_t charSex, uint32_t charHair, uint32_t
charFace, uint32_t charCostume);
+ void OnCharDelete(gunz::MUID uid, uint32_t marker, const std::string&
name);
void OnCharInfo(uint8_t marker);
- void OnCharSelect(MUID uid, uint8_t marker);
+ void OnCharSelect(gunz::MUID uid, uint8_t marker);

boost::array<boost::uint8_t, 32>
handshake(boost::asio::ip::tcp::socket& s) const;
=======================================
--- /trunk/gogo/src/modules/OnCharCreate.cpp Sun Jun 27 16:05:47 2010
+++ /trunk/gogo/src/modules/OnCharCreate.cpp Mon Jun 28 08:58:55 2010
@@ -23,7 +23,7 @@
));
}

-void GoGoClient::OnCharCreate(MUID /* uidPlayer */, uint32_t charMarker,
const std::string& charName, uint32_t charSex, uint32_t charHair, uint32_t
charFace, uint32_t charCostume)
+void GoGoClient::OnCharCreate(gunz::MUID /* uidPlayer */, uint32_t
charMarker, const std::string& charName, uint32_t charSex, uint32_t
charHair, uint32_t charFace, uint32_t charCostume)
{
if(!myAccount.isValid)
return transmitter->disconnect();
=======================================
--- /trunk/gogo/src/modules/OnCharDelete.cpp Sun Jun 27 13:12:05 2010
+++ /trunk/gogo/src/modules/OnCharDelete.cpp Mon Jun 28 08:58:55 2010
@@ -15,7 +15,7 @@
using namespace boost;
using namespace cockpit;

-void GoGoClient::OnCharDelete(MUID /* uidPlayer */, uint32_t charMarker,
const std::string& /* charName */)
+void GoGoClient::OnCharDelete(gunz::MUID /* uidPlayer */, uint32_t
charMarker, const std::string& /* charName */)
{
if(!myAccount.isValid)
return transmitter->disconnect();
=======================================
--- /trunk/gogo/src/modules/OnMatchLogin.cpp Sun Jun 27 09:35:34 2010
+++ /trunk/gogo/src/modules/OnMatchLogin.cpp Mon Jun 28 08:58:55 2010
@@ -25,7 +25,7 @@
const char* account,
uint8_t ugrade,
uint8_t pgrade,
- MUID muid)
+ gunz::MUID muid)
{
packet::blob encryptMSG(1, 20);
encryptMSG.add_param(packet::zeros(20));
=======================================
--- /trunk/gogo/src/modules/handshake.cpp Sat Jun 26 14:21:44 2010
+++ /trunk/gogo/src/modules/handshake.cpp Mon Jun 28 08:58:55 2010
@@ -12,17 +12,17 @@
{
boost::uint16_t Header;
boost::uint32_t Size;
- MUID ServerId;
- MUID PlayerId;
+ gunz::MUID ServerId;
+ gunz::MUID PlayerId;

// Never used; MAIET is retarded. We just set this to 0x0DEADCA7 to be
cool.
boost::uint32_t Timestamp;

- Handshake(MUID player);
+ Handshake(gunz::MUID player);
};
}

-Handshake::Handshake(MUID player)
+Handshake::Handshake(gunz::MUID player)
{
Header = 10;
Size = 26;
@@ -31,7 +31,7 @@
Timestamp = 0x0DEADCA7;
}

-static array<uint8_t, 26> make_handshake(MUID myMUID, array<uint8_t, 32>&
cryptoKey)
+static array<uint8_t, 26> make_handshake(gunz::MUID myMUID, array<uint8_t,
32>& cryptoKey)
{
uint32_t tempValues[3] = { 0 };
uint8_t* cryptkeyPtr = cryptoKey.c_array();
@@ -76,8 +76,8 @@
//Create the packet.
packetPtr = memory::pcopy(packetPtr, &handshake.Header,
sizeof(boost::uint16_t));
packetPtr = memory::pcopy(packetPtr, &handshake.Size,
sizeof(boost::uint32_t));
- packetPtr = memory::pcopy(packetPtr, &handshake.ServerId, sizeof(MUID));
- packetPtr = memory::pcopy(packetPtr, &handshake.PlayerId, sizeof(MUID));
+ packetPtr = memory::pcopy(packetPtr, &handshake.ServerId,
sizeof(gunz::MUID));
+ packetPtr = memory::pcopy(packetPtr, &handshake.PlayerId,
sizeof(gunz::MUID));
packetPtr = memory::pcopy(packetPtr, &handshake.Timestamp,
sizeof(boost::uint32_t));

return packet;