Drop commands support in favor of talkactions

otland · Feb 10, 2017 · eeacf88 · eeacf88
1 parent 1c227d3
commit eeacf88
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 265 deletions.
diff --git a/data/XML/commands.xml b/data/XML/commands.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/bed.cpp
 	${CMAKE_CURRENT_LIST_DIR}/chat.cpp
 	${CMAKE_CURRENT_LIST_DIR}/combat.cpp
-	${CMAKE_CURRENT_LIST_DIR}/commands.cpp
 	${CMAKE_CURRENT_LIST_DIR}/condition.cpp
 	${CMAKE_CURRENT_LIST_DIR}/configmanager.cpp
 	${CMAKE_CURRENT_LIST_DIR}/connection.cpp

diff --git a/src/commands.cpp b/src/commands.cpp
diff --git a/src/commands.h b/src/commands.h
diff --git a/src/game.cpp b/src/game.cpp
@@ -23,7 +23,6 @@
 
 #include "actions.h"
 #include "bed.h"
-#include "commands.h"
 #include "configmanager.h"
 #include "creature.h"
 #include "creatureevent.h"
@@ -109,8 +108,6 @@ void Game::setGameState(GameState_t newState)
 	gameState = newState;
 	switch (newState) {
 		case GAME_STATE_INIT: {
-			commands.loadFromXml();
-
 			loadExperienceStages();
 
 			groups.load();
@@ -3236,10 +3233,6 @@ void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type,
 		return;
 	}
 
-	if (playerSayCommand(player, text)) {
-		return;
-	}
-
 	if (playerSaySpell(player, type, text)) {
 		return;
 	}
@@ -3289,23 +3282,6 @@ void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type,
 	}
 }
 
-bool Game::playerSayCommand(Player* player, const std::string& text)
-{
-	if (text.empty()) {
-		return false;
-	}
-
-	char firstCharacter = text.front();
-	for (char commandTag : commandTags) {
-		if (commandTag == firstCharacter) {
-			if (commands.exeCommand(*player, text)) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
 bool Game::playerSaySpell(Player* player, SpeakClasses type, const std::string& text)
 {
 	std::string words = text;
@@ -5583,7 +5559,6 @@ bool Game::reload(ReloadTypes_t reloadType)
 	switch (reloadType) {
 		case RELOAD_TYPE_ACTIONS: return g_actions->reload();
 		case RELOAD_TYPE_CHAT: return g_chat->load();
-		case RELOAD_TYPE_COMMANDS: return commands.reload();
 		case RELOAD_TYPE_CONFIG: return g_config.reload();
 		case RELOAD_TYPE_CREATURESCRIPTS: return g_creatureEvents->reload();
 		case RELOAD_TYPE_EVENTS: return g_events->load();
@@ -5646,7 +5621,6 @@ bool Game::reload(ReloadTypes_t reloadType)
 			g_globalEvents->reload();
 			g_events->load();
 			g_chat->load();
-			commands.reload();
 			return true;
 		}
 	}

diff --git a/src/game.h b/src/game.h
@@ -22,7 +22,6 @@
 
 #include "account.h"
 #include "combat.h"
-#include "commands.h"
 #include "groups.h"
 #include "map.h"
 #include "position.h"
@@ -497,9 +496,6 @@ class Game
 		Item* getUniqueItem(uint16_t uniqueId);
 		bool addUniqueItem(uint16_t uniqueId, Item* item);
 		void removeUniqueItem(uint16_t uniqueId);
-		void reloadCommands() {
-			commands.reload();
-		}
 
 		bool reload(ReloadTypes_t reloadType);
 
@@ -510,7 +506,6 @@ class Game
 		Quests quests;
 
 	protected:
-		bool playerSayCommand(Player* player, const std::string& text);
 		bool playerSaySpell(Player* player, SpeakClasses type, const std::string& text);
 		void playerWhisper(Player* player, const std::string& text);
 		bool playerYell(Player* player, const std::string& text);
@@ -548,7 +543,6 @@ class Game
 		std::map<uint32_t, BedItem*> bedSleepersMap;
 
 		ModalWindow offlineTrainingWindow { std::numeric_limits<uint32_t>::max(), "Choose a Skill", "Please choose a skill:" };
-		Commands commands;
 
 		static constexpr int32_t LIGHT_LEVEL_DAY = 250;
 		static constexpr int32_t LIGHT_LEVEL_NIGHT = 40;

diff --git a/src/signals.cpp b/src/signals.cpp
@@ -127,9 +127,6 @@ void Signals::sighupHandler()
 	g_config.reload();
 	std::cout << "Reloaded config." << std::endl;
 
-	g_game.reloadCommands();
-	std::cout << "Reloaded commands." << std::endl;
-
 	g_creatureEvents->reload();
 	std::cout << "Reloaded creature scripts." << std::endl;
 

diff --git a/vc14/theforgottenserver.vcxproj b/vc14/theforgottenserver.vcxproj
@@ -129,7 +129,6 @@
     <ClCompile Include="..\src\bed.cpp" />
     <ClCompile Include="..\src\chat.cpp" />
     <ClCompile Include="..\src\combat.cpp" />
-    <ClCompile Include="..\src\commands.cpp" />
     <ClCompile Include="..\src\condition.cpp" />
     <ClCompile Include="..\src\configmanager.cpp" />
     <ClCompile Include="..\src\connection.cpp" />
@@ -214,7 +213,6 @@
     <ClInclude Include="..\src\bed.h" />
     <ClInclude Include="..\src\chat.h" />
     <ClInclude Include="..\src\combat.h" />
-    <ClInclude Include="..\src\commands.h" />
     <ClInclude Include="..\src\condition.h" />
     <ClInclude Include="..\src\configmanager.h" />
     <ClInclude Include="..\src\connection.h" />