mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-04 09:42:40 +02:00
Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts. No changes other than code being moved around and adjustment of includes Moved without changes: Languages.h -> texts/Languages.h MetaString.* -> texts/MetaString.* TextOperations.* -> texts/TextOperations.* Split into parts: CGeneralTextHandler.* -> texts/CGeneralTextHandler.* -> texts/CLegacyConfigParser.* -> texts/TextLocalizationContainer.* -> texts/TextIdentifier.h
This commit is contained in:
parent
2796931259
commit
1aa391fdf8
@ -12,7 +12,7 @@
|
|||||||
#include "../Behaviors/CaptureObjectsBehavior.h"
|
#include "../Behaviors/CaptureObjectsBehavior.h"
|
||||||
#include "../AIGateway.h"
|
#include "../AIGateway.h"
|
||||||
#include "../../../lib/VCMI_Lib.h"
|
#include "../../../lib/VCMI_Lib.h"
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
namespace NKAI
|
namespace NKAI
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "lib/mapObjects/CGHeroInstance.h"
|
#include "lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "lib/mapObjects/CGTownInstance.h"
|
#include "lib/mapObjects/CGTownInstance.h"
|
||||||
#include "lib/CBuildingHandler.h"
|
#include "lib/CBuildingHandler.h"
|
||||||
#include "lib/CGeneralTextHandler.h"
|
#include "lib/texts/CGeneralTextHandler.h"
|
||||||
#include "lib/CHeroHandler.h"
|
#include "lib/CHeroHandler.h"
|
||||||
#include "lib/CArtHandler.h"
|
#include "lib/CArtHandler.h"
|
||||||
#include "lib/GameConstants.h"
|
#include "lib/GameConstants.h"
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
#include "../CCallback.h"
|
#include "../CCallback.h"
|
||||||
#include "../lib/ArtifactUtils.h"
|
#include "../lib/ArtifactUtils.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/mapObjects/CGHeroInstance.h"
|
#include "../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
|
||||||
#include "gui/CGuiHandler.h"
|
#include "gui/CGuiHandler.h"
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
#include "render/Graphics.h"
|
#include "render/Graphics.h"
|
||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/CThreadHelper.h"
|
#include "../lib/CThreadHelper.h"
|
||||||
#include "../lib/ExceptionsCommon.h"
|
#include "../lib/ExceptionsCommon.h"
|
||||||
#include "../lib/VCMIDirs.h"
|
#include "../lib/VCMIDirs.h"
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
#include "../CCallback.h"
|
#include "../CCallback.h"
|
||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "../lib/CPlayerState.h"
|
#include "../lib/CPlayerState.h"
|
||||||
#include "../lib/CRandomGenerator.h"
|
#include "../lib/CRandomGenerator.h"
|
||||||
@ -79,7 +79,6 @@
|
|||||||
#include "../lib/RoadHandler.h"
|
#include "../lib/RoadHandler.h"
|
||||||
#include "../lib/StartInfo.h"
|
#include "../lib/StartInfo.h"
|
||||||
#include "../lib/TerrainHandler.h"
|
#include "../lib/TerrainHandler.h"
|
||||||
#include "../lib/TextOperations.h"
|
|
||||||
#include "../lib/UnlockGuard.h"
|
#include "../lib/UnlockGuard.h"
|
||||||
#include "../lib/VCMIDirs.h"
|
#include "../lib/VCMIDirs.h"
|
||||||
|
|
||||||
@ -108,6 +107,8 @@
|
|||||||
|
|
||||||
#include "../lib/spells/CSpellHandler.h"
|
#include "../lib/spells/CSpellHandler.h"
|
||||||
|
|
||||||
|
#include "../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
// The macro below is used to mark functions that are called by client when game state changes.
|
// The macro below is used to mark functions that are called by client when game state changes.
|
||||||
// They all assume that interface mutex is locked.
|
// They all assume that interface mutex is locked.
|
||||||
#define EVENT_HANDLER_CALLED_BY_CLIENT
|
#define EVENT_HANDLER_CALLED_BY_CLIENT
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "mainmenu/CHighScoreScreen.h"
|
#include "mainmenu/CHighScoreScreen.h"
|
||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "ConditionalWait.h"
|
#include "ConditionalWait.h"
|
||||||
#include "../lib/CThreadHelper.h"
|
#include "../lib/CThreadHelper.h"
|
||||||
#include "../lib/StartInfo.h"
|
#include "../lib/StartInfo.h"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "../lib/mapObjects/CGHeroInstance.h"
|
#include "../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "render/CAnimation.h"
|
#include "render/CAnimation.h"
|
||||||
#include "../CCallback.h"
|
#include "../CCallback.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/filesystem/Filesystem.h"
|
#include "../lib/filesystem/Filesystem.h"
|
||||||
#include "../lib/modding/CModHandler.h"
|
#include "../lib/modding/CModHandler.h"
|
||||||
#include "../lib/modding/ContentTypeHandler.h"
|
#include "../lib/modding/ContentTypeHandler.h"
|
||||||
|
@ -21,12 +21,11 @@
|
|||||||
#include "../CCallback.h"
|
#include "../CCallback.h"
|
||||||
|
|
||||||
#include "../lib/networkPacks/PacksForLobby.h"
|
#include "../lib/networkPacks/PacksForLobby.h"
|
||||||
#include "../lib/TextOperations.h"
|
|
||||||
#include "../lib/mapObjects/CArmedInstance.h"
|
#include "../lib/mapObjects/CArmedInstance.h"
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/MetaString.h"
|
|
||||||
#include "../lib/VCMI_Lib.h"
|
#include "../lib/VCMI_Lib.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
const std::vector<GameChatMessage> & GameChatHandler::getChatHistory() const
|
const std::vector<GameChatMessage> & GameChatHandler::getChatHistory() const
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "../lib/filesystem/FileInfo.h"
|
#include "../lib/filesystem/FileInfo.h"
|
||||||
#include "../lib/serializer/BinarySerializer.h"
|
#include "../lib/serializer/BinarySerializer.h"
|
||||||
#include "../lib/serializer/Connection.h"
|
#include "../lib/serializer/Connection.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "../lib/VCMI_Lib.h"
|
#include "../lib/VCMI_Lib.h"
|
||||||
#include "../lib/mapping/CMap.h"
|
#include "../lib/mapping/CMap.h"
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include "widgets/TextControls.h"
|
#include "widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/serializer/Connection.h"
|
#include "../lib/serializer/Connection.h"
|
||||||
|
|
||||||
void ApplyOnLobbyHandlerNetPackVisitor::visitLobbyClientConnected(LobbyClientConnected & pack)
|
void ApplyOnLobbyHandlerNetPackVisitor::visitLobbyClientConnected(LobbyClientConnected & pack)
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/spells/CSpellHandler.h"
|
#include "../../lib/spells/CSpellHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
#include "../../lib/mapping/CMap.h"
|
#include "../../lib/mapping/CMap.h"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
AdventureOptions::AdventureOptions()
|
AdventureOptions::AdventureOptions()
|
||||||
: CWindowObject(PLAYER_COLORED, ImagePath::builtin("ADVOPTS"))
|
: CWindowObject(PLAYER_COLORED, ImagePath::builtin("ADVOPTS"))
|
||||||
|
@ -30,9 +30,8 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CThreadHelper.h"
|
#include "../../lib/CThreadHelper.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/mapObjects/CArmedInstance.h"
|
#include "../../lib/mapObjects/CArmedInstance.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
CInGameConsole::CInGameConsole()
|
CInGameConsole::CInGameConsole()
|
||||||
: CIntObject(KEYBOARD | TIME | TEXTINPUT)
|
: CIntObject(KEYBOARD | TIME | TEXTINPUT)
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "../render/Canvas.h"
|
#include "../render/Canvas.h"
|
||||||
#include "../render/Colors.h"
|
#include "../render/Colors.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "../windows/InfoWindows.h"
|
#include "../windows/InfoWindows.h"
|
||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/TerrainHandler.h"
|
#include "../../lib/TerrainHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/mapping/CMapDefines.h"
|
#include "../../lib/mapping/CMapDefines.h"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/ResourceSet.h"
|
#include "../../lib/ResourceSet.h"
|
||||||
|
|
||||||
CResDataBar::CResDataBar(const ImagePath & imageName, const Point & position)
|
CResDataBar::CResDataBar(const ImagePath & imageName, const Point & position)
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CRandomGenerator.h"
|
#include "../../lib/CRandomGenerator.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
#include "../../lib/battle/BattleAction.h"
|
#include "../../lib/battle/BattleAction.h"
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "../../lib/networkPacks/PacksForClientBattle.h"
|
#include "../../lib/networkPacks/PacksForClientBattle.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
#include "../../lib/IGameEventsReceiver.h"
|
#include "../../lib/IGameEventsReceiver.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
BattleEffectsController::BattleEffectsController(BattleInterface & owner):
|
BattleEffectsController::BattleEffectsController(BattleInterface & owner):
|
||||||
owner(owner)
|
owner(owner)
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
#include "../../lib/BattleFieldHandler.h"
|
#include "../../lib/BattleFieldHandler.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/gameState/InfoAboutArmy.h"
|
#include "../../lib/gameState/InfoAboutArmy.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
@ -51,13 +51,13 @@
|
|||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/gameState/InfoAboutArmy.h"
|
#include "../../lib/gameState/InfoAboutArmy.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/CTownHandler.h"
|
#include "../../lib/CTownHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
#include "../../lib/networkPacks/PacksForClientBattle.h"
|
#include "../../lib/networkPacks/PacksForClientBattle.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/json/JsonUtils.h"
|
#include "../../lib/json/JsonUtils.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,8 +13,8 @@
|
|||||||
#include "../gui/CIntObject.h"
|
#include "../gui/CIntObject.h"
|
||||||
#include "../../lib/FunctionList.h"
|
#include "../../lib/FunctionList.h"
|
||||||
#include "../../lib/battle/BattleHex.h"
|
#include "../../lib/battle/BattleHex.h"
|
||||||
|
#include "../../lib/texts/MetaString.h"
|
||||||
#include "../windows/CWindowObject.h"
|
#include "../windows/CWindowObject.h"
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
|
|
||||||
VCMI_LIB_NAMESPACE_BEGIN
|
VCMI_LIB_NAMESPACE_BEGIN
|
||||||
|
|
||||||
|
@ -37,9 +37,9 @@
|
|||||||
#include "../../lib/spells/ISpellMechanics.h"
|
#include "../../lib/spells/ISpellMechanics.h"
|
||||||
#include "../../lib/battle/BattleAction.h"
|
#include "../../lib/battle/BattleAction.h"
|
||||||
#include "../../lib/battle/BattleHex.h"
|
#include "../../lib/battle/BattleHex.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/CRandomGenerator.h"
|
#include "../../lib/CRandomGenerator.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
|
|
||||||
static void onAnimationFinished(const CStack *stack, std::weak_ptr<CreatureAnimation> anim)
|
static void onAnimationFinished(const CStack *stack, std::weak_ptr<CreatureAnimation> anim)
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "../adventureMap/TurnTimerWidget.h"
|
#include "../adventureMap/TurnTimerWidget.h"
|
||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/gameState/InfoAboutArmy.h"
|
#include "../../lib/gameState/InfoAboutArmy.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
|
@ -25,10 +25,10 @@
|
|||||||
#include "../windows/InfoWindows.h"
|
#include "../windows/InfoWindows.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
#include "../../lib/json/JsonUtils.h"
|
#include "../../lib/json/JsonUtils.h"
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
GlobalLobbyClient::GlobalLobbyClient()
|
GlobalLobbyClient::GlobalLobbyClient()
|
||||||
{
|
{
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
#include "../widgets/ObjectLists.h"
|
#include "../widgets/ObjectLists.h"
|
||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
#include "../../lib/json/JsonNode.h"
|
#include "../../lib/json/JsonNode.h"
|
||||||
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
GlobalLobbyInviteAccountCard::GlobalLobbyInviteAccountCard(const GlobalLobbyAccount & accountDescription)
|
GlobalLobbyInviteAccountCard::GlobalLobbyInviteAccountCard(const GlobalLobbyAccount & accountDescription)
|
||||||
: accountID(accountDescription.accountID)
|
: accountID(accountDescription.accountID)
|
||||||
|
@ -25,8 +25,8 @@
|
|||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
GlobalLobbyLoginWindow::GlobalLobbyLoginWindow()
|
GlobalLobbyLoginWindow::GlobalLobbyLoginWindow()
|
||||||
: CWindowObject(BORDERED)
|
: CWindowObject(BORDERED)
|
||||||
|
@ -26,10 +26,10 @@
|
|||||||
#include "../widgets/GraphicalPrimitiveCanvas.h"
|
#include "../widgets/GraphicalPrimitiveCanvas.h"
|
||||||
#include "../widgets/ObjectLists.h"
|
#include "../widgets/ObjectLists.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
#include "../../lib/modding/CModHandler.h"
|
#include "../../lib/modding/CModHandler.h"
|
||||||
#include "../../lib/modding/CModInfo.h"
|
#include "../../lib/modding/CModInfo.h"
|
||||||
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
GlobalLobbyRoomAccountCard::GlobalLobbyRoomAccountCard(const GlobalLobbyAccount & accountDescription)
|
GlobalLobbyRoomAccountCard::GlobalLobbyRoomAccountCard(const GlobalLobbyAccount & accountDescription)
|
||||||
{
|
{
|
||||||
|
@ -23,8 +23,8 @@
|
|||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
GlobalLobbyServerSetup::GlobalLobbyServerSetup()
|
GlobalLobbyServerSetup::GlobalLobbyServerSetup()
|
||||||
: CWindowObject(BORDERED)
|
: CWindowObject(BORDERED)
|
||||||
|
@ -30,8 +30,8 @@
|
|||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
GlobalLobbyWidget::GlobalLobbyWidget(GlobalLobbyWindow * window)
|
GlobalLobbyWidget::GlobalLobbyWidget(GlobalLobbyWindow * window)
|
||||||
: window(window)
|
: window(window)
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
#include "../widgets/ObjectLists.h"
|
#include "../widgets/ObjectLists.h"
|
||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
GlobalLobbyWindow::GlobalLobbyWindow()
|
GlobalLobbyWindow::GlobalLobbyWindow()
|
||||||
: CWindowObject(BORDERED)
|
: CWindowObject(BORDERED)
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
#include "../../lib/constants/StringConstants.h"
|
#include "../../lib/constants/StringConstants.h"
|
||||||
#include "../../lib/json/JsonUtils.h"
|
#include "../../lib/json/JsonUtils.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/filesystem/ResourcePath.h"
|
#include "../../lib/filesystem/ResourcePath.h"
|
||||||
|
|
||||||
InterfaceObjectConfigurable::InterfaceObjectConfigurable(const JsonNode & config, int used, Point offset):
|
InterfaceObjectConfigurable::InterfaceObjectConfigurable(const JsonNode & config, int used, Point offset):
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
#include "../gui/WindowHandler.h"
|
#include "../gui/WindowHandler.h"
|
||||||
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CBuildingHandler.h"
|
#include "../../lib/CBuildingHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "CCampaignInfoScreen.h"
|
#include "CCampaignInfoScreen.h"
|
||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
#include "../../lib/mapping/CMapHeader.h"
|
#include "../../lib/mapping/CMapHeader.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/campaign/CampaignHandler.h"
|
#include "../../lib/campaign/CampaignHandler.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
#include "../../lib/networkPacks/PacksForLobby.h"
|
#include "../../lib/networkPacks/PacksForLobby.h"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
#include "../../lib/mapping/CMapHeader.h"
|
#include "../../lib/mapping/CMapHeader.h"
|
||||||
|
@ -43,12 +43,11 @@
|
|||||||
#include "../render/IFont.h"
|
#include "../render/IFont.h"
|
||||||
#include "../render/IRenderHandler.h"
|
#include "../render/IRenderHandler.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/CTownHandler.h"
|
#include "../../lib/CTownHandler.h"
|
||||||
#include "../../lib/CRandomGenerator.h"
|
#include "../../lib/CRandomGenerator.h"
|
||||||
#include "../../lib/CThreadHelper.h"
|
#include "../../lib/CThreadHelper.h"
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/mapping/CMapHeader.h"
|
#include "../../lib/mapping/CMapHeader.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/networkPacks/PacksForLobby.h"
|
#include "../../lib/networkPacks/PacksForLobby.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CArtHandler.h"
|
#include "../../lib/CArtHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CTownHandler.h"
|
#include "../../lib/CTownHandler.h"
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
|
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/MetaString.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/MetaString.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
|
|
||||||
static std::string timeToString(int time)
|
static std::string timeToString(int time)
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "../windows/GUIClasses.h"
|
#include "../windows/GUIClasses.h"
|
||||||
#include "../windows/InfoWindows.h"
|
#include "../windows/InfoWindows.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
#include "../../lib/mapping/CMapHeader.h"
|
#include "../../lib/mapping/CMapHeader.h"
|
||||||
#include "../../lib/mapping/MapFormat.h"
|
#include "../../lib/mapping/MapFormat.h"
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
@ -43,8 +42,9 @@
|
|||||||
#include "../../lib/mapping/CMapInfo.h"
|
#include "../../lib/mapping/CMapInfo.h"
|
||||||
#include "../../lib/mapping/CMapHeader.h"
|
#include "../../lib/mapping/CMapHeader.h"
|
||||||
#include "../../lib/mapping/MapFormat.h"
|
#include "../../lib/mapping/MapFormat.h"
|
||||||
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/TerrainHandler.h"
|
#include "../../lib/TerrainHandler.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
|
|
||||||
bool mapSorter::operator()(const std::shared_ptr<ElementInfo> aaa, const std::shared_ptr<ElementInfo> bbb)
|
bool mapSorter::operator()(const std::shared_ptr<ElementInfo> aaa, const std::shared_ptr<ElementInfo> bbb)
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "../windows/CWindowObject.h"
|
#include "../windows/CWindowObject.h"
|
||||||
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
#include "../../lib/CArtHandler.h"
|
#include "../../lib/CArtHandler.h"
|
||||||
#include "../../lib/CBuildingHandler.h"
|
#include "../../lib/CBuildingHandler.h"
|
||||||
|
@ -27,12 +27,11 @@
|
|||||||
#include "../render/IRenderHandler.h"
|
#include "../render/IRenderHandler.h"
|
||||||
|
|
||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/constants/EntityIdentifiers.h"
|
#include "../../lib/constants/EntityIdentifiers.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/Languages.h"
|
|
||||||
|
|
||||||
auto HighScoreCalculation::calculate()
|
auto HighScoreCalculation::calculate()
|
||||||
{
|
{
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/campaign/CampaignHandler.h"
|
#include "../../lib/campaign/CampaignHandler.h"
|
||||||
#include "../../lib/serializer/CTypeList.h"
|
#include "../../lib/serializer/CTypeList.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "../CPlayerInterface.h"
|
#include "../CPlayerInterface.h"
|
||||||
#include "../gui/CGuiHandler.h"
|
#include "../gui/CGuiHandler.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/TerrainHandler.h"
|
#include "../../lib/TerrainHandler.h"
|
||||||
#include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
|
#include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
@ -23,8 +23,8 @@
|
|||||||
|
|
||||||
#include "../../lib/filesystem/CInputStream.h"
|
#include "../../lib/filesystem/CInputStream.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
|
|
||||||
#include <SDL_render.h>
|
#include <SDL_render.h>
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#include "CGameInfo.h"
|
#include "CGameInfo.h"
|
||||||
#include "../lib/VCMI_Lib.h"
|
#include "../lib/VCMI_Lib.h"
|
||||||
#include "../CCallback.h"
|
#include "../CCallback.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/vcmi_endian.h"
|
#include "../lib/vcmi_endian.h"
|
||||||
#include "../lib/CStopWatch.h"
|
#include "../lib/CStopWatch.h"
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "IFont.h"
|
#include "IFont.h"
|
||||||
|
|
||||||
#include "../../lib/Point.h"
|
#include "../../lib/Point.h"
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
size_t IFont::getStringWidth(const std::string & data) const
|
size_t IFont::getStringWidth(const std::string & data) const
|
||||||
{
|
{
|
||||||
|
@ -14,11 +14,11 @@
|
|||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
#include "../render/Colors.h"
|
#include "../render/Colors.h"
|
||||||
|
|
||||||
#include "../../lib/Languages.h"
|
|
||||||
#include "../../lib/Rect.h"
|
#include "../../lib/Rect.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/modding/CModHandler.h"
|
#include "../../lib/modding/CModHandler.h"
|
||||||
|
#include "../../lib/texts/Languages.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/vcmi_endian.h"
|
#include "../../lib/vcmi_endian.h"
|
||||||
#include "../../lib/VCMI_Lib.h"
|
#include "../../lib/VCMI_Lib.h"
|
||||||
|
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../../lib/json/JsonNode.h"
|
#include "../../lib/json/JsonNode.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/Rect.h"
|
#include "../../lib/Rect.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
#include <SDL_surface.h>
|
#include <SDL_surface.h>
|
||||||
|
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
#include "../render/Colors.h"
|
#include "../render/Colors.h"
|
||||||
#include "../renderSDL/SDL_Extensions.h"
|
#include "../renderSDL/SDL_Extensions.h"
|
||||||
|
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/json/JsonNode.h"
|
#include "../../lib/json/JsonNode.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
#include <SDL_ttf.h>
|
#include <SDL_ttf.h>
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "../render/IRenderHandler.h"
|
#include "../render/IRenderHandler.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
|
|
||||||
void ButtonBase::update()
|
void ButtonBase::update()
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/ArtifactUtils.h"
|
#include "../../lib/ArtifactUtils.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/networkPacks/ArtifactLocation.h"
|
#include "../../lib/networkPacks/ArtifactLocation.h"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "../../lib/spells/CSpellHandler.h"
|
#include "../../lib/spells/CSpellHandler.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/CSkillHandler.h"
|
#include "../../lib/CSkillHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CArtHandler.h"
|
#include "../../lib/CArtHandler.h"
|
||||||
#include "../../lib/CArtifactInstance.h"
|
#include "../../lib/CArtifactInstance.h"
|
||||||
|
|
||||||
|
@ -26,12 +26,12 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/ArtifactUtils.h"
|
#include "../../lib/ArtifactUtils.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/networkPacks/ArtifactLocation.h"
|
#include "../../lib/networkPacks/ArtifactLocation.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/gameState/CGameState.h"
|
#include "../../lib/gameState/CGameState.h"
|
||||||
|
|
||||||
void CGarrisonSlot::setHighlight(bool on)
|
void CGarrisonSlot::setHighlight(bool on)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../render/Graphics.h"
|
#include "../render/Graphics.h"
|
||||||
#include "../render/IFont.h"
|
#include "../render/IFont.h"
|
||||||
|
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
std::list<CFocusable *> CFocusable::focusables;
|
std::list<CFocusable *> CFocusable::focusables;
|
||||||
CFocusable * CFocusable::inputWithFocus;
|
CFocusable * CFocusable::inputWithFocus;
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h" //for Unicode related stuff
|
#include "../../lib/texts/CGeneralTextHandler.h" //for Unicode related stuff
|
||||||
#include "../../lib/CRandomGenerator.h"
|
#include "../../lib/CRandomGenerator.h"
|
||||||
|
|
||||||
CPicture::CPicture(std::shared_ptr<IImage> image, const Point & position)
|
CPicture::CPicture(std::shared_ptr<IImage> image, const Point & position)
|
||||||
|
@ -33,12 +33,12 @@
|
|||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/gameState/InfoAboutArmy.h"
|
#include "../../lib/gameState/InfoAboutArmy.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/mapObjects/CGCreature.h"
|
#include "../../lib/mapObjects/CGCreature.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
void CHoverableArea::hover (bool on)
|
void CHoverableArea::hover (bool on)
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../render/IImage.h"
|
#include "../render/IImage.h"
|
||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
RadialMenuItem::RadialMenuItem(const std::string & imageName, const std::string & hoverText, const std::function<void()> & callback, bool alternativeLayout)
|
RadialMenuItem::RadialMenuItem(const std::string & imageName, const std::string & hoverText, const std::function<void()> & callback, bool alternativeLayout)
|
||||||
: callback(callback)
|
: callback(callback)
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "../render/Graphics.h"
|
#include "../render/Graphics.h"
|
||||||
#include "../render/IFont.h"
|
#include "../render/IFont.h"
|
||||||
|
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
#ifdef VCMI_ANDROID
|
#ifdef VCMI_ANDROID
|
||||||
#include "lib/CAndroidVMHelper.h"
|
#include "lib/CAndroidVMHelper.h"
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/networkPacks/ArtifactLocation.h"
|
#include "../../../lib/networkPacks/ArtifactLocation.h"
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
|
|
||||||
|
@ -21,10 +21,9 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
#include "../../../lib/MetaString.h"
|
|
||||||
|
|
||||||
CAltarCreatures::CAltarCreatures(const IMarket * market, const CGHeroInstance * hero)
|
CAltarCreatures::CAltarCreatures(const IMarket * market, const CGHeroInstance * hero)
|
||||||
: CMarketBase(market, hero)
|
: CMarketBase(market, hero)
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
#include "../../../lib/mapObjects/CGTownInstance.h"
|
#include "../../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CArtifactInstance.h"
|
#include "../../../lib/CArtifactInstance.h"
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
#include "../../../lib/mapObjects/CGTownInstance.h"
|
#include "../../../lib/mapObjects/CGTownInstance.h"
|
||||||
|
@ -21,8 +21,7 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/MetaString.h"
|
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../../lib/CHeroHandler.h"
|
#include "../../../lib/CHeroHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
|
@ -21,8 +21,7 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/MetaString.h"
|
|
||||||
#include "../../../lib/mapObjects/CGMarket.h"
|
#include "../../../lib/mapObjects/CGMarket.h"
|
||||||
|
|
||||||
CMarketResources::CMarketResources(const IMarket * market, const CGHeroInstance * hero)
|
CMarketResources::CMarketResources(const IMarket * market, const CGHeroInstance * hero)
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/MetaString.h"
|
#include "../../../lib/texts/MetaString.h"
|
||||||
|
|
||||||
CTransferResources::CTransferResources(const IMarket * market, const CGHeroInstance * hero)
|
CTransferResources::CTransferResources(const IMarket * market, const CGHeroInstance * hero)
|
||||||
: CMarketBase(market, hero)
|
: CMarketBase(market, hero)
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "../../../CCallback.h"
|
#include "../../../CCallback.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
|
||||||
CTradeableItem::CTradeableItem(const Rect & area, EType Type, int ID, int Serial)
|
CTradeableItem::CTradeableItem(const Rect & area, EType Type, int ID, int Serial)
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CSoundBase.h"
|
#include "../../lib/CSoundBase.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/spells/CSpellHandler.h"
|
#include "../../lib/spells/CSpellHandler.h"
|
||||||
#include "../../lib/CTownHandler.h"
|
#include "../../lib/CTownHandler.h"
|
||||||
|
@ -30,12 +30,12 @@
|
|||||||
#include "../../lib/ArtifactUtils.h"
|
#include "../../lib/ArtifactUtils.h"
|
||||||
#include "../../lib/CStack.h"
|
#include "../../lib/CStack.h"
|
||||||
#include "../../lib/CBonusTypeHandler.h"
|
#include "../../lib/CBonusTypeHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/gameState/CGameState.h"
|
#include "../../lib/gameState/CGameState.h"
|
||||||
#include "../../lib/networkPacks/ArtifactLocation.h"
|
#include "../../lib/networkPacks/ArtifactLocation.h"
|
||||||
#include "../../lib/TextOperations.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
class CCreatureArtifactInstance;
|
class CCreatureArtifactInstance;
|
||||||
class CSelectableSkill;
|
class CSelectableSkill;
|
||||||
|
@ -29,12 +29,12 @@
|
|||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../lib/mapObjects/CGHeroInstance.h"
|
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "../lib/filesystem/Filesystem.h"
|
|
||||||
#include "../lib/CSkillHandler.h"
|
#include "../lib/CSkillHandler.h"
|
||||||
#include "../lib/TextOperations.h"
|
#include "../lib/filesystem/Filesystem.h"
|
||||||
|
#include "../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
static const std::string QUICK_EXCHANGE_BG = "quick-exchange/TRADEQE";
|
static const std::string QUICK_EXCHANGE_BG = "quick-exchange/TRADEQE";
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "../widgets/GraphicalPrimitiveCanvas.h"
|
#include "../widgets/GraphicalPrimitiveCanvas.h"
|
||||||
|
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/CSkillHandler.h"
|
#include "../../lib/CSkillHandler.h"
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#include "../lib/ArtifactUtils.h"
|
#include "../lib/ArtifactUtils.h"
|
||||||
#include "../lib/CArtHandler.h"
|
#include "../lib/CArtHandler.h"
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "../lib/CSkillHandler.h"
|
#include "../lib/CSkillHandler.h"
|
||||||
#include "../lib/mapObjects/CGHeroInstance.h"
|
#include "../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CCreatureHandler.h"
|
#include "../../lib/CCreatureHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CHeroHandler.h"
|
#include "../../lib/CHeroHandler.h"
|
||||||
#include "../../lib/GameSettings.h"
|
#include "../../lib/GameSettings.h"
|
||||||
#include "../../lib/CSkillHandler.h"
|
#include "../../lib/CSkillHandler.h"
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#include "../render/IRenderHandler.h"
|
#include "../render/IRenderHandler.h"
|
||||||
#include "../render/Graphics.h"
|
#include "../render/Graphics.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/campaign/CampaignState.h"
|
#include "../../lib/campaign/CampaignState.h"
|
||||||
#include "../../lib/mapping/CMap.h"
|
#include "../../lib/mapping/CMap.h"
|
||||||
@ -37,10 +35,11 @@
|
|||||||
#include "../../lib/TerrainHandler.h"
|
#include "../../lib/TerrainHandler.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
|
|
||||||
#include "../../lib/serializer/CLoadFile.h"
|
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
#include "../../lib/rmg/CMapGenOptions.h"
|
#include "../../lib/rmg/CMapGenOptions.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/serializer/CLoadFile.h"
|
||||||
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
CMapOverview::CMapOverview(std::string mapName, std::string fileName, std::string date, std::string author, std::string version, ResourcePath resource, ESelectionScreen tabType)
|
CMapOverview::CMapOverview(std::string mapName, std::string fileName, std::string date, std::string author, std::string version, ResourcePath resource, ESelectionScreen tabType)
|
||||||
: CWindowObject(BORDERED | RCLICK_POPUP), resource(resource), mapName(mapName), fileName(fileName), date(date), author(author), version(version), tabType(tabType)
|
: CWindowObject(BORDERED | RCLICK_POPUP), resource(resource), mapName(mapName), fileName(fileName), date(date), author(author), version(version), tabType(tabType)
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
#include "../CPlayerInterface.h"
|
#include "../CPlayerInterface.h"
|
||||||
|
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/mapObjects/CGTownInstance.h"
|
#include "../../lib/mapObjects/CGTownInstance.h"
|
||||||
#include "../../lib/mapObjects/CGMarket.h"
|
#include "../../lib/mapObjects/CGMarket.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
#include "StdInc.h"
|
#include "StdInc.h"
|
||||||
#include "CMessage.h"
|
#include "CMessage.h"
|
||||||
|
|
||||||
#include "../../lib/TextOperations.h"
|
|
||||||
|
|
||||||
#include "../gui/CGuiHandler.h"
|
#include "../gui/CGuiHandler.h"
|
||||||
#include "../render/CAnimation.h"
|
#include "../render/CAnimation.h"
|
||||||
#include "../render/Canvas.h"
|
#include "../render/Canvas.h"
|
||||||
@ -27,6 +25,8 @@
|
|||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
#include "../windows/InfoWindows.h"
|
#include "../windows/InfoWindows.h"
|
||||||
|
|
||||||
|
#include "../../lib/texts/TextOperations.h"
|
||||||
|
|
||||||
constexpr int RIGHT_CLICK_POPUP_MIN_SIZE = 100;
|
constexpr int RIGHT_CLICK_POPUP_MIN_SIZE = 100;
|
||||||
constexpr int SIDE_MARGIN = 11;
|
constexpr int SIDE_MARGIN = 11;
|
||||||
constexpr int TOP_MARGIN = 20;
|
constexpr int TOP_MARGIN = 20;
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "../widgets/TextControls.h"
|
#include "../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/CTownHandler.h"
|
#include "../../lib/CTownHandler.h"
|
||||||
#include "../../lib/StartInfo.h"
|
#include "../../lib/StartInfo.h"
|
||||||
|
|
||||||
|
@ -27,8 +27,7 @@
|
|||||||
#include "../../lib/CArtHandler.h"
|
#include "../../lib/CArtHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/gameState/QuestInfo.h"
|
#include "../../lib/gameState/QuestInfo.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/MetaString.h"
|
|
||||||
#include "../../lib/mapObjects/CQuest.h"
|
#include "../../lib/mapObjects/CQuest.h"
|
||||||
|
|
||||||
VCMI_LIB_NAMESPACE_BEGIN
|
VCMI_LIB_NAMESPACE_BEGIN
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/spells/CSpellHandler.h"
|
#include "../../lib/spells/CSpellHandler.h"
|
||||||
#include "../../lib/spells/ISpellMechanics.h"
|
#include "../../lib/spells/ISpellMechanics.h"
|
||||||
#include "../../lib/spells/Problem.h"
|
#include "../../lib/spells/Problem.h"
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include "../eventsSDL/InputHandler.h"
|
#include "../eventsSDL/InputHandler.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../ConditionalWait.h"
|
#include "../ConditionalWait.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../CPlayerInterface.h"
|
#include "../CPlayerInterface.h"
|
||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "../../CCallback.h"
|
#include "../../CCallback.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h" //for Unicode related stuff
|
#include "../../lib/texts/CGeneralTextHandler.h" //for Unicode related stuff
|
||||||
|
|
||||||
#include <SDL_surface.h>
|
#include <SDL_surface.h>
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "../CGameInfo.h"
|
#include "../CGameInfo.h"
|
||||||
|
|
||||||
#include "../../lib/ArtifactUtils.h"
|
#include "../../lib/ArtifactUtils.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||||
#include "../../lib/networkPacks/ArtifactLocation.h"
|
#include "../../lib/networkPacks/ArtifactLocation.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
#include "../lib/gameState/CGameState.h"
|
#include "../lib/gameState/CGameState.h"
|
||||||
#include "../lib/gameState/SThievesGuildInfo.h"
|
#include "../lib/gameState/SThievesGuildInfo.h"
|
||||||
#include "../lib/gameState/TavernHeroesPool.h"
|
#include "../lib/gameState/TavernHeroesPool.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../lib/CHeroHandler.h"
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "../lib/GameSettings.h"
|
#include "../lib/GameSettings.h"
|
||||||
#include "ConditionalWait.h"
|
#include "ConditionalWait.h"
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "../../gui/CGuiHandler.h"
|
#include "../../gui/CGuiHandler.h"
|
||||||
#include "../../../lib/CConfigHandler.h"
|
#include "../../../lib/CConfigHandler.h"
|
||||||
#include "../../../lib/filesystem/ResourcePath.h"
|
#include "../../../lib/filesystem/ResourcePath.h"
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../widgets/Buttons.h"
|
#include "../../widgets/Buttons.h"
|
||||||
#include "../../widgets/TextControls.h"
|
#include "../../widgets/TextControls.h"
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "../../widgets/Slider.h"
|
#include "../../widgets/Slider.h"
|
||||||
#include "../../widgets/TextControls.h"
|
#include "../../widgets/TextControls.h"
|
||||||
|
|
||||||
#include "../../../lib/CGeneralTextHandler.h"
|
#include "../../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../../lib/filesystem/ResourcePath.h"
|
#include "../../../lib/filesystem/ResourcePath.h"
|
||||||
|
|
||||||
static void setIntSetting(std::string group, std::string field, int value)
|
static void setIntSetting(std::string group, std::string field, int value)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "CMT.h"
|
#include "CMT.h"
|
||||||
#include "CGameInfo.h"
|
#include "CGameInfo.h"
|
||||||
#include "CGeneralTextHandler.h"
|
#include "texts/CGeneralTextHandler.h"
|
||||||
#include "CPlayerInterface.h"
|
#include "CPlayerInterface.h"
|
||||||
#include "CServerHandler.h"
|
#include "CServerHandler.h"
|
||||||
#include "filesystem/ResourcePath.h"
|
#include "filesystem/ResourcePath.h"
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
#include "modManager/cmodlistview_moc.h"
|
#include "modManager/cmodlistview_moc.h"
|
||||||
|
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/CGeneralTextHandler.h"
|
#include "../../lib/texts/CGeneralTextHandler.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
#include "../../lib/VCMIDirs.h"
|
#include "../../lib/VCMIDirs.h"
|
||||||
#include "../../lib/filesystem/Filesystem.h"
|
#include "../../lib/filesystem/Filesystem.h"
|
||||||
#include "../helper.h"
|
#include "../helper.h"
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
#include "languages.h"
|
#include "languages.h"
|
||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/Languages.h"
|
#include "../lib/texts/Languages.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/texts/CGeneralTextHandler.h"
|
||||||
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QListWidget>
|
#include <QListWidget>
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
|
|
||||||
#include "../lib/CConfigHandler.h"
|
#include "../lib/CConfigHandler.h"
|
||||||
#include "../lib/VCMIDirs.h"
|
#include "../lib/VCMIDirs.h"
|
||||||
#include "../lib/Languages.h"
|
|
||||||
#include "../lib/filesystem/Filesystem.h"
|
#include "../lib/filesystem/Filesystem.h"
|
||||||
#include "../lib/logging/CBasicLogConfigurator.h"
|
#include "../lib/logging/CBasicLogConfigurator.h"
|
||||||
|
#include "../lib/texts/Languages.h"
|
||||||
|
|
||||||
#include "updatedialog_moc.h"
|
#include "updatedialog_moc.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "../../lib/VCMIDirs.h"
|
#include "../../lib/VCMIDirs.h"
|
||||||
#include "../../lib/CConfigHandler.h"
|
#include "../../lib/CConfigHandler.h"
|
||||||
#include "../../lib/Languages.h"
|
#include "../../lib/texts/Languages.h"
|
||||||
#include "../../lib/modding/CModVersion.h"
|
#include "../../lib/modding/CModVersion.h"
|
||||||
|
|
||||||
static double mbToBytes(double mb)
|
static double mbToBytes(double mb)
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#include "StdInc.h"
|
#include "StdInc.h"
|
||||||
|
|
||||||
#include "ArtifactUtils.h"
|
#include "ArtifactUtils.h"
|
||||||
#include "CGeneralTextHandler.h"
|
|
||||||
#include "ExceptionsCommon.h"
|
#include "ExceptionsCommon.h"
|
||||||
#include "GameSettings.h"
|
#include "GameSettings.h"
|
||||||
#include "mapObjects/MapObjects.h"
|
#include "mapObjects/MapObjects.h"
|
||||||
@ -20,6 +19,8 @@
|
|||||||
#include "mapObjectConstructors/AObjectTypeHandler.h"
|
#include "mapObjectConstructors/AObjectTypeHandler.h"
|
||||||
#include "mapObjectConstructors/CObjectClassesHandler.h"
|
#include "mapObjectConstructors/CObjectClassesHandler.h"
|
||||||
#include "serializer/JsonSerializeFormat.h"
|
#include "serializer/JsonSerializeFormat.h"
|
||||||
|
#include "texts/CGeneralTextHandler.h"
|
||||||
|
#include "texts/CLegacyConfigParser.h"
|
||||||
|
|
||||||
// Note: list must match entries in ArtTraits.txt
|
// Note: list must match entries in ArtTraits.txt
|
||||||
#define ART_POS_LIST \
|
#define ART_POS_LIST \
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include "GameConstants.h"
|
#include "GameConstants.h"
|
||||||
#include "CCreatureHandler.h"
|
#include "CCreatureHandler.h"
|
||||||
#include "CGeneralTextHandler.h"
|
#include "texts/CGeneralTextHandler.h"
|
||||||
#include "json/JsonUtils.h"
|
#include "json/JsonUtils.h"
|
||||||
#include "spells/CSpellHandler.h"
|
#include "spells/CSpellHandler.h"
|
||||||
#include "VCMI_Lib.h"
|
#include "VCMI_Lib.h"
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
#include "StdInc.h"
|
#include "StdInc.h"
|
||||||
#include "CCreatureHandler.h"
|
#include "CCreatureHandler.h"
|
||||||
|
|
||||||
#include "CGeneralTextHandler.h"
|
|
||||||
#include "ResourceSet.h"
|
#include "ResourceSet.h"
|
||||||
#include "filesystem/Filesystem.h"
|
#include "filesystem/Filesystem.h"
|
||||||
#include "VCMI_Lib.h"
|
#include "VCMI_Lib.h"
|
||||||
@ -22,6 +21,8 @@
|
|||||||
#include "json/JsonBonus.h"
|
#include "json/JsonBonus.h"
|
||||||
#include "serializer/JsonDeserializer.h"
|
#include "serializer/JsonDeserializer.h"
|
||||||
#include "serializer/JsonUpdater.h"
|
#include "serializer/JsonUpdater.h"
|
||||||
|
#include "texts/CGeneralTextHandler.h"
|
||||||
|
#include "texts/CLegacyConfigParser.h"
|
||||||
#include "mapObjectConstructors/AObjectTypeHandler.h"
|
#include "mapObjectConstructors/AObjectTypeHandler.h"
|
||||||
#include "mapObjectConstructors/CObjectClassesHandler.h"
|
#include "mapObjectConstructors/CObjectClassesHandler.h"
|
||||||
#include "modding/CModHandler.h"
|
#include "modding/CModHandler.h"
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "mapObjects/CGHeroInstance.h"
|
#include "mapObjects/CGHeroInstance.h"
|
||||||
#include "modding/ModScope.h"
|
#include "modding/ModScope.h"
|
||||||
#include "IGameCallback.h"
|
#include "IGameCallback.h"
|
||||||
#include "CGeneralTextHandler.h"
|
#include "texts/CGeneralTextHandler.h"
|
||||||
#include "spells/CSpellHandler.h"
|
#include "spells/CSpellHandler.h"
|
||||||
#include "CHeroHandler.h"
|
#include "CHeroHandler.h"
|
||||||
#include "IBonusTypeHandler.h"
|
#include "IBonusTypeHandler.h"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "mapObjects/CGTownInstance.h"
|
#include "mapObjects/CGTownInstance.h"
|
||||||
#include "mapObjects/MiscObjects.h"
|
#include "mapObjects/MiscObjects.h"
|
||||||
#include "networkPacks/ArtifactLocation.h"
|
#include "networkPacks/ArtifactLocation.h"
|
||||||
#include "CGeneralTextHandler.h"
|
#include "texts/CGeneralTextHandler.h"
|
||||||
#include "StartInfo.h" // for StartInfo
|
#include "StartInfo.h" // for StartInfo
|
||||||
#include "battle/BattleInfo.h" // for BattleInfo
|
#include "battle/BattleInfo.h" // for BattleInfo
|
||||||
#include "GameSettings.h"
|
#include "GameSettings.h"
|
||||||
|
@ -1,323 +0,0 @@
|
|||||||
/*
|
|
||||||
* CGeneralTextHandler.h, part of VCMI engine
|
|
||||||
*
|
|
||||||
* Authors: listed in file AUTHORS in main folder
|
|
||||||
*
|
|
||||||
* License: GNU General Public License v2.0 or later
|
|
||||||
* Full text of license available in license.txt file, in main folder
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "filesystem/ResourcePath.h"
|
|
||||||
|
|
||||||
VCMI_LIB_NAMESPACE_BEGIN
|
|
||||||
|
|
||||||
class CInputStream;
|
|
||||||
class JsonNode;
|
|
||||||
class JsonSerializeFormat;
|
|
||||||
|
|
||||||
/// Parser for any text files from H3
|
|
||||||
class DLL_LINKAGE CLegacyConfigParser
|
|
||||||
{
|
|
||||||
std::string fileEncoding;
|
|
||||||
|
|
||||||
std::unique_ptr<char[]> data;
|
|
||||||
char * curr;
|
|
||||||
char * end;
|
|
||||||
|
|
||||||
/// extracts part of quoted string.
|
|
||||||
std::string extractQuotedPart();
|
|
||||||
|
|
||||||
/// extracts quoted string. Any end of lines are ignored, double-quote is considered as "escaping"
|
|
||||||
std::string extractQuotedString();
|
|
||||||
|
|
||||||
/// extracts non-quoted string
|
|
||||||
std::string extractNormalString();
|
|
||||||
|
|
||||||
/// reads "raw" string without encoding conversion
|
|
||||||
std::string readRawString();
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// read one entry from current line. Return ""/0 if end of line reached
|
|
||||||
std::string readString();
|
|
||||||
float readNumber();
|
|
||||||
|
|
||||||
template <typename numeric>
|
|
||||||
std::vector<numeric> readNumArray(size_t size)
|
|
||||||
{
|
|
||||||
std::vector<numeric> ret;
|
|
||||||
ret.reserve(size);
|
|
||||||
while (size--)
|
|
||||||
ret.push_back((numeric)readNumber());
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// returns true if next entry is empty
|
|
||||||
bool isNextEntryEmpty() const;
|
|
||||||
|
|
||||||
/// end current line
|
|
||||||
bool endLine();
|
|
||||||
|
|
||||||
explicit CLegacyConfigParser(const TextPath & URI);
|
|
||||||
};
|
|
||||||
|
|
||||||
class CGeneralTextHandler;
|
|
||||||
|
|
||||||
/// Small wrapper that provides text access API compatible with old code
|
|
||||||
class DLL_LINKAGE LegacyTextContainer
|
|
||||||
{
|
|
||||||
CGeneralTextHandler & owner;
|
|
||||||
std::string basePath;
|
|
||||||
|
|
||||||
public:
|
|
||||||
LegacyTextContainer(CGeneralTextHandler & owner, std::string basePath);
|
|
||||||
std::string operator [](size_t index) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Small wrapper that provides help text access API compatible with old code
|
|
||||||
class DLL_LINKAGE LegacyHelpContainer
|
|
||||||
{
|
|
||||||
CGeneralTextHandler & owner;
|
|
||||||
std::string basePath;
|
|
||||||
|
|
||||||
public:
|
|
||||||
LegacyHelpContainer(CGeneralTextHandler & owner, std::string basePath);
|
|
||||||
std::pair<std::string, std::string> operator[](size_t index) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
class TextIdentifier
|
|
||||||
{
|
|
||||||
std::string identifier;
|
|
||||||
public:
|
|
||||||
const std::string & get() const
|
|
||||||
{
|
|
||||||
return identifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
TextIdentifier(const char * id):
|
|
||||||
identifier(id)
|
|
||||||
{}
|
|
||||||
|
|
||||||
TextIdentifier(const std::string & id):
|
|
||||||
identifier(id)
|
|
||||||
{}
|
|
||||||
|
|
||||||
template<typename... T>
|
|
||||||
TextIdentifier(const std::string & id, size_t index, T... rest):
|
|
||||||
TextIdentifier(id + '.' + std::to_string(index), rest...)
|
|
||||||
{}
|
|
||||||
|
|
||||||
template<typename... T>
|
|
||||||
TextIdentifier(const std::string & id, const std::string & id2, T... rest):
|
|
||||||
TextIdentifier(id + '.' + id2, rest...)
|
|
||||||
{}
|
|
||||||
};
|
|
||||||
|
|
||||||
class DLL_LINKAGE TextLocalizationContainer
|
|
||||||
{
|
|
||||||
protected:
|
|
||||||
static std::recursive_mutex globalTextMutex;
|
|
||||||
|
|
||||||
struct StringState
|
|
||||||
{
|
|
||||||
/// Human-readable string that was added on registration
|
|
||||||
std::string baseValue;
|
|
||||||
|
|
||||||
/// Language of base string
|
|
||||||
std::string baseLanguage;
|
|
||||||
|
|
||||||
/// Translated human-readable string
|
|
||||||
std::string overrideValue;
|
|
||||||
|
|
||||||
/// Language of the override string
|
|
||||||
std::string overrideLanguage;
|
|
||||||
|
|
||||||
/// ID of mod that created this string
|
|
||||||
std::string modContext;
|
|
||||||
|
|
||||||
template <typename Handler>
|
|
||||||
void serialize(Handler & h)
|
|
||||||
{
|
|
||||||
h & baseValue;
|
|
||||||
h & baseLanguage;
|
|
||||||
h & modContext;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/// map identifier -> localization
|
|
||||||
std::unordered_map<std::string, StringState> stringsLocalizations;
|
|
||||||
|
|
||||||
std::vector<const TextLocalizationContainer *> subContainers;
|
|
||||||
|
|
||||||
/// add selected string to internal storage as high-priority strings
|
|
||||||
void registerStringOverride(const std::string & modContext, const std::string & language, const TextIdentifier & UID, const std::string & localized);
|
|
||||||
|
|
||||||
std::string getModLanguage(const std::string & modContext);
|
|
||||||
|
|
||||||
// returns true if identifier with such name was registered, even if not translated to current language
|
|
||||||
bool identifierExists(const TextIdentifier & UID) const;
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// validates translation of specified language for specified mod
|
|
||||||
/// returns true if localization is valid and complete
|
|
||||||
/// any error messages will be written to log file
|
|
||||||
bool validateTranslation(const std::string & language, const std::string & modContext, JsonNode const & file) const;
|
|
||||||
|
|
||||||
/// Loads translation from provided json
|
|
||||||
/// Any entries loaded by this will have priority over texts registered normally
|
|
||||||
void loadTranslationOverrides(const std::string & language, const std::string & modContext, JsonNode const & file);
|
|
||||||
|
|
||||||
/// add selected string to internal storage
|
|
||||||
void registerString(const std::string & modContext, const TextIdentifier & UID, const std::string & localized);
|
|
||||||
void registerString(const std::string & modContext, const TextIdentifier & UID, const std::string & localized, const std::string & language);
|
|
||||||
|
|
||||||
/// returns translated version of a string that can be displayed to user
|
|
||||||
template<typename ... Args>
|
|
||||||
std::string translate(std::string arg1, Args ... args) const
|
|
||||||
{
|
|
||||||
TextIdentifier id(arg1, args ...);
|
|
||||||
return deserialize(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// converts identifier into user-readable string
|
|
||||||
const std::string & deserialize(const TextIdentifier & identifier) const;
|
|
||||||
|
|
||||||
/// Debug method, returns all currently stored texts
|
|
||||||
/// Format: [mod ID][string ID] -> human-readable text
|
|
||||||
void exportAllTexts(std::map<std::string, std::map<std::string, std::string>> & storage) const;
|
|
||||||
|
|
||||||
/// Add or override subcontainer which can store identifiers
|
|
||||||
void addSubContainer(const TextLocalizationContainer & container);
|
|
||||||
|
|
||||||
/// Remove subcontainer with give name
|
|
||||||
void removeSubContainer(const TextLocalizationContainer & container);
|
|
||||||
|
|
||||||
void jsonSerialize(JsonNode & dest) const;
|
|
||||||
|
|
||||||
template <typename Handler>
|
|
||||||
void serialize(Handler & h)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
|
|
||||||
|
|
||||||
if (h.version >= Handler::Version::SIMPLE_TEXT_CONTAINER_SERIALIZATION)
|
|
||||||
{
|
|
||||||
h & stringsLocalizations;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
std::string key;
|
|
||||||
int64_t sz = stringsLocalizations.size();
|
|
||||||
|
|
||||||
if (h.version >= Handler::Version::REMOVE_TEXT_CONTAINER_SIZE_T)
|
|
||||||
{
|
|
||||||
int64_t size = sz;
|
|
||||||
h & size;
|
|
||||||
sz = size;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
h & sz;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(h.saving)
|
|
||||||
{
|
|
||||||
for(auto s : stringsLocalizations)
|
|
||||||
{
|
|
||||||
key = s.first;
|
|
||||||
h & key;
|
|
||||||
h & s.second;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for(size_t i = 0; i < sz; ++i)
|
|
||||||
{
|
|
||||||
h & key;
|
|
||||||
h & stringsLocalizations[key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class DLL_LINKAGE TextContainerRegistrable : public TextLocalizationContainer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
TextContainerRegistrable();
|
|
||||||
~TextContainerRegistrable();
|
|
||||||
|
|
||||||
TextContainerRegistrable(const TextContainerRegistrable & other);
|
|
||||||
TextContainerRegistrable(TextContainerRegistrable && other) noexcept;
|
|
||||||
|
|
||||||
TextContainerRegistrable& operator=(const TextContainerRegistrable & b) = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Handles all text-related data in game
|
|
||||||
class DLL_LINKAGE CGeneralTextHandler: public TextLocalizationContainer
|
|
||||||
{
|
|
||||||
void readToVector(const std::string & sourceID, const std::string & sourceName);
|
|
||||||
|
|
||||||
/// number of scenarios in specific campaign. TODO: move to a better location
|
|
||||||
std::vector<size_t> scenariosCountPerCampaign;
|
|
||||||
|
|
||||||
public:
|
|
||||||
LegacyTextContainer allTexts;
|
|
||||||
|
|
||||||
LegacyTextContainer arraytxt;
|
|
||||||
LegacyTextContainer primarySkillNames;
|
|
||||||
LegacyTextContainer jktexts;
|
|
||||||
LegacyTextContainer heroscrn;
|
|
||||||
LegacyTextContainer overview;//text for Kingdom Overview window
|
|
||||||
LegacyTextContainer colors; //names of player colors ("red",...)
|
|
||||||
LegacyTextContainer capColors; //names of player colors with first letter capitalized ("Red",...)
|
|
||||||
LegacyTextContainer turnDurations; //turn durations for pregame (1 Minute ... Unlimited)
|
|
||||||
|
|
||||||
//towns
|
|
||||||
LegacyTextContainer tcommands, hcommands, fcommands; //texts for town screen, town hall screen and fort screen
|
|
||||||
LegacyTextContainer tavernInfo;
|
|
||||||
LegacyTextContainer tavernRumors;
|
|
||||||
|
|
||||||
LegacyTextContainer qeModCommands;
|
|
||||||
|
|
||||||
LegacyHelpContainer zelp;
|
|
||||||
LegacyTextContainer lossConditions;
|
|
||||||
LegacyTextContainer victoryConditions;
|
|
||||||
|
|
||||||
//objects
|
|
||||||
LegacyTextContainer advobtxt;
|
|
||||||
LegacyTextContainer restypes; //names of resources
|
|
||||||
LegacyTextContainer randsign;
|
|
||||||
LegacyTextContainer seerEmpty;
|
|
||||||
LegacyTextContainer seerNames;
|
|
||||||
LegacyTextContainer tentColors;
|
|
||||||
|
|
||||||
//sec skills
|
|
||||||
LegacyTextContainer levels;
|
|
||||||
//commanders
|
|
||||||
LegacyTextContainer znpc00; //more or less useful content of that file
|
|
||||||
|
|
||||||
std::vector<std::string> findStringsWithPrefix(const std::string & prefix);
|
|
||||||
|
|
||||||
int32_t pluralText(int32_t textIndex, int32_t count) const;
|
|
||||||
|
|
||||||
size_t getCampaignLength(size_t campaignID) const;
|
|
||||||
|
|
||||||
CGeneralTextHandler();
|
|
||||||
CGeneralTextHandler(const CGeneralTextHandler&) = delete;
|
|
||||||
CGeneralTextHandler operator=(const CGeneralTextHandler&) = delete;
|
|
||||||
|
|
||||||
/// Attempts to detect encoding & language of H3 files
|
|
||||||
static void detectInstallParameters();
|
|
||||||
|
|
||||||
/// Returns name of language preferred by user
|
|
||||||
static std::string getPreferredLanguage();
|
|
||||||
|
|
||||||
/// Returns name of language of Heroes III text files
|
|
||||||
static std::string getInstalledLanguage();
|
|
||||||
|
|
||||||
/// Returns name of encoding of Heroes III text files
|
|
||||||
static std::string getInstalledEncoding();
|
|
||||||
};
|
|
||||||
|
|
||||||
VCMI_LIB_NAMESPACE_END
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user