diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
| commit | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch) | |
| tree | 1a8174f4d1745a4799210db970aa2230df622d34 /gameserver.cbp | |
| parent | b89e404f85358f2e3ff87d7731376dbeacdf9778 (diff) | |
| parent | 81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff) | |
| download | manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2 manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/account-server/accounthandler.cpp
src/game-server/character.cpp
Diffstat (limited to 'gameserver.cbp')
| -rw-r--r-- | gameserver.cbp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gameserver.cbp b/gameserver.cbp index 593d5ab8..7cffe21d 100644 --- a/gameserver.cbp +++ b/gameserver.cbp @@ -49,6 +49,7 @@ </VirtualTargets> <Compiler> <Add option="-O3" /> + <Add option="-std=c++0x" /> <Add option="-Wall" /> <Add option="-g" /> <Add option="-Wno-switch" /> @@ -132,6 +133,8 @@ <Unit filename="src/game-server/character.h" /> <Unit filename="src/game-server/collisiondetection.cpp" /> <Unit filename="src/game-server/collisiondetection.h" /> + <Unit filename="src/game-server/combatcomponent.cpp" /> + <Unit filename="src/game-server/combatcomponent.h" /> <Unit filename="src/game-server/commandhandler.cpp" /> <Unit filename="src/game-server/commandhandler.h" /> <Unit filename="src/game-server/effect.cpp" /> @@ -160,6 +163,8 @@ <Unit filename="src/game-server/mapreader.h" /> <Unit filename="src/game-server/monster.cpp" /> <Unit filename="src/game-server/monster.h" /> + <Unit filename="src/game-server/monstercombatcomponent.cpp" /> + <Unit filename="src/game-server/monstercombatcomponent.h" /> <Unit filename="src/game-server/monstermanager.cpp" /> <Unit filename="src/game-server/monstermanager.h" /> <Unit filename="src/game-server/npc.cpp" /> @@ -169,8 +174,8 @@ <Unit filename="src/game-server/quest.h" /> <Unit filename="src/game-server/skillmanager.cpp" /> <Unit filename="src/game-server/skillmanager.h" /> - <Unit filename="src/game-server/spawnarea.cpp" /> - <Unit filename="src/game-server/spawnarea.h" /> + <Unit filename="src/game-server/spawnareacomponent.cpp" /> + <Unit filename="src/game-server/spawnareacomponent.h" /> <Unit filename="src/game-server/specialmanager.cpp" /> <Unit filename="src/game-server/specialmanager.h" /> <Unit filename="src/game-server/state.cpp" /> @@ -183,8 +188,8 @@ <Unit filename="src/game-server/timeout.h" /> <Unit filename="src/game-server/trade.cpp" /> <Unit filename="src/game-server/trade.h" /> - <Unit filename="src/game-server/trigger.cpp" /> - <Unit filename="src/game-server/trigger.h" /> + <Unit filename="src/game-server/triggerareacomponent.cpp" /> + <Unit filename="src/game-server/triggerareacomponent.h" /> <Unit filename="src/manaserv-game.rc"> <Option compilerVar="WINDRES" /> </Unit> |