Switched to the #pragma once system

server/accounts/account_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ACCOUNTDATA_HPP_
-#define ACCOUNTDATA_HPP_
+#pragma once
 
 #include <string>
 
@@ -55,5 +54,3 @@ private:
 	bool mod = false;
 	bool admin = false;
 };
-
-#endif

server/accounts/account_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ACCOUNTMANAGER_HPP_
-#define ACCOUNTMANAGER_HPP_
+#pragma once
 
 #include "account_data.hpp"
 #include "singleton.hpp"
@@ -61,5 +60,3 @@ private:
 	std::map<int, AccountData> elementMap;
 	sqlite3* database = nullptr;
 };
-
-#endif

server/characters/character_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERAPI_HPP_
-#define CHARACTERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_CHARACTER_API "character"
 LUAMOD_API int openCharacterAPI(lua_State* L);
-
-#endif

server/characters/character_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERDATA_HPP_
-#define CHARACTERDATA_HPP_
+#pragma once
 
 //components
 #include "character_defines.hpp"
@@ -47,5 +46,3 @@ private:
 	std::string handle;
 	std::string avatar;
 };
-
-#endif

server/characters/character_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERMANAGER_HPP_
-#define CHARACTERMANAGER_HPP_
+#pragma once
 
 #include "character_data.hpp"
 #include "singleton.hpp"
@@ -66,5 +65,3 @@ private:
 	std::map<int, CharacterData> elementMap;
 	sqlite3* database = nullptr;
 };
-
-#endif

server/characters/character_manager_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERMANAGERAPI_HPP_
-#define CHARACTERMANAGERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_CHARACTER_MANAGER_API "character_manager"
 LUAMOD_API int openCharacterManagerAPI(lua_State* L);
-
-#endif

server/clients/client_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTDATA_HPP_
-#define CLIENTDATA_HPP_
+#pragma once
 
 #include "SDL_net.h"
 
@@ -49,5 +48,3 @@ private:
 	Clock::time_point lastBeat = Clock::now();
 	int attemptedBeats = 0;
 };
-
-#endif

server/clients/client_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTMANAGER_HPP_
-#define CLIENTMANAGER_HPP_
+#pragma once
 
 #include "client_data.hpp"
 #include "server_packet.hpp"
@@ -61,5 +60,3 @@ private:
 	std::map<int, ClientData> elementMap;
 	int counter = 0;
 };
-
-#endif

server/entities/entity.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENTITY_HPP_
-#define ENTITY_HPP_
+#pragma once
 
 #include "bounding_box.hpp"
 #include "vector2.hpp"
@@ -55,5 +54,3 @@ protected:
 	BoundingBox bounds = {0, 0, 0, 0};
 	const char* type;
 };
-
-#endif

server/entities/entity_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENTITYAPI_HPP_
-#define ENTITYAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_ENTITY_API "entity"
 LUAMOD_API int openEntityAPI(lua_State* L);
-
-#endif

server/monsters/monster_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERAPI_HPP_
-#define MONSTERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_MONSTER_API "monster"
 LUAMOD_API int openMonsterAPI(lua_State* L);
-
-#endif

server/monsters/monster_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERDATA_HPP_
-#define MONSTERDATA_HPP_
+#pragma once
 
 #include "entity.hpp"
 
@@ -56,5 +55,3 @@ private:
 	std::string avatar;
 	int scriptRef = LUA_NOREF;
 };
-
-#endif

server/monsters/monster_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERMANAGER_HPP_
-#define MONSTERMANAGER_HPP_
+#pragma once
 
 #include "monster_data.hpp"
 
@@ -61,5 +60,3 @@ private:
 	lua_State* lua = nullptr;
 	sqlite3* database = nullptr;
 };
-
-#endif

server/monsters/monster_manager_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERMANAGERAPI_HPP_
-#define MONSTERMANAGERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_MONSTER_MANAGER_API "monster_manager"
 LUAMOD_API int openMonsterManagerAPI(lua_State* L);
-
-#endif

