[gunzemulator] r359 committed - REMOVED SHIT.

[gunzem...@googlecode.com]

Revision: 359
Author: cg.wowus.cg
Date: Tue Jun 29 11:27:27 2010
Log: REMOVED SHIT.
http://code.google.com/p/gunzemulator/source/detail?r=359

Deleted:
/trunk/gunz/src/ChannelTraits.cpp
/trunk/gunz/src/MatchMaker.cpp
/trunk/gunz/src/PlayerTraits.cpp
/trunk/include/gunz/PlayerTraits.h
Modified:
/trunk/gunz/src/CMakeLists.txt

=======================================
--- /trunk/gunz/src/ChannelTraits.cpp Mon Jun 28 16:57:36 2010
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <gunz/ChannelTraits.h>
-
-using namespace std;
-using namespace boost;
-
-namespace gunz {
-
-ChannelTraits::ChannelTraits()
- : uid(0),
- name("<<unnamed>>"),
- maxPlayers(200),
- rule(CR_ELITE),
- type(CT_GENERAL),
- minLevel(0),
- maxLevel(255)
-{
-}
-
-ChannelTraits::ChannelTraits(
- MUID _uid,
- const string& _name,
- uint32_t _maxPlayers,
- ChannelRule _rule,
- ChannelType _type,
- uint8_t _minLevel,
- uint8_t _maxLevel)
- : uid(_uid),
- name(_name),
- maxPlayers(_maxPlayers),
- rule(_rule),
- type(_type),
- minLevel(_minLevel),
- maxLevel(_maxLevel)
-{
-}
-
-ChannelTraits::ChannelTraits(const ChannelTraits& other)
- : uid(other.uid),
- name(other.name),
- maxPlayers(other.maxPlayers),
- rule(other.rule),
- type(other.type),
- minLevel(other.minLevel),
- maxLevel(other.maxLevel)
-{
-}
-
-bool ChannelTraits::operator<(const ChannelTraits& other) const
-{
- return uid < other.uid;
-}
-
-bool ChannelTraits::operator==(const ChannelTraits& other) const
-{
- return uid == other.uid;
-}
-
-ChannelTraits::~ChannelTraits()
-{
-}
-
-}
=======================================
--- /trunk/gunz/src/MatchMaker.cpp Mon Jun 28 16:57:36 2010
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <gunz/MatchMaker.h>
-#include <gunz/ChannelTraits.h>
-#include <gunz/simple_types.h>
-
-#include <util/SmallVector.h>
-
-#include <cstddef>
-#include <cassert>
-#include <algorithm>
-
-#include <boost/thread/shared_mutex.hpp>
-
-using namespace std;
-using namespace boost;
-
-typedef lock_guard<shared_mutex> ExclusiveLock;
-typedef shared_lock<shared_mutex> SharedLock;
-
-namespace gunz {
-
-struct MatchMaker::Data
-{
- // This mutex protects ALL accesses through MatchMaker. Use it wisely.
- mutable shared_mutex lock;
-
- SmallVector<ChannelTraits, 32> channels;
- MUIDSanta* santa;
-};
-
-MatchMaker::MatchMaker(MUIDSanta* santa)
- : d(new Data)
-{
- assert(santa);
- d->santa = santa;
-}
-
-void MatchMaker::add_channel(const ChannelTraits& traits)
-{
- ExclusiveLock e(d->lock);
- d->channels.push_back(traits);
-}
-
-void MatchMaker::remove_channel(MUID muid)
-{
- ChannelTraits t;
- t.uid = muid;
-
- ChannelTraits* location = NULL;
- ChannelTraits* end = NULL;
- {
- SharedLock s(d->lock);
- location = find(d->channels.begin(), (end = d->channels.end()), t);
- }
-
- assert(location);
- assert(end);
-
- if(location == NULL || end == NULL || location == end)
- return;
-
- ExclusiveLock e(d->lock);
- d->channels.erase(location);
-}
-
-vector<ChannelTraits> MatchMaker::get_channel_list() const
-{
- SharedLock s(d->lock);
- return vector<ChannelTraits>(d->channels.begin(), d->channels.end());
-}
-
-MatchMaker::~MatchMaker()
-{
- delete d;
-}
-
-}
=======================================
--- /trunk/gunz/src/PlayerTraits.cpp Mon Jun 28 08:53:44 2010
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <gunz/PlayerTraits.h>
-
-using namespace std;
-using namespace boost;
-
-namespace gunz {
-
-PlayerTraits::PlayerTraits()
-{
-}
-
-PlayerTraits::PlayerTraits(
- MUID _muid,
- const std::string& _name,
- const std::string& _clanName,
- boost::uint8_t _level,
- PlayerTraits::PlayerLocation _location,
- boost::uint8_t _ugradeid,
- boost::int32_t _clanid)
- : muid(_muid), name(_name), clanName(_clanName), level(_level),
- location(_location), ugradeid(_ugradeid), clanid(_clanid)
-{
-}
-
-PlayerTraits::~PlayerTraits()
-{
-}
-
-}
=======================================
--- /trunk/include/gunz/PlayerTraits.h Mon Jun 28 08:53:44 2010
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-#include <string>
-
-#include <boost/cstdint.hpp>
-
-#include <gunz/simple_types.h>
-
-namespace gunz {
-
-struct PlayerTraits
-{
- enum PlayerLocation
- {
- PL_OUTSIDE,
- PL_LOBBY,
- PL_STAGE,
- PL_BATTLE
- };
-
- MUID muid;
- std::string name;
- std::string clanName;
- boost::uint8_t level;
- PlayerLocation location;
- boost::uint8_t ugradeid;
- boost::int32_t clanid;
-
- PlayerTraits();
-
- PlayerTraits(
- MUID muid,
- const std::string& name,
- const std::string& clanName,
- boost::uint8_t level,
- PlayerLocation location,
- boost::uint8_t ugradeid,
- boost::int32_t clanid
- );
-
- ~PlayerTraits();
-};
-
-}
=======================================
--- /trunk/gunz/src/CMakeLists.txt Mon Jun 28 16:57:36 2010
+++ /trunk/gunz/src/CMakeLists.txt Tue Jun 29 11:27:27 2010
@@ -1,8 +1,5 @@
set(GUNZ_SRC
- ChannelTraits.cpp
- MatchMaker.cpp
MUIDSanta.cpp
- PlayerTraits.cpp
# More sources here!
)