Modified:
/trunk/gogo/src/GoGoClient.cpp
/trunk/gogo/src/GoGoClient.h
/trunk/gogo/src/GoGoFactory.h
/trunk/gunz/src/Channel.cpp
/trunk/gunz/src/ChannelList.cpp
/trunk/gunz/src/MUIDSanta.cpp
/trunk/gunz/src/PlayerTraits.cpp
/trunk/include/gunz/Channel.h
/trunk/include/gunz/ChannelList.h
/trunk/include/gunz/MUIDSanta.h
/trunk/include/gunz/Player.h
/trunk/include/gunz/PlayerTraits.h
/trunk/include/gunz/simple_types.h
=======================================
--- /trunk/gogo/src/GoGoClient.cpp Sun Jun 27 09:06:34 2010
+++ /trunk/gogo/src/GoGoClient.cpp Mon Jun 28 08:53:44 2010
@@ -14,7 +14,7 @@
using namespace boost;
using namespace cockpit;
-GoGoClient::GoGoClient(Logger* _logger, MUIDSanta* _santa, GunzDB*
_database)
+GoGoClient::GoGoClient(Logger* _logger, gunz::MUIDSanta* _santa, GunzDB*
_database)
{
assert(_logger);
logger = _logger;
=======================================
--- /trunk/gogo/src/GoGoClient.h Sat Jun 26 07:09:54 2010
+++ /trunk/gogo/src/GoGoClient.h Mon Jun 28 08:53:44 2010
@@ -13,7 +13,7 @@
class Logger;
}
-class MUIDSanta;
+namespace gunz { class MUIDSanta; }
class GunzDB;
typedef boost::uint64_t MUID;
@@ -27,13 +27,13 @@
cockpit::packet::Registry* registry;
GunzDB* database;
- MUIDSanta* santa;
+ gunz::MUIDSanta* santa;
MUID myMUID;
AccountInfo myAccount;
CharacterInfo myCharacter;
public:
- GoGoClient(cockpit::Logger* logger, MUIDSanta* santa, GunzDB* database);
+ GoGoClient(cockpit::Logger* logger, gunz::MUIDSanta* santa, GunzDB*
database);
~GoGoClient();
void initialize(cockpit::Transmitter* transmitter,
cockpit::packet::Registry* registry);
=======================================
--- /trunk/gogo/src/GoGoFactory.h Sun Jun 27 09:06:34 2010
+++ /trunk/gogo/src/GoGoFactory.h Mon Jun 28 08:53:44 2010
@@ -9,7 +9,7 @@
{
private:
cockpit::Logger* logger;
- MUIDSanta santa;
+ gunz::MUIDSanta santa;
GunzDB* database;
public:
=======================================
--- /trunk/gunz/src/Channel.cpp Sat Jun 26 14:21:44 2010
+++ /trunk/gunz/src/Channel.cpp Mon Jun 28 08:53:44 2010
@@ -1,3 +1,8 @@
#include <gunz/Channel.h>
+namespace gunz {
+
// TODO(Clark): Channel implementation.
+
+}
+
=======================================
--- /trunk/gunz/src/ChannelList.cpp Sat Jun 26 14:21:44 2010
+++ /trunk/gunz/src/ChannelList.cpp Mon Jun 28 08:53:44 2010
@@ -3,6 +3,8 @@
using namespace std;
using namespace boost;
+namespace gunz {
+
vector<const Channel*> ChannelList::get_some(function<bool (const
Channel*)> predicate) const
{
vector<const Channel*> ret(activeChannels.size());
@@ -25,3 +27,5 @@
ChannelList::~ChannelList()
{
}
+
+}
=======================================
--- /trunk/gunz/src/MUIDSanta.cpp Sun Jun 27 09:06:30 2010
+++ /trunk/gunz/src/MUIDSanta.cpp Mon Jun 28 08:53:44 2010
@@ -4,6 +4,8 @@
#include <windows.h>
#endif
+namespace gunz {
+
MUIDSanta::MUIDSanta()
: next(1) // Gunz doesn't like it when we give out MUIDs of 0.
{
@@ -31,3 +33,5 @@
// to make this algorithm "right", or any more complex until a bug report
// is filed.
}
+
+}
=======================================
--- /trunk/gunz/src/PlayerTraits.cpp Sat Jun 26 14:21:44 2010
+++ /trunk/gunz/src/PlayerTraits.cpp Mon Jun 28 08:53:44 2010
@@ -3,6 +3,8 @@
using namespace std;
using namespace boost;
+namespace gunz {
+
PlayerTraits::PlayerTraits()
{
}
@@ -23,3 +25,5 @@
PlayerTraits::~PlayerTraits()
{
}
+
+}
=======================================
--- /trunk/include/gunz/Channel.h Sun Jun 27 12:31:05 2010
+++ /trunk/include/gunz/Channel.h Mon Jun 28 08:53:44 2010
@@ -1,6 +1,8 @@
#pragma once
#include <gunz/simple_types.h>
+namespace gunz {
+
// TODO(Clark): Flesh this out.
class Channel
{
@@ -54,3 +56,5 @@
Stage
*/
};
+
+}
=======================================
--- /trunk/include/gunz/ChannelList.h Sat Jun 26 17:21:41 2010
+++ /trunk/include/gunz/ChannelList.h Mon Jun 28 08:53:44 2010
@@ -9,6 +9,8 @@
#include <util/SmallVector.h>
+namespace gunz {
+
class ChannelList : boost::noncopyable
{
private:
@@ -55,3 +57,5 @@
~ChannelList();
};
+
+}
=======================================
--- /trunk/include/gunz/MUIDSanta.h Sun Jun 27 09:06:30 2010
+++ /trunk/include/gunz/MUIDSanta.h Mon Jun 28 08:53:44 2010
@@ -1,6 +1,8 @@
#pragma once
#include <gunz/simple_types.h>
+namespace gunz {
+
// This class controls the MUIDs of various in-game objects.
class MUIDSanta
{
@@ -12,3 +14,5 @@
MUID get();
void give_back(MUID id);
};
+
+}
=======================================
--- /trunk/include/gunz/Player.h Sat Jun 26 17:21:41 2010
+++ /trunk/include/gunz/Player.h Mon Jun 28 08:53:44 2010
@@ -1,9 +1,13 @@
#pragma once
#include <string>
+namespace gunz {
+
class Player
{
public:
virtual void HandleChannelMessage(const std::string& speaker, const
std::string& message) = 0;
virtual void HandleGameMessage(const std::string& speaker, const
std::string& message) = 0;
};
+
+}
=======================================
--- /trunk/include/gunz/PlayerTraits.h Sat Jun 26 17:21:41 2010
+++ /trunk/include/gunz/PlayerTraits.h Mon Jun 28 08:53:44 2010
@@ -5,6 +5,8 @@
#include <gunz/simple_types.h>
+namespace gunz {
+
struct PlayerTraits
{
enum PlayerLocation
@@ -37,3 +39,5 @@
~PlayerTraits();
};
+
+}
=======================================
--- /trunk/include/gunz/simple_types.h Sat Jun 26 17:21:41 2010
+++ /trunk/include/gunz/simple_types.h Mon Jun 28 08:53:44 2010
@@ -3,6 +3,8 @@
#pragma once
#include <boost/cstdint.hpp>
+namespace gunz {
+
enum UserGrade
{
UG_GUEST,
@@ -138,3 +140,5 @@
};
typedef boost::uint64_t MUID;
+
+}