unified guardians names

AI_Base.h

@@ -1,8 +1,5 @@
 #ifndef __AI_BASE_H__
 #define __AI_BASE_H__
-#ifndef __AI_BASE_H__
-#define __AI_BASE_H__
-
 
 #include <vector>
 #include <iostream>
@@ -11,4 +8,3 @@
 #define AI_INTERFACE_VER 1
 
 #endif // __AI_BASE_H__
-#endif // __AI_BASE_H__

AdventureMapButton.h

@@ -1,5 +1,5 @@
-#ifndef ADVENTUREMAPBUTTON_H
+#ifndef __ADVENTUREMAPBUTTON_H__
-#define ADVENTUREMAPBUTTON_H
+#define __ADVENTUREMAPBUTTON_H__
 
 
 
@@ -95,4 +95,5 @@ public:
 		int Value=0, bool Horizontal=true);
 	~CSlider();
 };	
-#endif //ADVENTUREMAPBUTTON_H
+
+#endif // __ADVENTUREMAPBUTTON_H__

CBattleInterface.h

@@ -1,5 +1,5 @@
-#ifndef CBATTLEINTERFACE_H
+#ifndef __CBATTLEINTERFACE_H__
-#define CBATTLEINTERFACE_H
+#define __CBATTLEINTERFACE_H__
 
 
 
@@ -255,4 +255,5 @@ public:
 	friend class CBattleReslutWindow;
 	friend class CPlayerInterface;
 };
-#endif //CBATTLEINTERFACE_H
+
+#endif // __CBATTLEINTERFACE_H__

CCallback.h

@@ -1,5 +1,5 @@
-#ifndef CCALLBACK_H
+#ifndef __CCALLBACK_H__
-#define CCALLBACK_H
+#define __CCALLBACK_H__
 
 #include "global.h"
 #ifdef _WIN32
@@ -186,4 +186,5 @@ public:
 	friend int main(int argc, char** argv);
 #endif
 };
-#endif //CCALLBACK_H
+
+#endif // __CCALLBACK_H__

CCastleInterface.h

@@ -1,5 +1,5 @@
-#ifndef CCASTLEINTERFACE_H
+#ifndef __CCASTLEINTERFACE_H__
-#define CCASTLEINTERFACE_H
+#define __CCASTLEINTERFACE_H__
 
 
 
@@ -225,4 +225,5 @@ public:
 	void activate();
 	void deactivate();
 };
-#endif //CCASTLEINTERFACE_H
+
+#endif // __CCASTLEINTERFACE_H__

CConsoleHandler.h

@@ -1,5 +1,5 @@
-#ifndef CCONSOLEHANDLER_H
+#ifndef __CCONSOLEHANDLER_H__
-#define CCONSOLEHANDLER_H
+#define __CCONSOLEHANDLER_H__
 
 #ifndef _WIN32
 #define WORD std::string
@@ -38,4 +38,5 @@ public:
 	}
 };
 
-#endif //CCONSOLEHANDLER_H
+
+#endif // __CCONSOLEHANDLER_H__

CCursorHandler.h

@@ -1,5 +1,5 @@
-#ifndef CCURSORHANDLER_H
+#ifndef __CCURSORHANDLER_H__
-#define CCURSORHANDLER_H
+#define __CCURSORHANDLER_H__
 #include "global.h"
 #include <vector>
 struct SDL_Thread;
@@ -25,4 +25,5 @@ public:
 };
 
 
-#endif //CCURSORHANDLER_H
+
+#endif // __CCURSORHANDLER_H__

CGameInfo.h

@@ -1,5 +1,5 @@
-#ifndef CGAMEINFO_H
+#ifndef __CGAMEINFO_H__
-#define CGAMEINFO_H
+#define __CGAMEINFO_H__
 #include "global.h"
 
 
@@ -63,4 +63,5 @@ public:
 	CScreenHandler * screenh;
 };
 
-#endif //CGAMEINFO_H
+
+#endif // __CGAMEINFO_H__

CGameInterface.h

@@ -1,5 +1,5 @@
-#ifndef CGAMEINTERFACE_H
+#ifndef __CGAMEINTERFACE_H__
-#define CGAMEINTERFACE_H
+#define __CGAMEINTERFACE_H__
 #include "global.h"
 #include <set>
 #include <vector>
@@ -98,4 +98,5 @@ public:
 	virtual void battleStackIsAttacked(int ID, int dmg, int killed, int IDby, bool byShooting){};
 	virtual BattleAction activeStack(int stackID) {BattleAction ba; ba.actionType = 3; ba.stackNumber = stackID; return ba;};
 };
-#endif //CGAMEINTERFACE_H
+
+#endif // __CGAMEINTERFACE_H__

CGameState.h

@@ -1,5 +1,5 @@
-#ifndef CGAMESTATE_H
+#ifndef __CGAMESTATE_H__
-#define CGAMESTATE_H
+#define __CGAMESTATE_H__
 #include "global.h"
 #ifndef _MSC_VER
 #include "hch/CCreatureHandler.h"
@@ -218,4 +218,5 @@ public:
 	friend class CGameHandler;
 };
 
-#endif //CGAMESTATE_H
+
+#endif // __CGAMESTATE_H__

CHeroWindow.h

@@ -1,5 +1,5 @@
-#ifndef CHEROWINDOW_H
+#ifndef __CHEROWINDOW_H__
-#define CHEROWINDOW_H
+#define __CHEROWINDOW_H__
 
 
 #include "CPlayerInterface.h"
@@ -130,4 +130,5 @@ public:
 	friend void CArtPlace::clickLeft(tribool down);
 	friend class CPlayerInterface;
 };
-#endif //CHEROWINDOW_H
+
+#endif // __CHEROWINDOW_H__

CLuaHandler.h

@@ -1,5 +1,5 @@
-#ifndef CLUAHANDLER_H
+#ifndef __CLUAHANDLER_H__
-#define CLUAHANDLER_H
+#define __CLUAHANDLER_H__
 #include "global.h"
 #if (LUA_VERSION_NUM < 500)
 #  define LUA_OPEN_LIB(L, lib) lib(L)
@@ -20,4 +20,5 @@ public:
 
 	void test();
 };
-#endif //CLUAHANDLER_H
+
+#endif // __CLUAHANDLER_H__

CMessage.h

@@ -1,5 +1,5 @@
-#ifndef CMESSAGE_H
+#ifndef __CMESSAGE_H__
-#define CMESSAGE_H
+#define __CMESSAGE_H__
 
 #include "global.h"
 #include <SDL_ttf.h>
@@ -49,4 +49,5 @@ public:
 //
 
 
-#endif //CMESSAGE_H
+
+#endif // __CMESSAGE_H__

CPathfinder.h

@@ -1,5 +1,5 @@
-#ifndef CPATHFINDER_H
+#ifndef __CPATHFINDER_H__
-#define CPATHFINDER_H
+#define __CPATHFINDER_H__
 #include "global.h"
 #include <queue>
 #include <vector>
@@ -39,4 +39,5 @@ public:
 	static void convertPath(CPath * path, unsigned int mode); //mode=0 -> from 'manifest' to 'object'
 };
 
-#endif //CPATHFINDER_H
+
+#endif // __CPATHFINDER_H__

CPlayerInterface.h

@@ -1,5 +1,5 @@
-#ifndef CPLAYERINTERFACE_H
+#ifndef __CPLAYERINTERFACE_H__
-#define CPLAYERINTERFACE_H
+#define __CPLAYERINTERFACE_H__
 #include "global.h"
 #include "CGameInterface.h"
 #include "SDL_framerate.h"
@@ -713,4 +713,5 @@ public:
 
 extern CPlayerInterface * LOCPLINT;
 
-#endif //CPLAYERINTERFACE_H
+
+#endif // __CPLAYERINTERFACE_H__

CPreGame.h

@@ -1,5 +1,5 @@
-#ifndef CPREGAME_H
+#ifndef __CPREGAME_H__
-#define CPREGAME_H
+#define __CPREGAME_H__
 #include "global.h"
 #include <set>
 #include <SDL.h>
@@ -293,4 +293,5 @@ public:
 	void sortMaps();
 };
 
-#endif //CPREGAME_H
+
+#endif // __CPREGAME_H__

CThreadHelper.h

@@ -1,5 +1,5 @@
-#ifndef CTHREADHELPER_H
+#ifndef __CTHREADHELPER_H__
-#define CTHREADHELPER_H
+#define __CTHREADHELPER_H__
 
 #include "global.h"
 #include <boost/function.hpp>
@@ -39,4 +39,5 @@ template <typename T> inline void setData(T * data, boost::function<T()> func)
 	(GET_DATA \
 		(CDefEssential*,DESTINATION,\
 		boost::function<CDefEssential*()>(boost::bind(CDefHandler::giveDefEss,DEF_NAME,(CLodHandler*)NULL))))
-#endif //CTHREADHELPER_H
+
+#endif // __CTHREADHELPER_H__

SDL_Extensions.h

@@ -1,5 +1,5 @@
-#ifndef SDL_EXTENSIONS_H
+#ifndef __SDL_EXTENSIONS_H__
-#define SDL_EXTENSIONS_H
+#define __SDL_EXTENSIONS_H__
 #include "SDL.h"
 #include "SDL_ttf.h"
 
@@ -53,4 +53,5 @@ namespace CSDL_Ext
 	SDL_Surface * copySurface(SDL_Surface * mod); //returns copy of given surface
 };
 
-#endif // SDL_EXTENSIONS_H
+
+#endif // __SDL_EXTENSIONS_H__

StartInfo.h

@@ -1,5 +1,5 @@
-#ifndef STARTINFO_H
+#ifndef __STARTINFO_H__
-#define STARTINFO_H
+#define __STARTINFO_H__
 
 #include "global.h"
 #include <vector>
@@ -55,4 +55,5 @@ struct StartInfo
 	}
 };
 
-#endif
+
+#endif // __STARTINFO_H__

client/CBitmapHandler.h

@@ -1,5 +1,5 @@
-#ifndef CBITMAPHANDLER_H
+#ifndef __CBITMAPHANDLER_H__
-#define CBITMAPHANDLER_H
+#define __CBITMAPHANDLER_H__
 
 
 
@@ -41,4 +41,5 @@ namespace BitmapHandler
 	extern CLodHandler *bitmaph;
 	SDL_Surface * loadBitmap(std::string fname, bool setKey=false);
 };
-#endif //CBITMAPHANDLER_H
+
+#endif // __CBITMAPHANDLER_H__

client/CConfigHandler.h

@@ -1,5 +1,5 @@
-#ifndef CCONFIGHANDLER_H
+#ifndef __CCONFIGHANDLER_H__
-#define CCONFIGHANDLER_H
+#define __CCONFIGHANDLER_H__
 #include "../global.h"
 class CAdvMapInt;
 namespace config
@@ -63,4 +63,5 @@ namespace config
 	};
 }
 extern config::CConfigHandler conf;
-#endif //CCONFIGHANDLER_H
+
+#endif // __CCONFIGHANDLER_H__

client/CCreatureAnimation.h

@@ -1,5 +1,5 @@
-#ifndef CCREATUREANIMATION_H
+#ifndef __CCREATUREANIMATION_H__
-#define CCREATUREANIMATION_H
+#define __CCREATUREANIMATION_H__
 
 
 #include "../global.h"
@@ -51,4 +51,5 @@ public:
 
 	int framesInGroup(int group) const; //retirns number of fromes in given group
 };
-#endif //CCREATUREANIMATION_H
+
+#endif // __CCREATUREANIMATION_H__

client/CSpellWindow.h

@@ -1,5 +1,5 @@
-#ifndef CSPELLWINDOW_H
+#ifndef __CSPELLWINDOW_H__
-#define CSPELLWINDOW_H
+#define __CSPELLWINDOW_H__
 
 
 #include "../global.h"
@@ -89,4 +89,5 @@ public:
 	void deactivate();
 	void show(SDL_Surface * to = NULL);
 };
-#endif //CSPELLWINDOW_H
+
+#endif // __CSPELLWINDOW_H__

client/Client.h

@@ -1,5 +1,5 @@
-#ifndef CLIENT_H
+#ifndef __CLIENT_H__
-#define CLIENT_H
+#define __CLIENT_H__
 
 
 #include "../global.h"
@@ -59,4 +59,5 @@ public:
 	friend class CScriptCallback; //for objects scripts
 	friend void processCommand(const std::string &message, CClient *&client); //handling console
 };
-#endif //CLIENT_H
+
+#endif // __CLIENT_H__

client/Graphics.h

@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_H
+#ifndef __GRAPHICS_H__
-#define GRAPHICS_H
+#define __GRAPHICS_H__
 
 
 #include "../global.h"
@@ -63,4 +63,5 @@ public:
 };
 
 extern Graphics * graphics;
-#endif //GRAPHICS_H
+
+#endif // __GRAPHICS_H__

global.h

@@ -1,5 +1,5 @@
-#ifndef GLOBAL_H
+#ifndef __GLOBAL_H__
-#define GLOBAL_H
+#define __GLOBAL_H__
 #include <iostream>
 #include <algorithm> //std::find
 #include <boost/logic/tribool.hpp>
@@ -267,4 +267,5 @@ extern DLL_EXPORT CLogger<5> tlog5; //gray - minor log info
 		delete e;						\
 	}
 
-#endif //GLOBAL_H
+
+#endif // __GLOBAL_H__

hch/CAbilityHandler.h

@@ -1,5 +1,5 @@
-#ifndef CABILITYHANDLER_H
+#ifndef __CABILITYHANDLER_H__
-#define CABILITYHANDLER_H
+#define __CABILITYHANDLER_H__
 
 #include <string>
 #include <vector>
@@ -24,4 +24,5 @@ public:
 	void loadAbilities();
 };
 
-#endif //CABILITYHANDLER_H
+
+#endif // __CABILITYHANDLER_H__

hch/CAmbarCendamo.h

@@ -1,5 +1,5 @@
-#ifndef CAMBARCENDAMO_H
+#ifndef __CAMBARCENDAMO_H__
-#define CAMBARCENDAMO_H
+#define __CAMBARCENDAMO_H__
 #include <iostream>
 #include <string>
 #include <vector>
@@ -16,4 +16,5 @@ public:
 	//CAmbarCendamo (unsigned char * data); // c-tor; data is pointer to decompressed h3m data
 	//~CAmbarCendamo (); // d-tor
 };
-#endif //CAMBARCENDAMO_H
+
+#endif // __CAMBARCENDAMO_H__

hch/CArtHandler.h

@@ -1,5 +1,5 @@
-#ifndef CARTHANDLER_H
+#ifndef __CARTHANDLER_H__
-#define CARTHANDLER_H
+#define __CARTHANDLER_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -46,4 +46,5 @@ public:
 	}
 };
 
-#endif // CARTHANDLER_H
+
+#endif // __CARTHANDLER_H__

hch/CBuildingHandler.h

@@ -1,5 +1,5 @@
-#ifndef CBUILDINGHANDLER_H
+#ifndef __CBUILDINGHANDLER_H__
-#define CBUILDINGHANDLER_H
+#define __CBUILDINGHANDLER_H__
 #include "../global.h"
 #include <map>
 #include <vector>
@@ -35,4 +35,5 @@ public:
 	}
 };
 
-#endif //CBUILDINGHANDLER_H
+
+#endif // __CBUILDINGHANDLER_H__

hch/CCreatureHandler.h

@@ -1,5 +1,5 @@
-#ifndef CCREATUREHANDLER_H
+#ifndef __CCREATUREHANDLER_H__
-#define CCREATUREHANDLER_H
+#define __CCREATUREHANDLER_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -82,4 +82,5 @@ public:
 		}
 	}
 };
-#endif //CCREATUREHANDLER_H
+
+#endif // __CCREATUREHANDLER_H__

hch/CDefHandler.h

@@ -1,5 +1,5 @@
-#ifndef CDEFHANDLER_H
+#ifndef __CDEFHANDLER_H__
-#define CDEFHANDLER_H
+#define __CDEFHANDLER_H__
 #include "../client/CBitmapHandler.h"
 struct SDL_Surface;
 class CDefEssential;
@@ -57,4 +57,5 @@ public:
 	~CDefEssential();
 };
 
-#endif // CDEFHANDLER_H
+
+#endif // __CDEFHANDLER_H__

hch/CGeneralTextHandler.h

@@ -1,5 +1,5 @@
-#ifndef CGENERALTEXTHANDLER_H
+#ifndef __CGENERALTEXTHANDLER_H__
-#define CGENERALTEXTHANDLER_H
+#define __CGENERALTEXTHANDLER_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -46,4 +46,5 @@ public:
 };
 
 
-#endif //CGENERALTEXTHANDLER_H
+
+#endif // __CGENERALTEXTHANDLER_H__

hch/CHeroHandler.h

@@ -1,5 +1,5 @@
-#ifndef CHEROHANDLER_H
+#ifndef __CHEROHANDLER_H__
-#define CHEROHANDLER_H
+#define __CHEROHANDLER_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -79,4 +79,5 @@ public:
 		}
 	}
 };
-#endif //CHEROHANDLER_H
+
+#endif // __CHEROHANDLER_H__

hch/CLodHandler.h

@@ -1,5 +1,5 @@
-#ifndef CLODHANDLER_H
+#ifndef __CLODHANDLER_H__
-#define CLODHANDLER_H
+#define __CLODHANDLER_H__
 #include "../global.h"
 #include <fstream>
 #include <vector>
@@ -58,4 +58,5 @@ public:
 	void init(std::string lodFile, std::string dirName);
 };
 
-#endif //CLODHANDLER_H
+
+#endif // __CLODHANDLER_H__

hch/CMusicHandler.h

@@ -1,5 +1,5 @@
-#ifndef CMUSICHANDLER_H
+#ifndef __CMUSICHANDLER_H__
-#define CMUSICHANDLER_H
+#define __CMUSICHANDLER_H__
 
 #include <SDL_mixer.h>
 #include "CSndHandler.h"
@@ -17,4 +17,5 @@ public:
 };
 
 
-#endif //CMUSICHANDLER_H
+
+#endif // __CMUSICHANDLER_H__

hch/CObjectHandler.h

@@ -1,5 +1,5 @@
-#ifndef COBJECTHANDLER_H
+#ifndef __COBJECTHANDLER_H__
-#define COBJECTHANDLER_H
+#define __COBJECTHANDLER_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -435,4 +435,5 @@ public:
 };
 
 
-#endif //COBJECTHANDLER_H
+
+#endif // __COBJECTHANDLER_H__

hch/CSndHandler.h

@@ -1,5 +1,5 @@
-#ifndef CSNDHANDLER_H
+#ifndef __CSNDHANDLER_H__
-#define CSNDHANDLER_H
+#define __CSNDHANDLER_H__
 
 #include <vector>
 #include <fstream>
@@ -56,4 +56,5 @@ public:
 };
 
 
-#endif //CSNDHANDLER_H
+
+#endif // __CSNDHANDLER_H__

hch/CSpellHandler.h

@@ -1,5 +1,5 @@
-#ifndef CSPELLHANDLER_H
+#ifndef __CSPELLHANDLER_H__
-#define CSPELLHANDLER_H
+#define __CSPELLHANDLER_H__
 
 #include <string>
 #include <vector>
@@ -46,4 +46,5 @@ public:
 	}
 };
 
-#endif //CSPELLHANDLER_H
+
+#endif // __CSPELLHANDLER_H__

hch/CTownHandler.h

@@ -1,5 +1,5 @@
-#ifndef CTOWNHANDLER_H
+#ifndef __CTOWNHANDLER_H__
-#define CTOWNHANDLER_H
+#define __CTOWNHANDLER_H__
 #include "../global.h"
 #include <set>
 class CBuilding;
@@ -69,4 +69,5 @@ public:
 	}
 };
 
-#endif //CTOWNHANDLER_H
+
+#endif // __CTOWNHANDLER_H__

int3.h

@@ -1,5 +1,5 @@
-#ifndef INT3_H
+#ifndef __INT3_H__
-#define INT3_H
+#define __INT3_H__
 #include <map>
 #include <vector>
 #include <cmath>
@@ -114,4 +114,5 @@ inline std::ostream & operator<<(std::ostream & str, const int3 & sth)
 {
 	return str<<sth.x<<' '<<sth.y<<' '<<sth.z;
 }
-#endif //INT3_H
+
+#endif // __INT3_H__

lib/Connection.h

@@ -1,5 +1,5 @@
-#ifndef CONNECTION_H
+#ifndef __CONNECTION_H__
-#define CONNECTION_H
+#define __CONNECTION_H__
 #include "../global.h"
 #include <string>
 #include <vector>
@@ -413,4 +413,5 @@ public:
 	void close();
 	~CConnection(void);
 };
-#endif //CONNECTION_H
+
+#endif // __CONNECTION_H__

lib/VCMI_Lib.h

@@ -1,5 +1,5 @@
-#ifndef VCMI_LIB_H
+#ifndef __VCMI_LIB_H__
-#define VCMI_LIB_H
+#define __VCMI_LIB_H__
 #include "../global.h"
 
 class CLodHandler;
@@ -42,4 +42,5 @@ DLL_EXPORT void loadToIt(std::string &dest, std::string &src, int &iter, int mod
 DLL_EXPORT void loadToIt(si32 &dest, std::string &src, int &iter, int mode);
 DLL_EXPORT void initDLL(CLodHandler *b, CConsoleHandler *Console, std::ostream *Logfile);
 
-#endif //VCMI_LIB_H
+
+#endif // __VCMI_LIB_H__

mapHandler.h

@@ -1,5 +1,5 @@
-#ifndef MAPHANDLER_H
+#ifndef __MAPHANDLER_H__
-#define MAPHANDLER_H
+#define __MAPHANDLER_H__
 #include "global.h"
 #include <list>
 #include <set>
@@ -112,4 +112,5 @@ public:
 
 };
 
-#endif //MAPHANDLER_H
+
+#endif // __MAPHANDLER_H__

server/CGameHandler.h

@@ -1,5 +1,5 @@
-#ifndef CGAMEHANDLER_H
+#ifndef __CGAMEHANDLER_H__
-#define CGAMEHANDLER_H
+#define __CGAMEHANDLER_H__
 
 #include "../global.h"
 #include <set>
@@ -169,4 +169,5 @@ public:
 	friend class CVCMIServer;
 	friend class CScriptCallback;
 };
-#endif //CGAMEHANDLER_H
+
+#endif // __CGAMEHANDLER_H__

stdafx.h

@@ -1,7 +1,5 @@
 #ifndef __STDAFX_H__
 #define __STDAFX_H__
-#ifndef __STDAFX_H__
-#define __STDAFX_H__
 
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently, but
@@ -24,4 +22,3 @@
 // TODO: reference additional headers your program requires here
 
 #endif // __STDAFX_H__
-#endif // __STDAFX_H__

timeHandler.h

@@ -1,5 +1,5 @@
-#ifndef TIMEHANDLER_H
+#ifndef __TIMEHANDLER_H__
-#define TIMEHANDLER_H
+#define __TIMEHANDLER_H__
 
 #include <ctime>
 class timeHandler
@@ -13,4 +13,5 @@ public:
 	long memDif(){return mem-clock();};
 };
 
-#endif //TIMEHANDLER_H
+
+#endif // __TIMEHANDLER_H__