replace header guards with more portable ones

Makefile

@@ -19,7 +19,7 @@ CXXFLAGS = \
 	-Wall \
 	-Wextra \
 	-pedantic \
-	-g \
+	-g -lm \
 	-Wno-deprecated-declarations
 
 ifeq (${platform}, windows)

src/_components.hh

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef YCRAFT__COMPONENTS_HH
+#define YCRAFT__COMPONENTS_HH
 
 // macros
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
@@ -41,3 +42,5 @@
 typedef uint16_t blockID_t;
 typedef uint16_t itemID_t;
 typedef uint32_t textureID_t;
+
+#endif

src/animation.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_ANIMATION_HH
+#define YCRAFT_ANIMATION_HH
+
 #include "_components.hh"
 
 class Animation {
@@ -10,3 +12,5 @@ class Animation {
 		void        NextFrame();
 		textureID_t GetFrame();
 };
+
+#endif

src/app.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_APP_HH
+#define YCRAFT_APP_HH
+
 #include "_components.hh"
 #include "video.hh"
 #include "text.hh"
@@ -40,3 +42,5 @@ class App {
 		void Update();
 		void Render();
 };
+
+#endif

src/blockdefs.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_BLOCKDEFS_HH
+#define YCRAFT_BLOCKDEFS_HH
+
 #include "_components.hh"
 
 enum class BlockType {
@@ -25,3 +27,5 @@ class Blockdefs {
 			blockID_t id, std::string name, uint32_t textureID, BlockType type
 		);
 };
+
+#endif

src/collision.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_COLLISION_HH
+#define YCRAFT_COLLISION_HH
+
 #include "_components.hh"
 #include "types.hh"
 #include "level.hh"
@@ -18,3 +20,5 @@ namespace Collision {
 		float& time, const FVec2& vel
 	);
 }
+
+#endif

src/constants.hh

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef YCRAFT_CONSTANTS_HH
+#define YCRAFT_CONSTANTS_HH
 
 #define APP_NAME          "ycraft"
 #define APP_VERSION       "demo 0.0.1"
@@ -9,3 +10,5 @@
 #define GAME_BLOCK_SIZE        16
 #define GAME_PLAYER_SPEED      1.0
 #define GAME_PLAYER_FAST_SPEED 2.0
+
+#endif

src/game.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_GAME_HH
+#define YCRAFT_GAME_HH
+
 #include "_components.hh"
 #include "blockdefs.hh"
 #include "types.hh"
@@ -30,3 +32,5 @@ class Game {
 		void PlaceBlock();
 		void DeleteBlock();
 };
+
+#endif

src/image.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_IMAGE_HH
+#define YCRAFT_IMAGE_HH
+
 #include "_components.hh"
 
 class ImageComponents {
@@ -8,3 +10,5 @@ class ImageComponents {
 		void Init();
 		void Free();
 };
+
+#endif

src/inventory.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_INVENTORY_HH
+#define YCRAFT_INVENTORY_HH
+
 #include "_components.hh"
 
 struct InventoryEntry {
@@ -16,3 +18,5 @@ class Inventory {
 		// functions
 		Inventory();	
 };
+
+#endif

src/level.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_LEVEL_HH
+#define YCRAFT_LEVEL_HH
+
 #include "_components.hh"
 #include "types.hh"
 
@@ -17,3 +19,5 @@ class Level {
 		Level() {}
 		void Generate(UVec2 p_size);
 };
+
+#endif

src/light.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_LIGHT_HH
+#define YCRAFT_LIGHT_HH
+
 #include "_components.hh"
 #include "types.hh"
 
@@ -9,6 +11,8 @@ typedef uint8_t lightLevel_t;
 class LevelLight {
 	public:
 		// variables
-		lightLevel_t globalLightLevel;
-
+		lightLevel_t                             globalLightLevel;
+		std::vector <std::vector <lightLevel_t>> light;
 };
+
+#endif

src/player.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_PLAYER_HH
+#define YCRAFT_PLAYER_HH
+
 #include "_components.hh"
 #include "types.hh"
 #include "level.hh"
@@ -37,3 +39,5 @@ class Player {
 		textureID_t GetTextureID();
 		FVec2       CorrectPosition();
 };
+
+#endif

src/text.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_TEXT_HH
+#define YCRAFT_TEXT_HH
+
 #include "_components.hh"
 #include "video.hh"
 #include "types.hh"
@@ -18,3 +20,5 @@ class TextComponents {
 		);
 		Vec2 GetTextSize(std::string text, float size);
 };
+
+#endif

src/tiles.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_TILES_HH
+#define YCRAFT_TILES_HH
+
 #include "_components.hh"
 #include "types.hh"
 
@@ -15,3 +17,5 @@ class TileSheet {
 		UVec2 GetTexturePosition(uint32_t id);
 		void  RenderTile(SDL_Renderer* renderer, uint32_t id, Vec2 pos);
 };
+
+#endif

src/titleScreen.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_TITLESCREEN_HH
+#define YCRAFT_TITLESCREEN_HH
+
 #include "_components.hh"
 #include "ui.hh"
 
@@ -20,3 +22,5 @@ namespace Menus {
 			void Render(SDL_Renderer* renderer, TextComponents& text);
 	};
 }
+
+#endif

src/types.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_TYPES_HH
+#define YCRAFT_TYPES_HH
+
 #include "_components.hh"
 
 struct Vec2 {
@@ -22,3 +24,5 @@ typedef SDL_Rect Rect;
 struct FRect { // float Rect
 	float x, y, w, h;
 };
+
+#endif

src/ui.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_UI_HH
+#define YCRAFT_UI_HH
+
 #include "_components.hh"
 #include "types.hh"
 #include "text.hh"
@@ -28,3 +30,5 @@ namespace UI {
 			void Render(SDL_Renderer* renderer, TextComponents& text);
 	};
 }
+
+#endif

src/util.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_UTIL_HH
+#define YCRAFT_UTIL_HH
+
 #include "_components.hh"
 
 namespace Util {
@@ -8,3 +10,5 @@ namespace Util {
 	std::string DirName(std::string path);
 	double      Clamp(double x, double min, double max);
 }
+
+#endif

src/video.hh

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef YCRAFT_VIDEO_HH
+#define YCRAFT_VIDEO_HH
+
 #include "_components.hh"
 
 class VideoComponents {
@@ -12,3 +14,5 @@ class VideoComponents {
 		void Init();
 		void Free();
 };
+
+#endif

src/worldMenu.hh

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef YCRAFT_WORLDMENU_HH
+#define YCRAFT_WORLDMENU_HH
 #include "_components.hh"
 #include "text.hh"
 #include "ui.hh"
@@ -21,3 +22,5 @@ namespace Menus {
 			void Render(SDL_Renderer* renderer, TextComponents& text);
 	};
 }
+
+#endif