Switched to the #pragma once system

client/base_scene.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASESCENE_HPP_
+#pragma once
-#define BASESCENE_HPP_
 
 #include "scene_list.hpp"
 
@@ -70,5 +69,3 @@ private:
 	static SDL_Surface* screen;
 	SceneList nextScene = SceneList::CONTINUE;
 };
-
-#endif

client/channels.hpp

@@ -19,11 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHANNELS_HPP_
+#pragma once
-#define CHANNELS_HPP_
 
 enum Channels {
 	SERVER = 0
 };
-
-#endif

client/client_application.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTAPPLICATION_HPP_
+#pragma once
-#define CLIENTAPPLICATION_HPP_
 
 #include "scene_list.hpp"
 #include "base_scene.hpp"
@@ -54,5 +53,3 @@ private:
 	int clientIndex = -1;
 	int accountIndex = -1;
 };
-
-#endif

client/client_utilities/terminal_error.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TERMINALERROR_HPP_
+#pragma once
-#define TERMINALERROR_HPP_
 
 #include <stdexcept>
 #include <string>
@@ -30,5 +29,3 @@ public:
 	explicit terminal_error(const std::string& str): runtime_error(str) {}
 	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
 };
-
-#endif

client/entities/base_character.hpp

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

client/entities/base_monster.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASEMONSTER_HPP_
+#pragma once
-#define BASEMONSTER_HPP_
 
 #include "entity.hpp"
 
@@ -41,5 +40,3 @@ protected:
 	std::string handle;
 	std::string avatar;
 };
-
-#endif

client/entities/entity.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENTITY_HPP_
+#pragma once
-#define ENTITY_HPP_
 
 #include "bounding_box.hpp"
 #include "sprite_sheet.hpp"
@@ -52,5 +51,3 @@ protected:
 	Vector2 motion;
 	BoundingBox bounds;
 };
-
-#endif

client/entities/local_character.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOCALCHARACTER_HPP_
+#pragma once
-#define LOCALCHARACTER_HPP_
 
 #include "base_character.hpp"
 #include "bounding_box.hpp"
@@ -38,5 +37,3 @@ public:
 private:
 	//NOTE: NO MEMBERS
 };
-
-#endif

client/gameplay_scenes/world.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef INWORLD_HPP_
+#pragma once
-#define INWORLD_HPP_
 
 //maps
 #include "region_pager_base.hpp"
@@ -166,5 +165,3 @@ protected:
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 };
-
-#endif

client/menu_scenes/disconnected_screen.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef DISCONNECTEDSCREEN_HPP_
+#pragma once
-#define DISCONNECTEDSCREEN_HPP_
 
 //graphics
 #include "image.hpp"
@@ -62,5 +61,3 @@ protected:
 	//auto return
 	std::chrono::steady_clock::time_point startTick;
 };
-
-#endif

client/menu_scenes/lobby_menu.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOBBYMENU_HPP_
+#pragma once
-#define LOBBYMENU_HPP_
 
 //graphics & ui
 #include "image.hpp"
@@ -101,5 +100,3 @@ protected:
 	BoundingBox listBox;
 	ServerInformation* selection = nullptr;
 };
-
-#endif

client/menu_scenes/main_menu.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAINMENU_HPP_
+#pragma once
-#define MAINMENU_HPP_
 
 #include "base_scene.hpp"
 
@@ -55,5 +54,3 @@ protected:
 	Button optionsButton;
 	Button quitButton;
 };
-
-#endif

client/menu_scenes/options_menu.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef OPTIONSMENU_HPP_
+#pragma once
-#define OPTIONSMENU_HPP_
 
 #include "base_scene.hpp"
 
@@ -54,5 +53,3 @@ protected:
 	RasterFont font;
 	Button backButton;
 };
-
-#endif

client/menu_scenes/splash_screen.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPLASHSCREEN_HPP_
+#pragma once
-#define SPLASHSCREEN_HPP_
 
 #include "base_scene.hpp"
 
