diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/net/manaserv/adminhandler.cpp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-stripped1.1.9.4.tar.gz plus-stripped1.1.9.4.tar.bz2 plus-stripped1.1.9.4.tar.xz plus-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/net/manaserv/adminhandler.cpp')
| -rw-r--r-- | src/net/manaserv/adminhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp index 2c76e99a3..a8860d73b 100644 --- a/src/net/manaserv/adminhandler.cpp +++ b/src/net/manaserv/adminhandler.cpp @@ -91,7 +91,8 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED, // TODO } -void AdminHandler::warp(std::string map, int x, int y) +void AdminHandler::warp(std::string map A_UNUSED, + int x A_UNUSED, int y A_UNUSED) { // TODO } |