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_
-#define BASESCENE_HPP_
+#pragma once
 
 #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_
-#define CHANNELS_HPP_
+#pragma once
 
 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_
-#define CLIENTAPPLICATION_HPP_
+#pragma once
 
 #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_
-#define TERMINALERROR_HPP_
+#pragma once
 
 #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_
-#define BASECHARACTER_HPP_
+#pragma once
 
 //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_
-#define BASEMONSTER_HPP_
+#pragma once
 
 #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_
-#define ENTITY_HPP_
+#pragma once
 
 #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_
-#define LOCALCHARACTER_HPP_
+#pragma once
 
 #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_
-#define INWORLD_HPP_
+#pragma once
 
 //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_
-#define DISCONNECTEDSCREEN_HPP_
+#pragma once
 
 //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_
-#define LOBBYMENU_HPP_
+#pragma once
 
 //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_
-#define MAINMENU_HPP_
+#pragma once
 
 #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_
-#define OPTIONSMENU_HPP_
+#pragma once
 
 #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_
-#define SPLASHSCREEN_HPP_
+#pragma once
 
 #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_
-#define SCENELIST_HPP_
+#pragma once
 
 enum class SceneList {
 	//these are reserved
@@ -36,5 +35,3 @@ enum class SceneList {
 	WORLD,
 	DISCONNECTEDSCREEN,
 };
-
-#endif