@@ -43,5 +42,3 @@ protected:
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;
 };
-
-#endif

client/scene_list.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SCENELIST_HPP_
+#pragma once
-#define SCENELIST_HPP_
 
 enum class SceneList {
 	//these are reserved
@@ -36,5 +35,3 @@ enum class SceneList {
 	WORLD,
 	DISCONNECTEDSCREEN,
 };
-
-#endif

common/debugging/timer.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TIMER_HPP_
+#pragma once
-#define TIMER_HPP_
 
 #include <chrono>
 #include <string>
@@ -50,5 +49,3 @@ private:
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);
-
-#endif

common/gameplay/character_defines.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERDEFINES_HPP_
+#pragma once
-#define CHARACTERDEFINES_HPP_
 
 #include <cmath>
 
@@ -38,5 +37,3 @@ constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 //the character's sprite format
 constexpr int CHARACTER_CELLS_X = 4;
 constexpr int CHARACTER_CELLS_Y = 4;
-
-#endif

common/graphics/image.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef IMAGE_HPP_
+#pragma once
-#define IMAGE_HPP_
 
 #include "SDL/SDL.h"
 #include <string>
@@ -69,5 +68,3 @@ protected:
 	SDL_Rect clip = {0, 0, 0, 0};
 	bool local = false;
 };
-
-#endif

common/graphics/sprite_sheet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPRITESHEET_HPP_
+#pragma once
-#define SPRITESHEET_HPP_
 
 #include "image.hpp"
 
@@ -62,5 +61,3 @@ private:
 	Uint16 xIndex = 0, yIndex = 0; //current cell being drawn
 	double delay = 0.0, tick = 0.0;
 };
-
-#endif

common/graphics/tile_sheet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TILESHEET_HPP_
+#pragma once
-#define TILESHEET_HPP_
 
 #include "region.hpp"
 
@@ -50,5 +49,3 @@ private:
 	Image image;
 	int xCount = 0, yCount = 0;
 };
-
-#endif

common/map/region.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGION_HPP_
+#pragma once
-#define REGION_HPP_
 
 #include <bitset>
 
@@ -59,5 +58,3 @@ private:
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
 	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
-
-#endif

common/map/region_api.hpp

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

common/map/region_pager_api.hpp

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

common/map/region_pager_base.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERBASE_HPP_
+#pragma once
-#define REGIONPAGERBASE_HPP_
 
 #include "region.hpp"
 
@@ -57,5 +56,3 @@ public:
 protected:
 	std::list<Region> regionList;
 };
-
-#endif

common/map/region_pager_lua.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERLUA_HPP_
+#pragma once
-#define REGIONPAGERLUA_HPP_
 
 #include "region_pager_base.hpp"
 
@@ -65,5 +64,3 @@ protected:
 	int createRef = LUA_NOREF;
 	int unloadRef = LUA_NOREF;
 };
-
-#endif

common/network/packet_types/character_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERPACKET_HPP_
+#pragma once
-#define CHARACTERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -45,5 +44,3 @@ struct CharacterPacket : SerialPacketBase {
 
 void serializeCharacter(void* buffer, CharacterPacket* packet);
 void deserializeCharacter(void* buffer, CharacterPacket* packet);
-
-#endif

common/network/packet_types/client_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTPACKET_HPP_
+#pragma once
-#define CLIENTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ struct ClientPacket : SerialPacketBase {
 
 void serializeClient(void* buffer, ClientPacket* packet);
 void deserializeClient(void* buffer, ClientPacket* packet);
-
-#endif

common/network/packet_types/monster_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERPACKET_HPP_
+#pragma once
-#define MONSTERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -42,5 +41,3 @@ struct MonsterPacket : SerialPacketBase {
 
 void serializeMonster(void* buffer, MonsterPacket* packet);
 void deserializeMonster(void* buffer, MonsterPacket* packet);
-
-#endif