server/rooms/room_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ROOMAPI_HPP_
-#define ROOMAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_ROOM_API "room"
 LUAMOD_API int openRoomAPI(lua_State* L);
-
-#endif

server/rooms/room_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ROOMDATA_HPP_
-#define ROOMDATA_HPP_
+#pragma once
 
 #include "character_data.hpp"
 #include "region_pager_lua.hpp"
@@ -78,5 +77,3 @@ private:
 	//hooks
 	int tickRef = LUA_NOREF;
 };
-
-#endif

server/rooms/room_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ROOMMANAGER_HPP_
-#define ROOMMANAGER_HPP_
+#pragma once
 
 #include "character_data.hpp"
 #include "room_data.hpp"
@@ -80,5 +79,3 @@ private:
 	int createRef = LUA_NOREF;
 	int unloadRef = LUA_NOREF;
 };
-
-#endif

server/rooms/room_manager_api.hpp

@@ -19,12 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ROOMMANAGERAPI_HPP_
-#define ROOMMANAGERAPI_HPP_
-
+#pragma once
 #include "lua.hpp"
 
 #define TORTUGA_ROOM_MANAGER_API "room_manager"
 LUAMOD_API int openRoomManagerAPI(lua_State* L);
-
-#endif

server/server_application.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERAPPLICATION_HPP_
-#define SERVERAPPLICATION_HPP_
+#pragma once
 
 //managers
 #include "account_manager.hpp"
@@ -128,5 +127,3 @@ private:
 	//misc
 	bool running = true;
 };
-
-#endif

server/server_utilities/network_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef NETWORKAPI_HPP_
-#define NETWORKAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_NETWORK_API "network"
 LUAMOD_API int openNetworkAPI(lua_State* L);
-
-#endif

server/server_utilities/server_utilities.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERUTILITIES_HPP_
-#define SERVERUTILITIES_HPP_
+#pragma once
 
 #include "character_data.hpp"
 #include "serial_packet.hpp"
@@ -37,5 +36,3 @@ void copyCharacterToPacket(CharacterPacket* const packet, int characterIndex);
 void copyCharacterToPacket(CharacterPacket* const packet, CharacterData* const characterData, int characterIndex);
 void pumpAndChangeRooms(int characterIndex, int newRoomIndex);
 void pumpAndChangeRooms(CharacterData* const characterData, int newRoomIndex, int characterIndex);
-
-#endif

server/server_utilities/sql_tools.hpp

@@ -19,13 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERUTILITY_HPP_
-#define SERVERUTILITY_HPP_
+#pragma once
 
 #include "sqlite3.h"
 
 #include <string>
 
 int runSQLScript(sqlite3* db, std::string fname, int (*callback)(void*,int,char**,char**) = nullptr, void* argPtr = nullptr);
-
-#endif

server/triggers/trigger_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TRIGGERAPI_HPP_
-#define TRIGGERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_TRIGGER_API "trigger"
 LUAMOD_API int openTriggerAPI(lua_State* L);
-
-#endif

server/triggers/trigger_data.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TRIGGERDATA_HPP_
-#define TRIGGERDATA_HPP_
+#pragma once
 
 #include "bounding_box.hpp"
 #include "entity.hpp"
@@ -57,5 +56,3 @@ private:
 	int scriptRef = LUA_NOREF;
 	std::list<Entity*> exclusionList;
 };
-
-#endif

server/triggers/trigger_manager.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TRIGGERMANAGER_HPP_
-#define TRIGGERMANAGER_HPP_
+#pragma once
 
 #include "bounding_box.hpp"
 #include "vector2.hpp"
@@ -60,5 +59,3 @@ private:
 	lua_State* lua = nullptr;
 	int counter = 0;
 };
-
-#endif

server/triggers/trigger_manager_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TRIGGERMANAGERAPI_HPP_
-#define TRIGGERMANAGERAPI_HPP_
+#pragma once
 
 #include "lua.hpp"
 
 #define TORTUGA_TRIGGER_MANAGER_API "trigger_manager"
 LUAMOD_API int openTriggerManagerAPI(lua_State* L);
-
-#endif