games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Code style: move or add licensing information on top of every file

Browse Source
This commit is contained in:
Arseniy Shestakov 2017-07-13 11:26:03 +03:00
parent 564cf05117
commit f1e5797834
335 changed files with 1881 additions and 1512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AI/BattleAI/BattleAI.cpp
View File

@ -1,12 +1,12 @@
/*
* BattleAI.cpp, 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
*
*/
* BattleAI.cpp, 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
*
*/
#include "StdInc.h"
#include "BattleAI.h"
#include "StackWithBonuses.h"

3
AI/BattleAI/ThreatMap.cpp
View File

@ -1,5 +1,3 @@
#include "StdInc.h"
/*
* ThreatMap.cpp, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
/*
#include "ThreatMap.h"
#include "StdInc.h"

9
AI/EmptyAI/CEmptyAI.cpp
View File

@ -1,3 +1,12 @@
/*
* CEmptyAI.cpp, 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
*
*/
#include "StdInc.h"
#include "CEmptyAI.h"

9
AI/EmptyAI/CEmptyAI.h
View File

@ -1,3 +1,12 @@
/*
* CEmptyAI.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 "../../lib/AI_Base.h"

9
AI/EmptyAI/exp_funcs.cpp
View File

@ -1,3 +1,12 @@
/*
* exp_funcs.cpp, 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
*
*/
#include "StdInc.h"
#include "CEmptyAI.h"

9
AI/StupidAI/StupidAI.cpp
View File

@ -1,3 +1,12 @@
/*
* StupidAI.cpp, 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
*
*/
#include "StdInc.h"
#include "../../lib/AI_Base.h"
#include "StupidAI.h"

9
AI/StupidAI/StupidAI.h
View File

@ -1,3 +1,12 @@
/*
* StupidAI.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 "../../lib/battle/BattleHex.h"

9
AI/StupidAI/main.cpp
View File

@ -1,3 +1,12 @@
/*
* main.cpp, 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
*
*/
#include "StdInc.h"
#include "../../lib/AI_Base.h"

19
AI/VCAI/AIUtility.cpp
View File

@ -1,3 +1,12 @@
/*
* AIUtility.cpp, 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
*
*/
#include "StdInc.h"
#include "AIUtility.h"
#include "VCAI.h"
@ -12,16 +21,6 @@
#include "../../lib/CPathfinder.h"
#include "../../lib/mapping/CMapDefines.h"
/*
* AIUtility.cpp, 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
*
*/
extern boost::thread_specific_ptr<CCallback> cb;
extern boost::thread_specific_ptr<VCAI> ai;
extern FuzzyHelper *fh;

19
AI/VCAI/AIUtility.h
View File

@ -1,3 +1,12 @@
/*
* AIUtility.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 "../../lib/VCMI_Lib.h"
@ -9,16 +18,6 @@
#include "../../lib/mapObjects/CObjectHandler.h"
#include "../../lib/mapObjects/CGHeroInstance.h"
/*
* AIUtility.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
*
*/
class CCallback;
typedef const int3& crint3;

19
AI/VCAI/Fuzzy.cpp
View File

@ -1,3 +1,12 @@
/*
* Fuzzy.cpp, 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
*
*/
#include "StdInc.h"
#include "Fuzzy.h"
#include <limits>
@ -11,16 +20,6 @@
#include "../../CCallback.h"
#include "VCAI.h"
/*
* Fuzzy.cpp, 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
*
*/
#define MIN_AI_STRENGHT (0.5f) //lower when combat AI gets smarter
#define UNGUARDED_OBJECT (100.0f) //we consider unguarded objects 100 times weaker than us

7
AI/VCAI/Fuzzy.h
View File

@ -1,7 +1,3 @@
#pragma once
#include "fl/Headers.h"
#include "Goals.h"
/*
* Fuzzy.h, part of VCMI engine
*
@ -11,6 +7,9 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "fl/Headers.h"
#include "Goals.h"
class VCAI;
class CArmedInstance;

13
AI/VCAI/Goals.cpp
View File

@ -1,10 +1,3 @@
#include "StdInc.h"
#include "Goals.h"
#include "VCAI.h"
#include "Fuzzy.h"
#include "../../lib/mapping/CMap.h" //for victory conditions
#include "../../lib/CPathfinder.h"
/*
* Goals.cpp, part of VCMI engine
*
@ -14,6 +7,12 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "Goals.h"
#include "VCAI.h"
#include "Fuzzy.h"
#include "../../lib/mapping/CMap.h" //for victory conditions
#include "../../lib/CPathfinder.h"
extern boost::thread_specific_ptr<CCallback> cb;
extern boost::thread_specific_ptr<VCAI> ai;

16
AI/VCAI/Goals.h
View File

@ -1,11 +1,3 @@
#pragma once
#include "../../lib/VCMI_Lib.h"
#include "../../lib/CBuildingHandler.h"
#include "../../lib/CCreatureHandler.h"
#include "../../lib/CTownHandler.h"
#include "AIUtility.h"
/*
* Goals.h, part of VCMI engine
*
@ -15,6 +7,14 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/VCMI_Lib.h"
#include "../../lib/CBuildingHandler.h"
#include "../../lib/CCreatureHandler.h"
#include "../../lib/CTownHandler.h"
#include "AIUtility.h"
struct HeroPtr;
class VCAI;
class FuzzyHelper;

19
AI/VCAI/VCAI.cpp
View File

@ -1,3 +1,12 @@
/*
* VCAI.cpp, 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
*
*/
#include "StdInc.h"
#include "VCAI.h"
#include "Fuzzy.h"
@ -13,16 +22,6 @@
#include "../../lib/serializer/BinarySerializer.h"
#include "../../lib/serializer/BinaryDeserializer.h"
/*
* VCAI.cpp, 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
*
*/
extern FuzzyHelper *fh;
class CGVisitableOPW;

19
AI/VCAI/VCAI.h
View File

@ -1,3 +1,12 @@
/*
* VCAI.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 "AIUtility.h"
@ -18,16 +27,6 @@
struct QuestInfo;
/*
* VCAI.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
*
*/
class AIStatus
{
boost::mutex mx;

9
AI/VCAI/main.cpp
View File

@ -1,3 +1,12 @@
/*
* main.cpp, 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
*
*/
#include "StdInc.h"
#include "VCAI.h"

19
CCallback.cpp
View File

@ -1,3 +1,12 @@
/*
* CCallback.cpp, 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
*
*/
#include "StdInc.h"
#include "CCallback.h"
@ -20,16 +29,6 @@
#include "lib/UnlockGuard.h"
#include "lib/battle/BattleInfo.h"
/*
* CCallback.cpp, 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
*
*/
bool CCallback::teleportHero(const CGHeroInstance *who, const CGTownInstance *where)
{
CastleTeleportHero pack(who->id, where->id, 1);

10
CCallback.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "lib/CGameInfoCallback.h"
#include "lib/int3.h" // for int3
/*
* CCallback.h, part of VCMI engine
*
@ -13,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "lib/CGameInfoCallback.h"
#include "lib/int3.h" // for int3
class CGHeroInstance;
class CGameState;

3
Global.h
View File

@ -1,5 +1,3 @@
#pragma once
/*
* Global.h, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
/* ---------------------------------------------------------------------------- */
/* Compiler detection */

9
Version.cpp.in
View File

@ -1,3 +1,12 @@
/*
* Version.cpp.in, 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
*
*/
#include "Version.h"
namespace GameConstants

16
client/CBitmapHandler.cpp
View File

@ -1,12 +1,3 @@
#include "StdInc.h"
#include "../lib/filesystem/Filesystem.h"
#include "SDL.h"
#include "SDL_image.h"
#include "CBitmapHandler.h"
#include "gui/SDL_Extensions.h"
#include "../lib/vcmi_endian.h"
/*
* CBitmapHandler.cpp, part of VCMI engine
*
@ -16,7 +7,14 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "../lib/filesystem/Filesystem.h"
#include "SDL.h"
#include "SDL_image.h"
#include "CBitmapHandler.h"
#include "gui/SDL_Extensions.h"
#include "../lib/vcmi_endian.h"
namespace BitmapHandler
{

3
client/CBitmapHandler.h
View File

@ -1,5 +1,3 @@
#pragma once
/*
* CBitmapHandler.h, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
struct SDL_Surface;

16
client/CDefHandler.cpp
View File

@ -1,11 +1,3 @@
#include "StdInc.h"
#include "SDL.h"
#include "CDefHandler.h"
#include "../lib/filesystem/Filesystem.h"
#include "../lib/VCMI_Lib.h"
#include "CBitmapHandler.h"
#include "gui/SDL_Extensions.h"
/*
* CDefHandler.cpp, part of VCMI engine
*
@ -15,6 +7,14 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "SDL.h"
#include "CDefHandler.h"
#include "../lib/filesystem/Filesystem.h"
#include "../lib/VCMI_Lib.h"
#include "CBitmapHandler.h"
#include "gui/SDL_Extensions.h"
#ifdef unused
static long long pow(long long a, int b)

13
client/CDefHandler.h
View File

@ -1,10 +1,3 @@
#pragma once
#include "../lib/vcmi_endian.h"
struct SDL_Surface;
struct SDL_Color;
/*
* CDefHandler.h, part of VCMI engine
*
@ -14,6 +7,12 @@ struct SDL_Color;
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/vcmi_endian.h"
struct SDL_Surface;
struct SDL_Color;
struct Cimage
{

9
client/CGameInfo.cpp
View File

@ -1,8 +1,3 @@
#include "StdInc.h"
#include "CGameInfo.h"
#include "../lib/VCMI_Lib.h"
/*
* CGameInfo.cpp, part of VCMI engine
*
@ -12,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "CGameInfo.h"
#include "../lib/VCMI_Lib.h"
const CGameInfo * CGI; //game info for general use
CClientState * CCS = nullptr;

9
client/CGameInfo.h
View File

@ -1,8 +1,3 @@
#pragma once
#include "../lib/ConstTransitivePtr.h"
/*
* CGameInfo.h, part of VCMI engine
*
@ -12,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/ConstTransitivePtr.h"
class CModHandler;
class CMapHandler;

19
client/CMT.cpp
View File

@ -1,3 +1,12 @@
/*
* CMT.cpp, 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
*
*/
// CMT.cpp : Defines the entry point for the console application.
//
#include "StdInc.h"
@ -63,16 +72,6 @@ namespace po = boost::program_options;
namespace po_style = boost::program_options::command_line_style;
namespace bfs = boost::filesystem;
/*
* CMT.cpp, 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
*
*/
std::string NAME_AFFIX = "client";
std::string NAME = GameConstants::VCMI_VERSION + std::string(" (") + NAME_AFFIX + ')'; //application name
CGuiHandler GH;

9
client/CMT.h
View File

@ -1,3 +1,12 @@
/*
* CMT.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 <SDL_render.h>
#include "../lib/CondSh.h"

10
client/CMessage.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "Graphics.h"
#include "gui/Geometries.h"
/*
* CMessage.h, part of VCMI engine
*
@ -13,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "Graphics.h"
#include "gui/Geometries.h"
struct SDL_Surface;
class CInfoWindow;

19
client/CMusicHandler.cpp
View File

@ -1,3 +1,12 @@
/*
* CMusicHandler.cpp, 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
*
*/
#include "StdInc.h"
#include <SDL_mixer.h>
@ -12,16 +21,6 @@
#include "../lib/StringConstants.h"
#include "../lib/CRandomGenerator.h"
/*
* CMusicHandler.cpp, 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
*
*/
#define VCMI_SOUND_NAME(x)
#define VCMI_SOUND_FILE(y) #y,

9
client/CMusicHandler.h
View File

@ -1,8 +1,3 @@
#pragma once
#include "../lib/CConfigHandler.h"
#include "../lib/CSoundBase.h"
/*
* CMusicHandler.h, part of VCMI engine
*
@ -12,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/CConfigHandler.h"
#include "../lib/CSoundBase.h"
class CSpell;
struct _Mix_Music;

19
client/CPlayerInterface.cpp
View File

@ -1,3 +1,12 @@
/*
* CPlayerInterface.cpp, 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
*
*/
#include "StdInc.h"
#include "windows/CAdvmapInterface.h"
#include "battle/CBattleInterface.h"
@ -47,16 +56,6 @@
#include "../lib/UnlockGuard.h"
#include <SDL.h>
/*
* CPlayerInterface.cpp, 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
*
*/
// The macro below is used to mark functions that are called by client when game state changes.
// They all assume that CPlayerInterface::pim mutex is locked.

19
client/CPlayerInterface.h
View File

@ -1,3 +1,12 @@
/*
* CPlayerInterface.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
@ -17,16 +26,6 @@
#undef min
#endif
/*
* CPlayerInterface.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
*
*/
class CButton;
class CToggleGroup;
struct TryMoveHero;

18
client/CPreGame.cpp
View File

@ -1,3 +1,12 @@
/*
* CPreGame.cpp, 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
*
*/
#include "StdInc.h"
#include "CPreGame.h"
@ -47,15 +56,6 @@
#include "../lib/CRandomGenerator.h"
#include "../lib/CondSh.h"
/*
* CPreGame.cpp, 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
*
*/
namespace fs = boost::filesystem;
void startGame(StartInfo * options, CConnection *serv = nullptr);

15
client/CPreGame.h
View File

@ -1,11 +1,3 @@
#pragma once
#include "../lib/StartInfo.h"
#include "../lib/FunctionList.h"
#include "../lib/mapping/CMapInfo.h"
#include "../lib/rmg/CMapGenerator.h"
#include "windows/CWindowObject.h"
/*
* CPreGame.h, part of VCMI engine
*
@ -15,6 +7,13 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/StartInfo.h"
#include "../lib/FunctionList.h"
#include "../lib/mapping/CMapInfo.h"
#include "../lib/rmg/CMapGenerator.h"
#include "windows/CWindowObject.h"
class CMapInfo;
class CMusicHandler;

9
client/CVideoHandler.cpp
View File

@ -1,3 +1,12 @@
/*
* CVideoHandler.cpp, 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
*
*/
#include "StdInc.h"
#include <SDL.h>
#include "CVideoHandler.h"

9
client/CVideoHandler.h
View File

@ -1,3 +1,12 @@
/*
* CVideoHandler.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
struct SDL_Surface;

19
client/Client.cpp
View File

@ -1,3 +1,12 @@
/*
* Client.cpp, 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
*
*/
#include "StdInc.h"
#include "Client.h"
@ -45,16 +54,6 @@ extern std::string NAME;
#include "lib/CAndroidVMHelper.h"
#endif
/*
* Client.cpp, 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
*
*/
#ifdef VCMI_ANDROID
std::atomic_bool androidTestServerReadyFlag;
#endif

15
client/Client.h
View File

@ -1,11 +1,3 @@
#pragma once
#include "../lib/IGameCallback.h"
#include "../lib/battle/BattleAction.h"
#include "../lib/CStopWatch.h"
#include "../lib/int3.h"
/*
* Client.h, part of VCMI engine
*
@ -15,6 +7,13 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/IGameCallback.h"
#include "../lib/battle/BattleAction.h"
#include "../lib/CStopWatch.h"
#include "../lib/int3.h"
struct CPack;
class CCampaignState;

19
client/Graphics.cpp
View File

@ -1,3 +1,12 @@
/*
* Graphics.cpp, 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
*
*/
#include "StdInc.h"
#include "Graphics.h"
@ -31,16 +40,6 @@ using namespace CSDL_Ext;
#undef max
#endif
/*
* Graphics.cpp, 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
*
*/
Graphics * graphics = nullptr;
void Graphics::loadPaletteAndColors()

11
client/Graphics.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "gui/Fonts.h"
#include "../lib/GameConstants.h"
#include "gui/Geometries.h"
/*
* Graphics.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "gui/Fonts.h"
#include "../lib/GameConstants.h"
#include "gui/Geometries.h"
struct SDL_Surface;
class CGHeroInstance;

18
client/NetPacksClient.cpp
View File

@ -1,3 +1,12 @@
/*
* NetPacksClient.cpp, 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
*
*/
#include "StdInc.h"
#include "../lib/NetPacks.h"
@ -101,15 +110,6 @@
CALL_ONLY_THAT_BATTLE_INTERFACE(PlayerColor::SPECTATOR, function, __VA_ARGS__) \
} \
BATTLE_INTERFACE_CALL_RECEIVERS(function, __VA_ARGS__)
/*
* NetPacksClient.cpp, 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
*
*/
void SetResources::applyCl(CClient *cl)
{

3
client/SDLRWwrapper.h
View File

@ -1,5 +1,3 @@
#pragma once
/*
* SDLRWwrapper.h, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
struct SDL_RWops;
class CInputStream;

19
client/battle/CBattleAnimations.cpp
View File

@ -1,3 +1,12 @@
/*
* CBattleAnimations.cpp, 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
*
*/
#include "StdInc.h"
#include "CBattleAnimations.h"
@ -22,16 +31,6 @@
#include "../../lib/mapObjects/CGTownInstance.h"
#include "../../lib/spells/CSpellHandler.h"
/*
* CBattleAnimations.cpp, 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
*
*/
CBattleAnimation::CBattleAnimation(CBattleInterface * _owner)
: owner(_owner), ID(_owner->animIDhelper++)
{

19
client/battle/CBattleAnimations.h
View File

@ -1,3 +1,12 @@
/*
* CBattleAnimations.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 "../../lib/battle/BattleHex.h"
@ -9,16 +18,6 @@ class CCreatureAnimation;
struct CatapultProjectileInfo;
struct StackAttackedInfo;
/*
* CBattleAnimations.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
*
*/
/// Base class of battle animations
class CBattleAnimation
{

20
client/battle/CBattleInterface.cpp
View File

@ -1,3 +1,12 @@
/*
* CBattleInterface.cpp, 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
*
*/
#include "StdInc.h"
#include "CBattleInterface.h"
@ -35,17 +44,6 @@
#include "../../lib/NetPacks.h"
#include "../../lib/UnlockGuard.h"
/*
* CBattleInterface.cpp, 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
*
*/
CondSh<bool> CBattleInterface::animsAreDisplayed(false);
CondSh<BattleAction *> CBattleInterface::givenCommand(nullptr);

17
client/battle/CBattleInterface.h
View File

@ -1,12 +1,3 @@
#pragma once
#include "../../lib/ConstTransitivePtr.h" //may be reundant
#include "../../lib/GameConstants.h"
#include "CBattleAnimations.h"
#include "../../lib/spells/CSpellHandler.h" //CSpell::TAnimation
/*
* CBattleInterface.h, part of VCMI engine
*
@ -16,6 +7,14 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/ConstTransitivePtr.h" //may be reundant
#include "../../lib/GameConstants.h"
#include "CBattleAnimations.h"
#include "../../lib/spells/CSpellHandler.h" //CSpell::TAnimation
class CLabel;
class CCreatureSet;

19
client/battle/CBattleInterfaceClasses.cpp
View File

@ -1,3 +1,12 @@
/*
* CBattleInterfaceClasses.cpp, 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
*
*/
#include "StdInc.h"
#include "CBattleInterfaceClasses.h"
@ -31,16 +40,6 @@
#include "../../lib/CondSh.h"
#include "../../lib/mapObjects/CGTownInstance.h"
/*
* CBattleInterfaceClasses.cpp, 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
*
*/
void CBattleConsole::showAll(SDL_Surface * to)
{
Point textPos(pos.x + pos.w/2, pos.y + 17);

19
client/battle/CBattleInterfaceClasses.h
View File

@ -1,3 +1,12 @@
/*
* CBattleInterfaceClasses.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 "../gui/CIntObject.h"
@ -18,16 +27,6 @@ class CStack;
class CAnimImage;
class CPlayerInterface;
/*
* CBattleInterfaceClasses.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
*
*/
/// Class which shows the console at the bottom of the battle screen and manages the text of the console
class CBattleConsole : public CIntObject
{

19
client/battle/CCreatureAnimation.cpp
View File

@ -1,3 +1,12 @@
/*
* CCreatureAnimation.cpp, 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
*
*/
#include "StdInc.h"
#include "CCreatureAnimation.h"
@ -10,16 +19,6 @@
#include "../gui/SDL_Pixels.h"
/*
* CCreatureAnimation.cpp, 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
*
*/
static const SDL_Color creatureBlueBorder = { 0, 255, 255, 255 };
static const SDL_Color creatureGoldBorder = { 255, 255, 0, 255 };
static const SDL_Color creatureNoBorder = { 0, 0, 0, 0 };

11
client/battle/CCreatureAnimation.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "../../lib/FunctionList.h"
#include "../gui/SDL_Extensions.h"
#include "../widgets/Images.h"
/*
* CCreatureAnimation.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/FunctionList.h"
#include "../gui/SDL_Extensions.h"
#include "../widgets/Images.h"
class CIntObject;
class CCreatureAnimation;

19
client/gui/CAnimation.cpp
View File

@ -1,3 +1,12 @@
/*
* CAnimation.cpp, 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
*
*/
#include "StdInc.h"
#include "CAnimation.h"
@ -13,16 +22,6 @@
#include "../lib/JsonNode.h"
#include "../lib/CRandomGenerator.h"
/*
* CAnimation.cpp, 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
*
*/
class SDLImageLoader;
class CompImageLoader;

11
client/gui/CAnimation.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "../../lib/vcmi_endian.h"
#include "Geometries.h"
#include "../../lib/GameConstants.h"
/*
* CAnimation.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/vcmi_endian.h"
#include "Geometries.h"
#include "../../lib/GameConstants.h"
struct SDL_Surface;
class JsonNode;

19
client/gui/CCursorHandler.cpp
View File

@ -1,3 +1,12 @@
/*
* CCursorHandler.cpp, 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
*
*/
#include "StdInc.h"
#include "CCursorHandler.h"
@ -9,16 +18,6 @@
#include "../CMT.h"
/*
* CCursorHandler.cpp, 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
*
*/
void CCursorHandler::initCursor()
{
xpos = ypos = 0;

11
client/gui/CCursorHandler.h
View File

@ -1,10 +1,5 @@
#pragma once
class CAnimImage;
struct SDL_Surface;
/*
* CCursorhandler.h, part of VCMI engine
* CCursorHandler.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
@ -12,6 +7,10 @@ struct SDL_Surface;
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
class CAnimImage;
struct SDL_Surface;
namespace ECursor
{

9
client/gui/CGuiHandler.cpp
View File

@ -1,3 +1,12 @@
/*
* CGuiHandler.cpp, 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
*
*/
#include "StdInc.h"
#include "CGuiHandler.h"
#include "../lib/CondSh.h"

19
client/gui/CGuiHandler.h
View File

@ -1,3 +1,12 @@
/*
* CGuiHandler.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 "../../lib/CStopWatch.h"
@ -13,16 +22,6 @@ class IShowable;
enum class EIntObjMouseBtnType;
template <typename T> struct CondSh;
/*
* CGuiHandler.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
*
*/
// A fps manager which holds game updates at a constant rate
class CFramerateManager
{

9
client/gui/CIntObject.cpp
View File

@ -1,3 +1,12 @@
/*
* CIntObject.cpp, 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
*
*/
#include "StdInc.h"
#include "CIntObject.h"

1
client/gui/CIntObject.h
View File

@ -7,7 +7,6 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include <SDL_events.h>

19
client/gui/Fonts.cpp
View File

@ -1,3 +1,12 @@
/*
* Fonts.cpp, 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
*
*/
#include "StdInc.h"
#include "Fonts.h"
@ -9,16 +18,6 @@
#include "../../lib/filesystem/Filesystem.h"
#include "../../lib/CGeneralTextHandler.h"
/*
* Fonts.cpp, 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
*
*/
size_t IFont::getStringWidth(const std::string & data) const
{
size_t width = 0;

3
client/gui/Fonts.h
View File

@ -1,5 +1,3 @@
#pragma once
/*
* Fonts.h, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
class JsonNode;

9
client/gui/Geometries.cpp
View File

@ -1,3 +1,12 @@
/*
* Geometries.cpp, 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
*
*/
#include "StdInc.h"
#include "Geometries.h"
#include "../CMT.h"

9
client/gui/Geometries.h
View File

@ -1,8 +1,3 @@
#pragma once
#include <SDL_video.h>
#include "../../lib/int3.h"
/*
* Geometries.h, part of VCMI engine
*
@ -12,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include <SDL_video.h>
#include "../../lib/int3.h"
struct SDL_MouseMotionEvent;

3
client/gui/SDL_Compat.h
View File

@ -1,5 +1,3 @@
#pragma once
/*
* SDL_Compat.h, part of VCMI engine
*
@ -9,6 +7,7 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include <SDL_version.h>

9
client/gui/SDL_Extensions.cpp
View File

@ -1,3 +1,12 @@
/*
* SDL_Extensions.cpp, 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
*
*/
#include "StdInc.h"
#include "SDL_Extensions.h"
#include "SDL_Pixels.h"

1
client/gui/SDL_Extensions.h
View File

@ -7,7 +7,6 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include <SDL_version.h>
#include <SDL_render.h>

11
client/gui/SDL_Pixels.h
View File

@ -1,9 +1,3 @@
#pragma once
#include <SDL_endian.h>
#include "SDL_Extensions.h"
/*
* SDL_Pixels.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include <SDL_endian.h>
#include "SDL_Extensions.h"
// for accessing channels from pixel in format-independent way
//should be as fast as accessing via pointer at least for 3-4 bytes per pixel

15
client/mapHandler.h
View File

@ -1,11 +1,3 @@
#pragma once
#include "../lib/int3.h"
#include "../lib/spells/ViewSpellInt.h"
#include "gui/Geometries.h"
#include "SDL.h"
/*
* mapHandler.h, part of VCMI engine
*
@ -15,6 +7,13 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../lib/int3.h"
#include "../lib/spells/ViewSpellInt.h"
#include "gui/Geometries.h"
#include "SDL.h"
class CGObjectInstance;
class CGHeroInstance;

19
client/widgets/AdventureMapClasses.cpp
View File

@ -1,3 +1,12 @@
/*
* AdventureMapClasses.cpp, 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
*
*/
#include "StdInc.h"
#include "AdventureMapClasses.h"
@ -39,16 +48,6 @@
#include "../../lib/NetPacksBase.h"
#include "../../lib/StringConstants.h"
/*
* CAdventureMapClasses.cpp, 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
*
*/
CList::CListItem::CListItem(CList * Parent):
CIntObject(LCLICK | RCLICK | HOVER),
parent(Parent),

19
client/widgets/AdventureMapClasses.h
View File

@ -1,3 +1,12 @@
/*
* AdventureMapClasses.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 "ObjectLists.h"
@ -17,16 +26,6 @@ struct InfoAboutArmy;
struct InfoAboutHero;
struct InfoAboutTown;
/*
* CAdventureMapClasses.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
*
*/
/// Base UI Element for hero\town lists
class CList : public CIntObject
{

20
client/widgets/Buttons.cpp
View File

@ -1,3 +1,12 @@
/*
* Buttons.cpp, 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
*
*/
#include "StdInc.h"
#include "Buttons.h"
@ -14,17 +23,6 @@
#include "../windows/InfoWindows.h"
#include "../../lib/CConfigHandler.h"
/*
* Buttons.cpp, 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
*
*/
void CButton::update()
{
if (overlay)

19
client/widgets/Buttons.h
View File

@ -1,3 +1,12 @@
/*
* Buttons.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 "../gui/CIntObject.h"
@ -16,16 +25,6 @@ namespace config
struct ButtonInfo;
}
/*
* Buttons.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
*
*/
/// Typical Heroes 3 button which can be inactive or active and can
/// hold further information if you right-click it
class CButton : public CKeyShortcut

19
client/widgets/CArtifactHolder.cpp
View File

@ -1,3 +1,12 @@
/*
* CArtifactHolder.cpp, 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
*
*/
#include "StdInc.h"
#include "CArtifactHolder.h"
@ -21,16 +30,6 @@
#include "../../lib/mapObjects/CGHeroInstance.h"
/*
* CArtifactHolder.cpp, 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
*
*/
CHeroArtPlace::CHeroArtPlace(Point position, const CArtifactInstance * Art): CArtPlace(position, Art),
locked(false), picked(false), marked(false), ourOwner(nullptr)
{

9
client/widgets/CArtifactHolder.h
View File

@ -1,8 +1,3 @@
#pragma once
//#include "CComponent.h"
#include "MiscWidgets.h"
/*
* CArtifactHolder.h, part of VCMI engine
*
@ -12,6 +7,10 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
//#include "CComponent.h"
#include "MiscWidgets.h"
class CArtifactsOfHero;
class CAnimImage;

19
client/widgets/CComponent.cpp
View File

@ -1,3 +1,12 @@
/*
* CComponent.cpp, 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
*
*/
#include "StdInc.h"
#include "CComponent.h"
@ -17,16 +26,6 @@
#include "../../lib/CGeneralTextHandler.h"
#include "../../lib/NetPacksBase.h"
/*
* CComponent.cpp, 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
*
*/
CComponent::CComponent(Etype Type, int Subtype, int Val, ESize imageSize):
image(nullptr),
perDay(false)

7
client/widgets/CComponent.h
View File

@ -1,7 +1,3 @@
#pragma once
#include "../gui/CIntObject.h"
/*
* CComponent.h, part of VCMI engine
*
@ -11,6 +7,9 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../gui/CIntObject.h"
struct Component;
class CAnimImage;

19
client/widgets/CGarrisonInt.cpp
View File

@ -1,3 +1,12 @@
/*
* CGarrisonInt.cpp, 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
*
*/
#include "StdInc.h"
#include "CGarrisonInt.h"
@ -18,16 +27,6 @@
#include "../../lib/CGameState.h"
/*
* CGarrisonInt.cpp, 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
*
*/
void CGarrisonSlot::setHighlight(bool on)
{
if (on)

7
client/widgets/CGarrisonInt.h
View File

@ -1,7 +1,3 @@
#pragma once
#include "../windows/CWindowObject.h"
/*
* CGarrisonInt.h, part of VCMI engine
*
@ -11,6 +7,9 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../windows/CWindowObject.h"
class CGarrisonInt;
class CButton;

19
client/widgets/Images.cpp
View File

@ -1,3 +1,12 @@
/*
* Images.cpp, 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
*
*/
#include "StdInc.h"
#include "Images.h"
@ -25,16 +34,6 @@
#include "../../lib/CGeneralTextHandler.h" //for Unicode related stuff
#include "../../lib/CRandomGenerator.h"
/*
* Images.cpp, 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
*
*/
CPicture::CPicture( SDL_Surface *BG, int x, int y, bool Free )
{
init();

19
client/widgets/Images.h
View File

@ -1,3 +1,12 @@
/*
* Images.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 "../gui/CIntObject.h"
@ -9,16 +18,6 @@ class CAnimImage;
class CLabel;
class CAnimation;
/*
* Images.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
*
*/
// Image class
class CPicture : public CIntObject
{

19
client/widgets/MiscWidgets.cpp
View File

@ -1,3 +1,12 @@
/*
* MiscWidgets.cpp, 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
*
*/
#include "StdInc.h"
#include "MiscWidgets.h"
@ -22,16 +31,6 @@
#include "../../lib/CModHandler.h"
#include "../../lib/CGameState.h"
/*
* MiscWidgets.cpp, 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
*
*/
void CHoverableArea::hover (bool on)
{
if (on)

7
client/widgets/MiscWidgets.h
View File

@ -1,7 +1,3 @@
#pragma once
#include "../gui/CIntObject.h"
/*
* MiscWidgets.h, part of VCMI engine
*
@ -11,6 +7,9 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../gui/CIntObject.h"
class CLabel;
class CCreatureAnim;

11
client/widgets/ObjectLists.cpp
View File

@ -1,9 +1,3 @@
#include "StdInc.h"
#include "ObjectLists.h"
#include "../gui/CGuiHandler.h"
#include "Buttons.h"
/*
* ObjectLists.cpp, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "ObjectLists.h"
#include "../gui/CGuiHandler.h"
#include "Buttons.h"
static void intDeleter(CIntObject* object)

19
client/widgets/ObjectLists.h
View File

@ -1,3 +1,12 @@
/*
* ObjectLists.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 "../gui/CIntObject.h"
@ -9,16 +18,6 @@ class CSlider;
class CLabel;
class CAnimation;
/*
* ObjectLists.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
*
*/
/// Used as base for Tabs and List classes
class CObjectList : public CIntObject
{

19
client/widgets/TextControls.cpp
View File

@ -1,3 +1,12 @@
/*
* TextControls.cpp, 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
*
*/
#include "StdInc.h"
#include "TextControls.h"
@ -9,16 +18,6 @@
#include "../../lib/CGeneralTextHandler.h" //for Unicode related stuff
/*
* TextControls.cpp, 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
*
*/
std::string CLabel::visibleText()
{
return text;

11
client/widgets/TextControls.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "../gui/CIntObject.h"
#include "../gui/SDL_Extensions.h"
#include "../../lib/FunctionList.h"
/*
* TextControls.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../gui/CIntObject.h"
#include "../gui/SDL_Extensions.h"
#include "../../lib/FunctionList.h"
class CSlider;

19
client/windows/CAdvmapInterface.cpp
View File

@ -1,3 +1,12 @@
/*
* CAdvmapInterface.cpp, 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
*
*/
#include "StdInc.h"
#include "CAdvmapInterface.h"
@ -43,16 +52,6 @@
#pragma warning (disable : 4355)
#endif
/*
* CAdvMapInterface.cpp, 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
*
*/
#define ADVOPT (conf.go()->ac)
using namespace CSDL_Ext;

19
client/windows/CAdvmapInterface.h
View File

@ -1,3 +1,12 @@
/*
* CAdvmapInterface.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 "../widgets/AdventureMapClasses.h"
@ -23,16 +32,6 @@ struct MapDrawingInfo;
/*****************************/
/*
* CAdvmapInterface.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
*
*/
enum class EAdvMapMode
{
NORMAL,

19
client/windows/CCastleInterface.cpp
View File

@ -1,3 +1,12 @@
/*
* CCastleInterface.cpp, 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
*
*/
#include "StdInc.h"
#include "CCastleInterface.h"
@ -31,16 +40,6 @@
#include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapObjects/CGTownInstance.h"
/*
* CCastleInterface.cpp, 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
*
*/
const CBuilding * CBuildingRect::getBuilding()
{
if (!str->building)

20
client/windows/CCastleInterface.h
View File

@ -1,3 +1,12 @@
/*
* CCastleInterface.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 "../widgets/CGarrisonInt.h"
@ -21,17 +30,6 @@ class CGHeroInstance;
class CGarrisonInt;
class CCreature;
/*
* CCastleInterface.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
*
*/
/// Building "button"
class CBuildingRect : public CShowableAnim
{

19
client/windows/CCreatureWindow.cpp
View File

@ -1,3 +1,12 @@
/*
* CCreatureWindow.cpp, 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
*
*/
#include "StdInc.h"
#include "CCreatureWindow.h"
@ -25,16 +34,6 @@ using namespace CSDL_Ext;
class CCreatureArtifactInstance;
class CSelectableSkill;
/*
* CCreatureWindow.cpp, 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
*
*/
struct StackWindowInfo
{
// helper structs

11
client/windows/CCreatureWindow.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "../../lib/HeroBonus.h"
#include "../widgets/MiscWidgets.h"
#include "CWindowObject.h"
/*
* CCreatureWindow.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/HeroBonus.h"
#include "../widgets/MiscWidgets.h"
#include "CWindowObject.h"
struct StackWindowInfo;
class CCommanderInstance;

19
client/windows/CHeroWindow.cpp
View File

@ -1,3 +1,12 @@
/*
* CHeroWindow.cpp, 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
*
*/
#include "StdInc.h"
#include "CHeroWindow.h"
@ -28,16 +37,6 @@
#include "../lib/NetPacksBase.h"
#include "../mapHandler.h"
/*
* CHeroWindow.cpp, 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
*
*/
const TBonusListPtr CHeroWithMaybePickedArtifact::getAllBonuses(const CSelector &selector, const CSelector &limit, const CBonusSystemNode *root /*= nullptr*/, const std::string &cachingStr /*= ""*/) const
{

11
client/windows/CHeroWindow.h
View File

@ -1,9 +1,3 @@
#pragma once
#include "../../lib/HeroBonus.h"
#include "../widgets/CArtifactHolder.h"
#include "../widgets/CGarrisonInt.h"
/*
* CHeroWindow.h, part of VCMI engine
*
@ -13,6 +7,11 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../../lib/HeroBonus.h"
#include "../widgets/CArtifactHolder.h"
#include "../widgets/CGarrisonInt.h"
class CButton;
struct SDL_Surface;

19
client/windows/CKingdomInterface.cpp
View File

@ -1,3 +1,12 @@
/*
* CKingdomInterface.cpp, 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
*
*/
#include "StdInc.h"
#include "CKingdomInterface.h"
@ -24,16 +33,6 @@
#include "../../lib/mapObjects/CGTownInstance.h"
#include "../../lib/mapObjects/MiscObjects.h"
/*
* CKingdomInterface.cpp, 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
*
*/
InfoBox::InfoBox(Point position, InfoPos Pos, InfoSize Size, IInfoBoxData *Data):
size(Size),
infoPos(Pos),

19
client/windows/CKingdomInterface.h
View File

@ -1,3 +1,12 @@
/*
* CKingdomInterface.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 "../widgets/CArtifactHolder.h"
@ -19,16 +28,6 @@ class CListBox;
class CTabbedInt;
class CGStatusBar;
/*
* CKingdomInterface.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
*
*/
class CKingdHeroList;
class CKingdTownList;
class IInfoBoxData;

18
client/windows/CQuestLog.cpp
View File

@ -1,3 +1,12 @@
/*
* CQuestLog.cpp, 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
*
*/
#include "StdInc.h"
#include "CQuestLog.h"
@ -19,15 +28,6 @@
#include "../../lib/CGeneralTextHandler.h"
#include "../../lib/NetPacksBase.h"
#include "../../lib/mapObjects/CQuest.h"
/*
* CQuestLog.cpp, 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
*
*/
struct QuestInfo;
class CAdvmapInterface;

15
client/windows/CQuestLog.h
View File

@ -1,11 +1,3 @@
#pragma once
#include "../widgets/AdventureMapClasses.h"
#include "../widgets/TextControls.h"
#include "../widgets/MiscWidgets.h"
#include "../widgets/Images.h"
#include "CWindowObject.h"
/*
* CQuestLog.h, part of VCMI engine
*
@ -15,6 +7,13 @@
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
#include "../widgets/AdventureMapClasses.h"
#include "../widgets/TextControls.h"
#include "../widgets/MiscWidgets.h"
#include "../widgets/Images.h"
#include "CWindowObject.h"
class CCreature;
class CStackInstance;

19
client/windows/CSpellWindow.cpp
View File

@ -1,3 +1,12 @@
/*
* CSpellWindow.cpp, 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
*
*/
#include "StdInc.h"
#include "CSpellWindow.h"
@ -34,16 +43,6 @@
#include "../../lib/CGameState.h"
#include "../../lib/mapObjects/CGTownInstance.h"
/*
* CSpellWindow.cpp, 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
*
*/
CSpellWindow::InteractiveArea::InteractiveArea(const SDL_Rect & myRect, std::function<void()> funcL, int helpTextId, CSpellWindow * _owner)
{
addUsedEvents(LCLICK | RCLICK | HOVER);

Some files were not shown because too many files have changed in this diff Show More