Updated CMakeLists and file headers

client/CMakeLists.txt

@@ -2,97 +2,127 @@ set(client_SRCS
 	StdInc.cpp
 	../CCallback.cpp
 
+	adventureMap/CAdvMapPanel.cpp
+	adventureMap/CAdvMapInt.cpp
+	adventureMap/CAdventureOptions.cpp
+	adventureMap/CInGameConsole.cpp
+	adventureMap/CInfoBar.cpp
+	adventureMap/CList.cpp
+	adventureMap/CMinimap.cpp
+	adventureMap/CResDataBar.cpp
+	adventureMap/CTerrainRect.cpp
+	adventureMap/mapHandler.cpp
+
 	battle/BattleActionsController.cpp
 	battle/BattleAnimationClasses.cpp
 	battle/BattleEffectsController.cpp
 	battle/BattleFieldController.cpp
-		battle/BattleInterfaceClasses.cpp
 	battle/BattleInterface.cpp
+	battle/BattleInterfaceClasses.cpp
 	battle/BattleObstacleController.cpp
 	battle/BattleProjectileController.cpp
 	battle/BattleRenderer.cpp
 	battle/BattleSiegeController.cpp
 	battle/BattleStacksController.cpp
 	battle/BattleWindow.cpp
-		battle/CreatureAnimation.cpp
 
-		gui/CAnimation.cpp
-		gui/Canvas.cpp
-		gui/CursorHandler.cpp
 	gui/CGuiHandler.cpp
 	gui/CIntObject.cpp
-		gui/ColorFilter.cpp
-		gui/Fonts.cpp
-		gui/SDL_Extensions.cpp
-		gui/NotificationHandler.cpp
+	gui/CursorHandler.cpp
 	gui/InterfaceObjectConfigurable.cpp
+	gui/NotificationHandler.cpp
+
+	lobby/CBonusSelection.cpp
+	lobby/CCampaignInfoScreen.cpp
+	lobby/CLobbyScreen.cpp
+	lobby/CSavingScreen.cpp
+	lobby/CScenarioInfoScreen.cpp
+	lobby/CSelectionBase.cpp
+	lobby/OptionsTab.cpp
+	lobby/RandomMapTab.cpp
+	lobby/SelectionTab.cpp
+
+	mainmenu/CCampaignScreen.cpp
+	mainmenu/CMainMenu.cpp
+	mainmenu/CPrologEpilogVideo.cpp
+	mainmenu/CreditsScreen.cpp
+
+	render/CAnimation.cpp
+	render/CBitmapHandler.cpp
+	render/CDefFile.cpp
+	render/CFadeAnimation.cpp
+	render/Canvas.cpp
+	render/ColorFilter.cpp
+	render/Graphics.cpp
+	render/IFont.cpp
+
+	renderSDL/CBitmapFont.cpp
+	renderSDL/CBitmapHanFont.cpp
+	renderSDL/CTrueTypeFont.cpp
+	renderSDL/CursorHardware.cpp
+	renderSDL/CursorSoftware.cpp
+	renderSDL/SDLImage.cpp
+	renderSDL/SDLImageLoader.cpp
+	renderSDL/SDLRWwrapper.cpp
+	renderSDL/SDL_Extensions.cpp
 
-		widgets/AdventureMapClasses.cpp
 	widgets/Buttons.cpp
 	widgets/CArtifactHolder.cpp
 	widgets/CComponent.cpp
 	widgets/CGarrisonInt.cpp
+	widgets/CreatureCostBox.cpp
 	widgets/Images.cpp
 	widgets/MiscWidgets.cpp
 	widgets/ObjectLists.cpp
 	widgets/TextControls.cpp
 
-		windows/CAdvmapInterface.cpp
 	windows/CCastleInterface.cpp
 	windows/CCreatureWindow.cpp
-		windows/CreaturePurchaseCard.cpp
 	windows/CHeroWindow.cpp
 	windows/CKingdomInterface.cpp
+	windows/CMessage.cpp
 	windows/CQuestLog.cpp
 	windows/CSpellWindow.cpp
 	windows/CTradeWindow.cpp
 	windows/CWindowObject.cpp
+	windows/CreaturePurchaseCard.cpp
 	windows/GUIClasses.cpp
 	windows/InfoWindows.cpp
 	windows/QuickRecruitmentWindow.cpp
 
-		mainmenu/CMainMenu.cpp
-		mainmenu/CCampaignScreen.cpp
-		mainmenu/CreditsScreen.cpp
-		mainmenu/CPrologEpilogVideo.cpp
-
-		lobby/CBonusSelection.cpp
-		lobby/CSelectionBase.cpp
-		lobby/CLobbyScreen.cpp
-		lobby/CSavingScreen.cpp
-		lobby/CScenarioInfoScreen.cpp
-		lobby/CCampaignInfoScreen.cpp
-		lobby/OptionsTab.cpp
-		lobby/RandomMapTab.cpp
-		lobby/SelectionTab.cpp
-
-		CBitmapHandler.cpp
-		CreatureCostBox.cpp
 	CGameInfo.cpp
-		Client.cpp
-		CMessage.cpp
 	CMT.cpp
 	CMusicHandler.cpp
 	CPlayerInterface.cpp
-		CVideoHandler.cpp
 	CServerHandler.cpp
-		Graphics.cpp
-		mapHandler.cpp
+	CVideoHandler.cpp
+	Client.cpp
+	ClientCommandManager.cpp
 	NetPacksClient.cpp
 	NetPacksLobbyClient.cpp
-		SDLRWwrapper.cpp
-		ClientCommandManager.cpp
 )
 
 set(client_HEADERS
 	StdInc.h
 
+	adventureMap/CAdvMapPanel.h
+	adventureMap/CAdvMapInt.h
+	adventureMap/CAdventureOptions.h
+	adventureMap/CInGameConsole.h
+	adventureMap/CInfoBar.h
+	adventureMap/CList.h
+	adventureMap/CMinimap.h
+	adventureMap/CResDataBar.h
+	adventureMap/CTerrainRect.h
+	adventureMap/mapHandler.h
+
 	battle/BattleActionsController.h
 	battle/BattleAnimationClasses.h
+	battle/BattleConstants.h
 	battle/BattleEffectsController.h
 	battle/BattleFieldController.h
-		battle/BattleInterfaceClasses.h
 	battle/BattleInterface.h
+	battle/BattleInterfaceClasses.h
 	battle/BattleObstacleController.h
 	battle/BattleProjectileController.h
 	battle/BattleRenderer.h
@@ -100,74 +130,84 @@ set(client_HEADERS
 	battle/BattleStacksController.h
 	battle/BattleWindow.h
 	battle/CreatureAnimation.h
-		battle/BattleConstants.h
 
-		gui/CAnimation.h
-		gui/Canvas.h
-		gui/CursorHandler.h
 	gui/CGuiHandler.h
-		gui/ColorFilter.h
 	gui/CIntObject.h
-		gui/Fonts.h
-		gui/TextAlignment.h
-		gui/SDL_Extensions.h
-		gui/SDL_PixelAccess.h
-		gui/NotificationHandler.h
+	gui/CursorHandler.h
 	gui/InterfaceObjectConfigurable.h
-
-		widgets/AdventureMapClasses.h
-		widgets/Buttons.h
-		widgets/CArtifactHolder.h
-		widgets/CComponent.h
-		widgets/CGarrisonInt.h
-		widgets/Images.h
-		widgets/MiscWidgets.h
-		widgets/ObjectLists.h
-		widgets/TextControls.h
-		windows/CAdvmapInterface.h
-		windows/CCastleInterface.h
-		windows/CCreatureWindow.h
-		windows/CreaturePurchaseCard.h
-		windows/CHeroWindow.h
-		windows/CKingdomInterface.h
-		windows/CQuestLog.h
-		windows/CSpellWindow.h
-		windows/CTradeWindow.h
-		windows/CWindowObject.h
-		windows/GUIClasses.h
-		windows/InfoWindows.h
-		windows/QuickRecruitmentWindow.h
-
-		mainmenu/CMainMenu.h
-		mainmenu/CCampaignScreen.h
-		mainmenu/CreditsScreen.h
-		mainmenu/CPrologEpilogVideo.h
+	gui/NotificationHandler.h
+	gui/TextAlignment.h
 
 	lobby/CBonusSelection.h
-		lobby/CSelectionBase.h
+	lobby/CCampaignInfoScreen.h
 	lobby/CLobbyScreen.h
 	lobby/CSavingScreen.h
 	lobby/CScenarioInfoScreen.h
-		lobby/CCampaignInfoScreen.h
+	lobby/CSelectionBase.h
 	lobby/OptionsTab.h
 	lobby/RandomMapTab.h
 	lobby/SelectionTab.h
 
-		CBitmapHandler.h
-		CreatureCostBox.h
+	mainmenu/CCampaignScreen.h
+	mainmenu/CMainMenu.h
+	mainmenu/CPrologEpilogVideo.h
+	mainmenu/CreditsScreen.h
+
+	render/CAnimation.h
+	render/CBitmapHandler.h
+	render/CDefFile.h
+	render/CFadeAnimation.h
+	render/Canvas.h
+	render/ColorFilter.h
+	render/Graphics.h
+	render/ICursor.h
+	render/IFont.h
+	render/IImage.h
+
+	renderSDL/CBitmapFont.h
+	renderSDL/CBitmapHanFont.h
+	renderSDL/CTrueTypeFont.h
+	renderSDL/CursorHardware.h
+	renderSDL/CursorSoftware.h
+	renderSDL/SDLImage.h
+	renderSDL/SDLImageLoader.h
+	renderSDL/SDLRWwrapper.h
+	renderSDL/SDL_Extensions.h
+	renderSDL/SDL_PixelAccess.h
+
+	widgets/Buttons.h
+	widgets/CArtifactHolder.h
+	widgets/CComponent.h
+	widgets/CGarrisonInt.h
+	widgets/CreatureCostBox.h
+	widgets/Images.h
+	widgets/MiscWidgets.h
+	widgets/ObjectLists.h
+	widgets/TextControls.h
+
+	windows/CCastleInterface.h
+	windows/CCreatureWindow.h
+	windows/CHeroWindow.h
+	windows/CKingdomInterface.h
+	windows/CMessage.h
+	windows/CQuestLog.h
+	windows/CSpellWindow.h
+	windows/CTradeWindow.h
+	windows/CWindowObject.h
+	windows/CreaturePurchaseCard.h
+	windows/GUIClasses.h
+	windows/InfoWindows.h
+	windows/QuickRecruitmentWindow.h
+
 	CGameInfo.h
-		Client.h
-		CMessage.h
 	CMT.h
 	CMusicHandler.h
 	CPlayerInterface.h
-		CVideoHandler.h
 	CServerHandler.h
-		Graphics.h
-		mapHandler.h
-		resource.h
-		SDLRWwrapper.h
+	CVideoHandler.h
+	Client.h
 	ClientCommandManager.h
+	resource.h
 )
 
 if(APPLE_IOS)

client/adventureMap/CAdvMapInt.cpp

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.cpp, part of VCMI engine
+ * CAdvMapInt.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CAdvMapInt.h

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.h, part of VCMI engine
+ * CAdvMapInt.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CAdvMapPanel.cpp

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.cpp, part of VCMI engine
+ * CAdvMapPanel.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CAdvMapPanel.h

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.h, part of VCMI engine
+ * CAdvMapPanel.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CAdventureOptions.cpp

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.cpp, part of VCMI engine
+ * CAdventureOptions.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CAdventureOptions.h

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.h, part of VCMI engine
+ * CAdventureOptions.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CInGameConsole.cpp

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.cpp, part of VCMI engine
+ * CInGameConsole.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CInGameConsole.h

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.h, part of VCMI engine
+ * CInGameConsole.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CInfoBar.cpp

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.cpp, part of VCMI engine
+ * CInfoBar.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CInfoBar.h

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.h, part of VCMI engine
+ * CInfoBar.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CList.cpp

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.cpp, part of VCMI engine
+ * CList.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CList.h

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.h, part of VCMI engine
+ * CList.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CMinimap.cpp

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.cpp, part of VCMI engine
+ * CMinimap.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CMinimap.h

@@ -1,5 +1,5 @@
 /*
- * AdventureMapClasses.h, part of VCMI engine
+ * CMinimap.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CResDataBar.cpp

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.cpp, part of VCMI engine
+ * CResDataBar.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CResDataBar.h

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.h, part of VCMI engine
+ * CResDataBar.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CTerrainRect.cpp

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.cpp, part of VCMI engine
+ * CTerrainRect.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/adventureMap/CTerrainRect.h

@@ -1,5 +1,5 @@
 /*
- * CAdvmapInterface.h, part of VCMI engine
+ * CTerrainRect.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/CDefFile.cpp

@@ -1,5 +1,5 @@
 /*
- * CAnimation.cpp, part of VCMI engine
+ * CDefFile.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/CDefFile.h

@@ -1,5 +1,5 @@
 /*
- * CAnimation.h, part of VCMI engine
+ * CDefFile.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/CFadeAnimation.cpp

@@ -1,5 +1,5 @@
 /*
- * CAnimation.cpp, part of VCMI engine
+ * CFadeAnimation.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/CFadeAnimation.h

@@ -1,5 +1,5 @@
 /*
- * CAnimation.h, part of VCMI engine
+ * CFadeAnimation.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/ICursor.h

@@ -1,5 +1,5 @@
 /*
- * CCursorHandler.h, part of VCMI engine
+ * ICursor.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/IFont.cpp

@@ -1,5 +1,5 @@
 /*
- * Fonts.cpp, part of VCMI engine
+ * IFont.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/IFont.h

@@ -1,5 +1,5 @@
 /*
- * Fonts.h, part of VCMI engine
+ * IFont.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/render/IImage.h

@@ -1,5 +1,5 @@
 /*
- * CAnimation.h, part of VCMI engine
+ * IImage.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CBitmapFont.cpp

@@ -1,5 +1,5 @@
 /*
- * Fonts.cpp, part of VCMI engine
+ * CBitmapFont.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CBitmapFont.h

@@ -1,5 +1,5 @@
 /*
- * Fonts.h, part of VCMI engine
+ * CBitmapFont.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CBitmapHanFont.cpp

@@ -1,5 +1,5 @@
 /*
- * Fonts.cpp, part of VCMI engine
+ * CBitmapHanFont.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CBitmapHanFont.h

@@ -1,5 +1,5 @@
 /*
- * Fonts.h, part of VCMI engine
+ * CBitmapHanFont.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CTrueTypeFont.cpp

@@ -1,5 +1,5 @@
 /*
- * Fonts.cpp, part of VCMI engine
+ * CTrueTypeFont.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CTrueTypeFont.h

@@ -1,5 +1,5 @@
 /*
- * Fonts.h, part of VCMI engine
+ * CTrueTypeFont.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CursorHardware.cpp

@@ -1,5 +1,5 @@
 /*
- * CCursorHandler.cpp, part of VCMI engine
+ * CursorHardware.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CursorHardware.h

@@ -1,5 +1,5 @@
 /*
- * CCursorHandler.h, part of VCMI engine
+ * CursorHardware.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CursorSoftware.cpp

@@ -1,5 +1,5 @@
 /*
- * CCursorHandler.cpp, part of VCMI engine
+ * CursorSoftware.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/CursorSoftware.h

@@ -1,5 +1,5 @@
 /*
- * CCursorHandler.h, part of VCMI engine
+ * CursorSoftware.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/SDLImage.cpp

@@ -1,5 +1,5 @@
 /*
- * CAnimation.cpp, part of VCMI engine
+ * SDLImage.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/SDLImage.h

@@ -1,5 +1,5 @@
 /*
- * CAnimation.h, part of VCMI engine
+ * SDLImage.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/SDLImageLoader.cpp

@@ -1,5 +1,5 @@
 /*
- * CAnimation.cpp, part of VCMI engine
+ * SDLImageLoader.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

client/renderSDL/SDLImageLoader.h

@@ -1,5 +1,5 @@
 /*
- * CAnimation.h, part of VCMI engine
+ * SDLImageLoader.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *