diff options
Diffstat (limited to 'src/game-server')
28 files changed, 63 insertions, 63 deletions
diff --git a/src/game-server/accountconnection.hpp b/src/game-server/accountconnection.hpp index fc593497..9acb6ab7 100644 --- a/src/game-server/accountconnection.hpp +++ b/src/game-server/accountconnection.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ACCOUNTCONNECTION_H_ -#define _TMW_ACCOUNTCONNECTION_H_ +#ifndef ACCOUNTCONNECTION_H +#define ACCOUNTCONNECTION_H #include "net/messageout.hpp" #include "net/connection.hpp" @@ -171,4 +171,4 @@ class AccountConnection : public Connection extern AccountConnection *accountHandler; -#endif // _TMW_ACCOUNTCONNECTION_H_ +#endif // ACCOUNTCONNECTION_H diff --git a/src/game-server/actor.hpp b/src/game-server/actor.hpp index e2cc912a..0c116c53 100644 --- a/src/game-server/actor.hpp +++ b/src/game-server/actor.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ACTOR_H_ -#define _TMWSERV_ACTOR_H_ +#ifndef ACTOR_H +#define ACTOR_H #include "point.h" #include "game-server/map.hpp" @@ -142,4 +142,4 @@ class Actor : public Thing unsigned char mSize; /**< Radius of bounding circle. */ }; -#endif // _TMWSERV_ACTOR_H_ +#endif // ACTOR_H diff --git a/src/game-server/being.hpp b/src/game-server/being.hpp index 35c3bb62..b9cd7039 100644 --- a/src/game-server/being.hpp +++ b/src/game-server/being.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_BEING_H_ -#define _TMWSERV_BEING_H_ +#ifndef BEING_H +#define BEING_H #include <string> #include <vector> @@ -389,4 +389,4 @@ class Being : public Actor Timers mTimers; }; -#endif // _TMWSERV_BEING_H_ +#endif // BEING_H diff --git a/src/game-server/buysell.hpp b/src/game-server/buysell.hpp index b178b38d..20c2bcfc 100644 --- a/src/game-server/buysell.hpp +++ b/src/game-server/buysell.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_BUYSELL_HPP_ -#define _TMWSERV_GAMESERVER_BUYSELL_HPP_ +#ifndef GAMESERVER_BUYSELL_HPP +#define GAMESERVER_BUYSELL_HPP #include <vector> diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp index 78e96616..c32b46f8 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHARACTER_HPP_ -#define _TMWSERV_CHARACTER_HPP_ +#ifndef CHARACTER_HPP +#define CHARACTER_HPP #include <map> #include <string> @@ -434,4 +434,4 @@ class Character : public Being { return Map::BLOCKTYPE_CHARACTER; } }; -#endif // _TMWSERV_CHARACTER_HPP_ +#endif // CHARACTER_HPP diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.hpp index d0731e94..f08ce40f 100644 --- a/src/game-server/collisiondetection.hpp +++ b/src/game-server/collisiondetection.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_COLLISIONDETECTION_H -#define _TMW_COLLISIONDETECTION_H +#ifndef COLLISIONDETECTION_H +#define COLLISIONDETECTION_H class Point; diff --git a/src/game-server/commandhandler.hpp b/src/game-server/commandhandler.hpp index 3268c146..63b87a13 100644 --- a/src/game-server/commandhandler.hpp +++ b/src/game-server/commandhandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_COMMANDHANDLER_ -#define _TMW_SERVER_COMMANDHANDLER_ +#ifndef SERVER_COMMANDHANDLER_HPP +#define SERVER_COMMANDHANDLER_HPP #include <string> @@ -34,4 +34,4 @@ namespace CommandHandler void handleCommand(Character *player, const std::string &command); } -#endif //_TMW_SERVER_COMMANDHANDLER_H +#endif //SERVER_COMMANDHANDLER_H diff --git a/src/game-server/effect.hpp b/src/game-server/effect.hpp index 15db5d2e..a635f11b 100644 --- a/src/game-server/effect.hpp +++ b/src/game-server/effect.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_EFFECT_H -#define _TMWSERV_EFFECT_H +#ifndef EFFECT_H +#define EFFECT_H #include "game-server/actor.hpp" #include "game-server/being.hpp" diff --git a/src/game-server/eventlistener.hpp b/src/game-server/eventlistener.hpp index fe59124f..5b8b53bb 100644 --- a/src/game-server/eventlistener.hpp +++ b/src/game-server/eventlistener.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_EVENTLISTENER_ -#define _TMWSERV_GAMESERVER_EVENTLISTENER_ +#ifndef GAMESERVER_EVENTLISTENER_HPP +#define GAMESERVER_EVENTLISTENER_HPP class Thing; class Being; diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.hpp index e9d9fb20..061984de 100644 --- a/src/game-server/gamehandler.hpp +++ b/src/game-server/gamehandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_GAMEHANDLER_ -#define _TMW_SERVER_GAMEHANDLER_ +#ifndef SERVER_GAMEHANDLER_HPP +#define SERVER_GAMEHANDLER_HPP #include "game-server/character.hpp" #include "net/connectionhandler.hpp" diff --git a/src/game-server/item.hpp b/src/game-server/item.hpp index f5e12a57..9bb68ce9 100644 --- a/src/game-server/item.hpp +++ b/src/game-server/item.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ITEM -#define _TMWSERV_ITEM +#ifndef ITEM_HPP +#define ITEM_HPP #include <vector> diff --git a/src/game-server/itemmanager.hpp b/src/game-server/itemmanager.hpp index 2737642a..bc142fd4 100644 --- a/src/game-server/itemmanager.hpp +++ b/src/game-server/itemmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMMANAGER_H -#define _TMW_ITEMMANAGER_H +#ifndef ITEMMANAGER_H +#define ITEMMANAGER_H #include <string> diff --git a/src/game-server/map.hpp b/src/game-server/map.hpp index 4de34f08..6a5fd6cf 100644 --- a/src/game-server/map.hpp +++ b/src/game-server/map.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAP_H -#define _TMW_MAP_H +#ifndef MAP_H +#define MAP_H #include <list> #include <map> diff --git a/src/game-server/mapcomposite.hpp b/src/game-server/mapcomposite.hpp index c55cfcdf..669fc7d8 100644 --- a/src/game-server/mapcomposite.hpp +++ b/src/game-server/mapcomposite.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_MAPCOMPOSITE_ -#define _TMW_SERVER_MAPCOMPOSITE_ +#ifndef SERVER_MAPCOMPOSITE_HPP +#define SERVER_MAPCOMPOSITE_HPP #include <string> #include <vector> diff --git a/src/game-server/mapmanager.hpp b/src/game-server/mapmanager.hpp index 5abdd78f..9aa76889 100644 --- a/src/game-server/mapmanager.hpp +++ b/src/game-server/mapmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAPMANAGER_H -#define _TMW_MAPMANAGER_H +#ifndef MAPMANAGER_H +#define MAPMANAGER_H #include <map> #include <string> diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp index f6194e97..b9acc0b7 100644 --- a/src/game-server/monster.hpp +++ b/src/game-server/monster.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MONSTER_H_ -#define _TMWSERV_MONSTER_H_ +#ifndef MONSTER_H +#define MONSTER_H #include <map> #include <vector> @@ -345,4 +345,4 @@ class Monster : public Being friend struct MonsterTargetEventDispatch; }; -#endif // _TMWSERV_MONSTER_H_ +#endif // MONSTER_H diff --git a/src/game-server/monstermanager.hpp b/src/game-server/monstermanager.hpp index 8af9a662..87795bae 100644 --- a/src/game-server/monstermanager.hpp +++ b/src/game-server/monstermanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MONSTERMANAGER_HPP_ -#define _TMWSERV_MONSTERMANAGER_HPP_ +#ifndef MONSTERMANAGER_HPP +#define MONSTERMANAGER_HPP #include <string> diff --git a/src/game-server/npc.hpp b/src/game-server/npc.hpp index 279ab6cf..46b71573 100644 --- a/src/game-server/npc.hpp +++ b/src/game-server/npc.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_NPC_HPP_ -#define _TMWSERV_GAMESERVER_NPC_HPP_ +#ifndef GAMESERVER_NPC_HPP +#define GAMESERVER_NPC_HPP #include "game-server/being.hpp" diff --git a/src/game-server/postman.hpp b/src/game-server/postman.hpp index ed9d0c1f..ae3537ae 100644 --- a/src/game-server/postman.hpp +++ b/src/game-server/postman.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_POSTMAN_H_ -#define _TMW_POSTMAN_H_ +#ifndef POSTMAN_H +#define POSTMAN_H #include <map> diff --git a/src/game-server/quest.hpp b/src/game-server/quest.hpp index 917a093b..f1f1d4c4 100644 --- a/src/game-server/quest.hpp +++ b/src/game-server/quest.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_QUEST_ -#define _TMWSERV_GAMESERVER_QUEST_ +#ifndef GAMESERVER_QUEST_HPP +#define GAMESERVER_QUEST_HPP #include <string> diff --git a/src/game-server/resourcemanager.hpp b/src/game-server/resourcemanager.hpp index 7c346f19..d8f733c3 100644 --- a/src/game-server/resourcemanager.hpp +++ b/src/game-server/resourcemanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RESOURCE_MANAGER_H -#define _TMW_RESOURCE_MANAGER_H +#ifndef RESOURCE_MANAGER_H +#define RESOURCE_MANAGER_H #include <string> diff --git a/src/game-server/spawnarea.hpp b/src/game-server/spawnarea.hpp index cacec07b..bcd618da 100644 --- a/src/game-server/spawnarea.hpp +++ b/src/game-server/spawnarea.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SPAWNAREA -#define _TMWSERV_SPAWNAREA +#ifndef SPAWNAREA_HPP +#define SPAWNAREA_HPP #include "point.h" #include "game-server/eventlistener.hpp" diff --git a/src/game-server/state.hpp b/src/game-server/state.hpp index 60e63b0e..72d5543e 100644 --- a/src/game-server/state.hpp +++ b/src/game-server/state.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_STATE_ -#define _TMW_SERVER_STATE_ +#ifndef SERVER_STATE_HPP +#define SERVER_STATE_HPP #include <string> diff --git a/src/game-server/statuseffect.hpp b/src/game-server/statuseffect.hpp index 46af13ce..bd02b834 100644 --- a/src/game-server/statuseffect.hpp +++ b/src/game-server/statuseffect.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_STATUSEFFECT_H -#define _TMW_STATUSEFFECT_H +#ifndef STATUSEFFECT_H +#define STATUSEFFECT_H class Script; class Being; diff --git a/src/game-server/statusmanager.hpp b/src/game-server/statusmanager.hpp index 6f8f7358..af8cefcc 100644 --- a/src/game-server/statusmanager.hpp +++ b/src/game-server/statusmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_STATUSMANAGER_H -#define _TMW_STATUSMANAGER_H +#ifndef STATUSMANAGER_H +#define STATUSMANAGER_H #include <string> diff --git a/src/game-server/thing.hpp b/src/game-server/thing.hpp index 33ffa908..be8919ab 100644 --- a/src/game-server/thing.hpp +++ b/src/game-server/thing.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_THING_H_ -#define _TMWSERV_THING_H_ +#ifndef THING_H +#define THING_H #include <set> @@ -133,4 +133,4 @@ class Thing ThingType mType; /**< Type of this thing. */ }; -#endif // _TMWSERV_THING_H_ +#endif // THING_H diff --git a/src/game-server/trade.hpp b/src/game-server/trade.hpp index 844b6c76..4e0e58ef 100644 --- a/src/game-server/trade.hpp +++ b/src/game-server/trade.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_TRADE_HPP_ -#define _TMWSERV_GAMESERVER_TRADE_HPP_ +#ifndef GAMESERVER_TRADE_HPP +#define GAMESERVER_TRADE_HPP #include <vector> diff --git a/src/game-server/trigger.hpp b/src/game-server/trigger.hpp index d99fb769..f24a03dd 100644 --- a/src/game-server/trigger.hpp +++ b/src/game-server/trigger.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_TRIGGER -#define _TMWSERV_TRIGGER +#ifndef TRIGGER_HPP +#define TRIGGER_HPP #include "point.h" #include "game-server/thing.hpp" |