common/network/packet_types/region_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPACKET_HPP_
+#pragma once
-#define REGIONPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -44,5 +43,3 @@ struct RegionPacket : SerialPacketBase {
 
 void serializeRegion(void* buffer, RegionPacket* packet);
 void deserializeRegion(void* buffer, RegionPacket* packet);
-
-#endif

common/network/packet_types/serial_packet_base.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETBASE_HPP_
+#pragma once
-#define SERIALPACKETBASE_HPP_
 
 #include "serial_packet_type.hpp"
 
@@ -35,5 +34,3 @@ struct SerialPacketBase {
 
 	virtual ~SerialPacketBase() {};
 };
-
-#endif

common/network/packet_types/server_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERPACKET_HPP_
+#pragma once
-#define SERVERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ struct ServerPacket : SerialPacketBase {
 
 void serializeServer(void* buffer, ServerPacket* packet);
 void deserializeServer(void* buffer, ServerPacket* packet);
-
-#endif

common/network/packet_types/text_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TEXTPACKET_HPP_
+#pragma once
-#define TEXTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -36,5 +35,3 @@ struct TextPacket : SerialPacketBase {
 
 void serializeText(void* buffer, TextPacket* packet);
 void deserializeText(void* buffer, TextPacket* packet);
-
-#endif

common/network/serial_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKET_HPP_
+#pragma once
-#define SERIALPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 #include "character_packet.hpp"
@@ -62,5 +61,3 @@ constexpr int PACKET_BUFFER_SIZE =
 	REGION_METADATA_FOOTPRINT +
 	REGION_TILE_FOOTPRINT +
 	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETTYPE_HPP_
