summaryrefslogtreecommitdiff
path: root/src/commandhandler.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-22 02:20:43 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-22 02:20:43 +0300
commite71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch)
tree4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /src/commandhandler.h
parentb6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff)
parentacc25a7dffefb8b8b4e8022af918794d26048453 (diff)
downloadplus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz
plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2
plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz
plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip
Merge commit 'v1.2.1.22' into stripped
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf src/CMakeLists.txt src/Makefile.am src/guichan/gui.cpp
Diffstat (limited to 'src/commandhandler.h')
-rw-r--r--src/commandhandler.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/commandhandler.h b/src/commandhandler.h
index f8b44e04f..16e5e94ce 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011 The ManaPlus Developers
+ * Copyright (C) 2011-2012 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -59,6 +59,8 @@ class CommandHandler
void handleCommands(const std::string &command,
ChatTab *tab = localChatTab);
+ void replaceVars(std::string &str);
+
static char parseBoolean(const std::string &value);
protected:
@@ -297,9 +299,14 @@ class CommandHandler
void handleDumpGraphics(const std::string &args, ChatTab *tab);
+ void handleDumpTests(const std::string &args, ChatTab *tab);
+
void outString(ChatTab *tab, const std::string &str,
const std::string &def);
+ void outStringNormal(ChatTab *tab, const std::string &str,
+ const std::string &def);
+
void handleCacheInfo(const std::string &args, ChatTab *tab);
bool parse2Int(const std::string &args, int *x, int *y);