diff options
| author | Freeyorp <Freeyorp101@hotmail.com> | 2010-08-29 19:47:25 +1200 |
|---|---|---|
| committer | Freeyorp <Freeyorp101@hotmail.com> | 2010-08-29 19:47:25 +1200 |
| commit | 7fc50c2d31e1d289e9d2a950271c6d399fe0896a (patch) | |
| tree | 1ebff71f7b1526425cc57e2e3b2681297e540f90 /gameserver.cbp | |
| parent | 853cbb6efdb79f879fabc2133acb8c11d9d4f7b1 (diff) | |
| parent | 7db9f6fe36b737d2eec7c6070497035b0834def2 (diff) | |
| download | manaserv-7fc50c2d31e1d289e9d2a950271c6d399fe0896a.tar.gz manaserv-7fc50c2d31e1d289e9d2a950271c6d399fe0896a.tar.bz2 manaserv-7fc50c2d31e1d289e9d2a950271c6d399fe0896a.tar.xz manaserv-7fc50c2d31e1d289e9d2a950271c6d399fe0896a.zip | |
Merge branch 'testing'
Conflicts:
src/account-server/storage.cpp
src/game-server/being.cpp
src/game-server/being.hpp
src/game-server/character.cpp
src/game-server/character.hpp
src/game-server/gamehandler.cpp
src/game-server/inventory.cpp
src/scripting/lua.cpp
src/sql/mysql/createTables.sql
src/sql/sqlite/createTables.sql
Diffstat (limited to 'gameserver.cbp')
| -rw-r--r-- | gameserver.cbp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gameserver.cbp b/gameserver.cbp index 05f0395e..ac42ba13 100644 --- a/gameserver.cbp +++ b/gameserver.cbp @@ -93,6 +93,12 @@ <Unit filename="src\game-server\accountconnection.hpp" /> <Unit filename="src\game-server\actor.cpp" /> <Unit filename="src\game-server\actor.hpp" /> + <Unit filename="src\game-server\attribute.cpp" /> + <Unit filename="src\game-server\attribute.hpp" /> + <Unit filename="src\game-server\attributemanager.cpp" /> + <Unit filename="src\game-server\attributemanager.hpp" /> + <Unit filename="src\game-server\autoattack.cpp" /> + <Unit filename="src\game-server\autoattack.hpp" /> <Unit filename="src\game-server\being.cpp" /> <Unit filename="src\game-server\being.hpp" /> <Unit filename="src\game-server\buysell.cpp" /> @@ -182,6 +188,8 @@ <Unit filename="src\utils\string.hpp" /> <Unit filename="src\utils\stringfilter.cpp" /> <Unit filename="src\utils\stringfilter.h" /> + <Unit filename="src\utils\speedconv.cpp" /> + <Unit filename="src\utils\speedconv.hpp"> <Unit filename="src\utils\timer.cpp" /> <Unit filename="src\utils\timer.h" /> <Unit filename="src\utils\tokencollector.cpp" /> |