+#pragma once
-#define SERIALPACKETTYPE_HPP_
 
 /* DOCS: The headers indicate what packet type is used for each message
  * different messages under the same header will carry different amounts of
@@ -183,5 +182,3 @@ enum class SerialPacketType {
 
 	LAST
 };
-
-#endif

common/network/serial_utility.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALIZEUTILITY_HPP_
+#pragma once
-#define SERIALIZEUTILITY_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ void deserialCopy(void** buffer, void* data, int size);
 //primary functions
 void serializePacket(void* buffer, SerialPacketBase* packet);
 void deserializePacket(void* buffer, SerialPacketBase* packet);
-
-#endif

common/network/udp_network_utility.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef UDPNETWORKUTILITY_HPP_
+#pragma once
-#define UDPNETWORKUTILITY_HPP_
 
 //common
 #include "serial_packet_base.hpp"
@@ -73,5 +72,3 @@ private:
 	UDPsocket socket = nullptr;
 	UDPpacket* packet = nullptr;
 };
-
-#endif

common/ui/button.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BUTTON_HPP_
+#pragma once
-#define BUTTON_HPP_
 
 #include "image.hpp"
 #include "raster_font.hpp"
@@ -90,5 +89,3 @@ private:
 	State state = State::NORMAL;
 	std::string text;
 };
-
-#endif

common/ui/menu_bar.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MENUBAR_HPP_
+#pragma once
-#define MENUBAR_HPP_
 
 #include "image.hpp"
 #include "raster_font.hpp"
@@ -88,5 +87,3 @@ private:
 
 	friend class MenuBar;
 };
-
-#endif

common/ui/raster_font.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef RASTERFONT_HPP_
+#pragma once
-#define RASTERFONT_HPP_
 
 #include "image.hpp"
 
@@ -50,5 +49,3 @@ public:
 private:
 	Image image;
 };
-
-#endif

common/utilities/bounding_box.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BOUNDINGBOX_HPP_
+#pragma once
-#define BOUNDINGBOX_HPP_
 
 #include <type_traits>
 #include <algorithm>
@@ -74,5 +73,3 @@ inline BoundingBox operator+(BoundingBox b, Vector2 v) {
 inline BoundingBox operator+(Vector2 v, BoundingBox b) {
 	return b + v;
 }
-
-#endif

common/utilities/config_utility.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CONFIGUTILITY_HPP_
+#pragma once
-#define CONFIGUTILITY_HPP_
 
 #include "singleton.hpp"
 
@@ -51,5 +50,3 @@ private:
 
 	table_t configMap;
 };
-
-#endif

common/utilities/frame_rate.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef FRAMERATE_HPP_
+#pragma once
-#define FRAMERATE_HPP_
 
 #include <chrono>
 
@@ -44,5 +43,3 @@ private:
 	int lastFrameRate = 0;
 	Clock::time_point tick = Clock::now();
 };
-
-#endif

common/utilities/ip_operators.hpp

@@ -19,13 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef IPOPERATORS_HPP_
+#pragma once
-#define IPOPERATORS_HPP_
 
 #include "SDL_net.h"
 
 //these should've come standard
 bool operator==(IPaddress lhs, IPaddress rhs);
 bool operator!=(IPaddress lhs, IPaddress rhs);
-
-#endif

common/utilities/singleton.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SINGLETON_HPP_
+#pragma once
-#define SINGLETON_HPP_
 
 #include <stdexcept>
 
@@ -59,5 +58,3 @@ private:
 
 template<typename T>
 T* Singleton<T>::ptr = nullptr;
-
-#endif

common/utilities/vector2.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef VECTOR2_HPP_
+#pragma once
-#define VECTOR2_HPP_
 
 #include <type_traits>
 #include <stdexcept>
@@ -110,5 +109,3 @@ public:
 
 //This is explicitly a POD
 static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
-
-#endif

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_
+#pragma once
-#define ACCOUNTDATA_HPP_
 
 #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_
+#pragma once
-#define ACCOUNTMANAGER_HPP_
 
 #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_
+#pragma once
-#define CHARACTERAPI_HPP_
 
 #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_
+#pragma once
-#define CHARACTERDATA_HPP_
 
 //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_
+#pragma once
-#define CHARACTERMANAGER_HPP_
 
 #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_
+#pragma once
-#define CHARACTERMANAGERAPI_HPP_
 
 #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_
+#pragma once
-#define CLIENTDATA_HPP_
 
 #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_
+#pragma once
-#define CLIENTMANAGER_HPP_
 
 #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_
+#pragma once
-#define ENTITY_HPP_
 
 #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_
+#pragma once
-#define ENTITYAPI_HPP_
 
 #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_
+#pragma once
-#define MONSTERAPI_HPP_
 
 #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_
+#pragma once
-#define MONSTERDATA_HPP_
 
 #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_
+#pragma once
-#define MONSTERMANAGER_HPP_
 
 #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_
+#pragma once
-#define MONSTERMANAGERAPI_HPP_
 
 #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_
+#pragma once
-#define ROOMAPI_HPP_
 
 #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_
+#pragma once
-#define ROOMDATA_HPP_
 
 #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_
+#pragma once
-#define ROOMMANAGER_HPP_
 
 #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_
+#pragma once
-#define ROOMMANAGERAPI_HPP_
-
 #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_
+#pragma once
-#define SERVERAPPLICATION_HPP_
 
 //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_
+#pragma once
-#define NETWORKAPI_HPP_
 
 #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_
+#pragma once
-#define SERVERUTILITIES_HPP_
 
 #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_
+#pragma once
-#define SERVERUTILITY_HPP_
 
 #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_
+#pragma once
-#define TRIGGERAPI_HPP_
 
 #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_
+#pragma once
-#define TRIGGERDATA_HPP_
 
 #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_
+#pragma once
-#define TRIGGERMANAGER_HPP_
 
 #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_
+#pragma once
-#define TRIGGERMANAGERAPI_HPP_
 
 #include "lua.hpp"
 
 #define TORTUGA_TRIGGER_MANAGER_API "trigger_manager"
 LUAMOD_API int openTriggerManagerAPI(lua_State* L);
-
-#endif