From 5db87e74334aba486a1d9e246b90850c6af28e3e Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Wed, 11 Jan 2012 02:43:49 +0000 Subject: [PATCH] [Change] Moved from header guards to #pragma once to compensate for Tamirs' lack of style. Joke. :) --- Unuk-QT/Makefile | 66 ++++++++++++++++++++++++++++++----- Unuk-QT/Unuk-QT.pro | 6 ++-- src/Unuk/Constants.h | 5 +-- src/Unuk/Game.h | 5 +-- src/Unuk/Globals.h | 6 +--- src/Unuk/Player.h | 5 +-- src/libUnuk/AStar.h | 6 +--- src/libUnuk/AStarBase.h | 6 +--- src/libUnuk/ApplySurface.h | 5 +-- src/libUnuk/Button.h | 5 +-- src/libUnuk/ButtonGroup.cpp | 1 - src/libUnuk/ButtonGroup.h | 6 +--- src/libUnuk/ButtonToggle.h | 6 +--- src/libUnuk/Character.h | 5 +-- src/libUnuk/Collision.h | 4 +-- src/libUnuk/Debug.h | 5 +-- src/libUnuk/FPS.h | 5 +-- src/libUnuk/Font.h | 5 +-- src/libUnuk/ImageLoader.h | 5 +-- src/libUnuk/IngameMenu.h | 5 +-- src/libUnuk/Input.h | 5 +-- src/libUnuk/MainMenu.h | 5 +-- src/libUnuk/Map.h | 5 +-- src/libUnuk/MapElement.h | 5 +-- src/libUnuk/MapEntities.h | 6 +--- src/libUnuk/MapTile.h | 5 +-- src/libUnuk/MemClass.h | 5 +-- src/libUnuk/MemManager.h | 5 +-- src/libUnuk/NPC.h | 5 +-- src/libUnuk/ParticleEmitter.h | 5 +-- src/libUnuk/Rect.h | 6 +--- src/libUnuk/Text.h | 5 +-- src/libUnuk/Texture.h | 5 +-- src/libUnuk/TextureManager.h | 6 ++-- src/libUnuk/Timer.h | 5 +-- src/libUnuk/WorldManager.cpp | 1 - src/libUnuk/WorldManager.h | 1 - 37 files changed, 94 insertions(+), 148 deletions(-) diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile index 4a9cc28..be56da9 100644 --- a/Unuk-QT/Makefile +++ b/Unuk-QT/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: Unuk-QT -# Generated by qmake (2.01a) (Qt 4.7.3) on: Tue Jan 10 11:05:09 2012 +# Generated by qmake (2.01a) (Qt 4.7.3) on: Wed Jan 11 02:42:42 2012 # Project: Unuk-QT.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro @@ -71,7 +71,8 @@ SOURCES = ../src/libUnuk/Debug.cpp \ ../src/libUnuk/FPS.cpp \ ../src/libUnuk/MemManager.cpp \ ../src/libUnuk/AStar.cpp \ - ../src/libUnuk/ButtonGroup.cpp + ../src/libUnuk/ButtonGroup.cpp \ + ../src/libUnuk/WorldManager.cpp OBJECTS = Debug.o \ main.o \ Input.o \ @@ -100,7 +101,8 @@ OBJECTS = Debug.o \ FPS.o \ MemManager.o \ AStar.o \ - ButtonGroup.o + ButtonGroup.o \ + WorldManager.o DIST = /usr/share/qt4/mkspecs/common/g++.conf \ /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/linux.conf \ @@ -200,7 +202,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h ../src/libUnuk/Character.h ../src/libUnuk/NPC.h ../src/Unuk/Player.h ../src/Unuk/Game.h ../src/libUnuk/MapElement.h ../src/libUnuk/MapEntities.h ../src/libUnuk/FPS.h ../src/libUnuk/MemManager.h ../src/libUnuk/MemClass.h ../src/libUnuk/Node.h ../src/libUnuk/AStarBase.h ../src/libUnuk/AStar.h ../src/libUnuk/ButtonGroup.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp ../src/libUnuk/Character.cpp ../src/libUnuk/NPC.cpp ../src/Unuk/Player.cpp ../src/Unuk/Game.cpp ../src/libUnuk/MapElement.cpp ../src/libUnuk/MapEntities.cpp ../src/libUnuk/FPS.cpp ../src/libUnuk/MemManager.cpp ../src/libUnuk/AStar.cpp ../src/libUnuk/ButtonGroup.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h ../src/libUnuk/Character.h ../src/libUnuk/NPC.h ../src/Unuk/Player.h ../src/Unuk/Game.h ../src/libUnuk/MapElement.h ../src/libUnuk/MapEntities.h ../src/libUnuk/FPS.h ../src/libUnuk/MemManager.h ../src/libUnuk/MemClass.h ../src/libUnuk/Node.h ../src/libUnuk/AStarBase.h ../src/libUnuk/AStar.h ../src/libUnuk/ButtonGroup.h ../src/libUnuk/WorldManager.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp ../src/libUnuk/Character.cpp ../src/libUnuk/NPC.cpp ../src/Unuk/Player.cpp ../src/Unuk/Game.cpp ../src/libUnuk/MapElement.cpp ../src/libUnuk/MapEntities.cpp ../src/libUnuk/FPS.cpp ../src/libUnuk/MemManager.cpp ../src/libUnuk/AStar.cpp ../src/libUnuk/ButtonGroup.cpp ../src/libUnuk/WorldManager.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0 clean:compiler_clean @@ -258,16 +260,17 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/MainMenu.h \ ../src/libUnuk/Debug.h \ ../src/libUnuk/Font.h \ ../src/libUnuk/Rect.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h \ ../src/libUnuk/Map.h \ ../src/libUnuk/ImageLoader.h \ ../src/libUnuk/MapTile.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ ../src/libUnuk/NPC.h \ ../src/libUnuk/Character.h \ - ../src/libUnuk/MemClass.h \ - ../src/libUnuk/MemManager.h \ ../src/libUnuk/Collision.h \ ../src/libUnuk/AStar.h \ ../src/libUnuk/AStarBase.h \ @@ -335,7 +338,18 @@ Map.o: ../src/libUnuk/Map.cpp ../src/libUnuk/Map.h \ ../src/libUnuk/MapTile.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ - ../src/libUnuk/MapEntities.h + ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ + ../src/libUnuk/NPC.h \ + ../src/libUnuk/Character.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h \ + ../src/libUnuk/Collision.h \ + ../src/libUnuk/Timer.h \ + ../src/libUnuk/Text.h \ + ../src/libUnuk/Font.h \ + ../src/libUnuk/AStar.h \ + ../src/libUnuk/AStarBase.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map.cpp Button.o: ../src/libUnuk/Button.cpp ../src/libUnuk/Button.h \ @@ -379,12 +393,15 @@ MainMenu.o: ../src/libUnuk/MainMenu.cpp ../src/libUnuk/MainMenu.h \ ../src/libUnuk/Debug.h \ ../src/libUnuk/Font.h \ ../src/libUnuk/Rect.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h \ ../src/libUnuk/Map.h \ ../src/libUnuk/ImageLoader.h \ ../src/libUnuk/MapTile.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ - ../src/libUnuk/MapEntities.h + ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/MainMenu.cpp IngameMenu.o: ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/IngameMenu.h \ @@ -398,6 +415,8 @@ IngameMenu.o: ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/IngameMenu.h \ ../src/libUnuk/Debug.h \ ../src/libUnuk/Font.h \ ../src/libUnuk/Rect.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h \ ../src/libUnuk/ButtonToggle.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/IngameMenu.cpp @@ -418,6 +437,7 @@ Character.o: ../src/libUnuk/Character.cpp ../src/libUnuk/Character.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ ../src/libUnuk/Timer.h \ ../src/libUnuk/Text.h \ ../src/libUnuk/Font.h @@ -438,6 +458,7 @@ NPC.o: ../src/libUnuk/NPC.cpp ../src/libUnuk/NPC.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ ../src/libUnuk/Timer.h \ ../src/libUnuk/Text.h \ ../src/libUnuk/Font.h \ @@ -460,6 +481,7 @@ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ ../src/libUnuk/Timer.h \ ../src/libUnuk/Text.h \ ../src/libUnuk/Font.h @@ -481,6 +503,7 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \ ../src/libUnuk/MapElement.h \ ../src/libUnuk/TextureManager.h \ ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/WorldManager.h \ ../src/libUnuk/Timer.h \ ../src/libUnuk/Text.h \ ../src/libUnuk/Font.h \ @@ -533,9 +556,34 @@ ButtonGroup.o: ../src/libUnuk/ButtonGroup.cpp ../src/libUnuk/ButtonGroup.h \ ../src/libUnuk/ApplySurface.h \ ../src/libUnuk/Debug.h \ ../src/libUnuk/Font.h \ - ../src/libUnuk/Rect.h + ../src/libUnuk/Rect.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/ButtonGroup.cpp +WorldManager.o: ../src/libUnuk/WorldManager.cpp ../src/libUnuk/WorldManager.h \ + ../src/libUnuk/NPC.h \ + ../src/libUnuk/Character.h \ + ../src/Unuk/Globals.h \ + ../src/Unuk/Constants.h \ + ../src/libUnuk/MemClass.h \ + ../src/libUnuk/MemManager.h \ + ../src/libUnuk/ApplySurface.h \ + ../src/libUnuk/Debug.h \ + ../src/libUnuk/ImageLoader.h \ + ../src/libUnuk/Collision.h \ + ../src/libUnuk/Map.h \ + ../src/libUnuk/MapTile.h \ + ../src/libUnuk/MapElement.h \ + ../src/libUnuk/TextureManager.h \ + ../src/libUnuk/MapEntities.h \ + ../src/libUnuk/Timer.h \ + ../src/libUnuk/Text.h \ + ../src/libUnuk/Font.h \ + ../src/libUnuk/AStar.h \ + ../src/libUnuk/AStarBase.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/WorldManager.cpp + ####### Install install: FORCE diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro index a069546..0ef3066 100644 --- a/Unuk-QT/Unuk-QT.pro +++ b/Unuk-QT/Unuk-QT.pro @@ -43,7 +43,8 @@ HEADERS += ../src/libUnuk/Debug.h \ ../src/libUnuk/Node.h \ ../src/libUnuk/AStarBase.h \ ../src/libUnuk/AStar.h \ - ../src/libUnuk/ButtonGroup.h + ../src/libUnuk/ButtonGroup.h \ + ../src/libUnuk/WorldManager.h SOURCES += ../src/libUnuk/Debug.cpp \ ../src/Unuk/main.cpp \ ../src/libUnuk/Input.cpp \ @@ -72,4 +73,5 @@ SOURCES += ../src/libUnuk/Debug.cpp \ ../src/libUnuk/FPS.cpp \ ../src/libUnuk/MemManager.cpp \ ../src/libUnuk/AStar.cpp \ - ../src/libUnuk/ButtonGroup.cpp + ../src/libUnuk/ButtonGroup.cpp \ + ../src/libUnuk/WorldManager.cpp diff --git a/src/Unuk/Constants.h b/src/Unuk/Constants.h index ef15698..ba5cb22 100644 --- a/src/Unuk/Constants.h +++ b/src/Unuk/Constants.h @@ -1,5 +1,4 @@ -#ifndef _CONSTANTS_H_ -#define _CONSTANTS_H_ +#pragma once #include const int TILE_WIDTH = 64; @@ -11,5 +10,3 @@ const int SCREEN_BPP = 16; const SDL_Color COLOUR_BLACK = { 0, 0, 0 }; const SDL_Color COLOUR_WHITE = { 255, 255, 255 }; - -#endif diff --git a/src/Unuk/Game.h b/src/Unuk/Game.h index b9a4523..f83fd91 100644 --- a/src/Unuk/Game.h +++ b/src/Unuk/Game.h @@ -1,5 +1,4 @@ -#ifndef _GAME_H_ -#define _GAME_H_ +#pragma once #include #include #include @@ -58,5 +57,3 @@ private: Player* _player; }; - -#endif diff --git a/src/Unuk/Globals.h b/src/Unuk/Globals.h index 762e31c..5945f65 100644 --- a/src/Unuk/Globals.h +++ b/src/Unuk/Globals.h @@ -1,5 +1,4 @@ -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include extern SDL_Surface* screen; @@ -11,6 +10,3 @@ extern int levelWidth; extern int levelHeight; extern bool debugEnabled; - - -#endif diff --git a/src/Unuk/Player.h b/src/Unuk/Player.h index fb5db4b..5bf75f2 100644 --- a/src/Unuk/Player.h +++ b/src/Unuk/Player.h @@ -1,5 +1,4 @@ -#ifndef _PLAYER_H_ -#define _PLAYER_H_ +#pragma once #include #include "Globals.h" @@ -29,5 +28,3 @@ private: string _name; //int _health; }; - -#endif diff --git a/src/libUnuk/AStar.h b/src/libUnuk/AStar.h index 2661025..4e9e7d3 100644 --- a/src/libUnuk/AStar.h +++ b/src/libUnuk/AStar.h @@ -1,5 +1,4 @@ -#ifndef _ASTAR_H_ -#define _ASTAR_H_ +#pragma once #include #include #include @@ -29,6 +28,3 @@ private: std::vector GetSolutionSequence(AStarBase* node); std::vector _solution; }; - -#endif - diff --git a/src/libUnuk/AStarBase.h b/src/libUnuk/AStarBase.h index 5dca74c..67f5c3c 100644 --- a/src/libUnuk/AStarBase.h +++ b/src/libUnuk/AStarBase.h @@ -1,5 +1,4 @@ -#ifndef _ASTARBASE_H_ -#define _ASTARBASE_H_ +#pragma once #include class AStarBase { @@ -25,6 +24,3 @@ public: long _key; }; - -#endif - diff --git a/src/libUnuk/ApplySurface.h b/src/libUnuk/ApplySurface.h index 24b9529..bb23e32 100644 --- a/src/libUnuk/ApplySurface.h +++ b/src/libUnuk/ApplySurface.h @@ -1,5 +1,4 @@ -#ifndef _APPLYSURFACE_H_ -#define _APPLYSURFACE_H_ +#pragma once #include #include #include "Debug.h" @@ -15,5 +14,3 @@ void ApplySurface(int x, int y, SDL_Surface* source, SDL_Surface* destination, S // This one won't take the camera into account, so we could use it for GUI stuff. void ApplySurfaceLiteral(int x, int y, SDL_Surface* source, SDL_Surface* destination, SDL_Rect* clip = NULL); - -#endif diff --git a/src/libUnuk/Button.h b/src/libUnuk/Button.h index d5152bf..8c5f8a5 100644 --- a/src/libUnuk/Button.h +++ b/src/libUnuk/Button.h @@ -1,5 +1,4 @@ -#ifndef _BUTTON_H_ -#define _BUTTON_H_ +#pragma once #include #include @@ -61,5 +60,3 @@ private: bool _mouseOver; }; - -#endif diff --git a/src/libUnuk/ButtonGroup.cpp b/src/libUnuk/ButtonGroup.cpp index b245eef..4bdfd02 100644 --- a/src/libUnuk/ButtonGroup.cpp +++ b/src/libUnuk/ButtonGroup.cpp @@ -99,4 +99,3 @@ Button* ButtonGroup::GetButton(int index) { } return NULL; } - diff --git a/src/libUnuk/ButtonGroup.h b/src/libUnuk/ButtonGroup.h index 67c06b8..d0b3dc5 100644 --- a/src/libUnuk/ButtonGroup.h +++ b/src/libUnuk/ButtonGroup.h @@ -1,5 +1,4 @@ -#ifndef _BUTTONGROUP_H_ -#define _BUTTONGROUP_H_ +#pragma once #include #include "Button.h" @@ -32,6 +31,3 @@ private: std::list _buttons; int _selectedButton; }; - -#endif - diff --git a/src/libUnuk/ButtonToggle.h b/src/libUnuk/ButtonToggle.h index d7cd978..83c5362 100644 --- a/src/libUnuk/ButtonToggle.h +++ b/src/libUnuk/ButtonToggle.h @@ -1,5 +1,4 @@ -#ifndef _BUTTONTOGGLE_H_ -#define _BUTTONTOGGLE_H_ +#pragma once #include #include @@ -35,6 +34,3 @@ private: Text _onText; }; - - -#endif diff --git a/src/libUnuk/Character.h b/src/libUnuk/Character.h index 5c07735..f6cf77d 100644 --- a/src/libUnuk/Character.h +++ b/src/libUnuk/Character.h @@ -1,5 +1,4 @@ -#ifndef _CHARACTER_H_ -#define _CHARACTER_H_ +#pragma once #include #include #include @@ -116,5 +115,3 @@ private: Timer _speachBubbleTimer; Text _speachBubbleText; }; - -#endif diff --git a/src/libUnuk/Collision.h b/src/libUnuk/Collision.h index 1f61f4e..b477fd1 100644 --- a/src/libUnuk/Collision.h +++ b/src/libUnuk/Collision.h @@ -1,8 +1,6 @@ -#ifndef _COLLISION_H_ +#pragma once #define _COLLISION_H_ #include bool CheckCollisionRect(SDL_Rect a, SDL_Rect b); bool CheckCollisionXY(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); - -#endif diff --git a/src/libUnuk/Debug.h b/src/libUnuk/Debug.h index e418cae..96e93f0 100644 --- a/src/libUnuk/Debug.h +++ b/src/libUnuk/Debug.h @@ -1,5 +1,4 @@ -#ifndef _DEBUG_H_ -#define _DEBUG_H_ +#pragma once #include #include "string" @@ -19,5 +18,3 @@ public: private: std::ofstream _logFile; }; - -#endif // _DEBUG_H_ diff --git a/src/libUnuk/FPS.h b/src/libUnuk/FPS.h index 04369c0..ffd3ce9 100644 --- a/src/libUnuk/FPS.h +++ b/src/libUnuk/FPS.h @@ -1,5 +1,4 @@ -#ifndef _FPS_H_ -#define _FPS_H_ +#pragma once #include "../Unuk/Globals.h" #include "Timer.h" @@ -24,5 +23,3 @@ private: Timer _frameTimer; Timer _fpsCalc; }; - -#endif diff --git a/src/libUnuk/Font.h b/src/libUnuk/Font.h index 8f3c0d5..81cc96b 100644 --- a/src/libUnuk/Font.h +++ b/src/libUnuk/Font.h @@ -1,5 +1,4 @@ -#ifndef _FONT_H_ -#define _FONT_H_ +#pragma once #include #include #include @@ -7,5 +6,3 @@ using namespace std; TTF_Font* Font(const char* filename, const int size); - -#endif diff --git a/src/libUnuk/ImageLoader.h b/src/libUnuk/ImageLoader.h index dd112f3..0c021a4 100644 --- a/src/libUnuk/ImageLoader.h +++ b/src/libUnuk/ImageLoader.h @@ -1,5 +1,4 @@ -#ifndef _IMAGELOADER_H_ -#define _IMAGELOADER_H_ +#pragma once #include #include #include "../Unuk/Globals.h" @@ -7,5 +6,3 @@ SDL_Surface* LoadImage(const char* filename); SDL_Surface* LoadImageAlpha(const char* filename); - -#endif diff --git a/src/libUnuk/IngameMenu.h b/src/libUnuk/IngameMenu.h index d6f36c5..cac0ceb 100644 --- a/src/libUnuk/IngameMenu.h +++ b/src/libUnuk/IngameMenu.h @@ -1,5 +1,4 @@ -#ifndef _INGAMEMENU_H_ -#define _INGAMEMENU_H_ +#pragma once #include "../Unuk/Globals.h" #include "../Unuk/Constants.h" @@ -31,5 +30,3 @@ private: ButtonGroup _buttons; }; - -#endif diff --git a/src/libUnuk/Input.h b/src/libUnuk/Input.h index 894fe31..988dfee 100644 --- a/src/libUnuk/Input.h +++ b/src/libUnuk/Input.h @@ -1,5 +1,4 @@ -#ifndef _INPUT_H_ -#define _INPUT_H_ +#pragma once #include typedef struct mouse_s { @@ -42,5 +41,3 @@ typedef struct input_s { bool MouseStillUp(int button); void DestroyInput(void); - -#endif diff --git a/src/libUnuk/MainMenu.h b/src/libUnuk/MainMenu.h index 91fd175..769fa86 100644 --- a/src/libUnuk/MainMenu.h +++ b/src/libUnuk/MainMenu.h @@ -1,5 +1,4 @@ -#ifndef _MAINMENU_H_ -#define _MAINMENU_H_ +#pragma once #include "../Unuk/Constants.h" #include "FPS.h" @@ -36,5 +35,3 @@ private: Text lblNewGame; ButtonGroup grpNewGame; }; - -#endif diff --git a/src/libUnuk/Map.h b/src/libUnuk/Map.h index 7391e55..c6466ca 100644 --- a/src/libUnuk/Map.h +++ b/src/libUnuk/Map.h @@ -1,5 +1,4 @@ -#ifndef _MAP_H_ -#define _MAP_H_ +#pragma once #include #include #include @@ -63,5 +62,3 @@ private: WorldManager _world; }; - -#endif diff --git a/src/libUnuk/MapElement.h b/src/libUnuk/MapElement.h index d69ab5f..076f526 100644 --- a/src/libUnuk/MapElement.h +++ b/src/libUnuk/MapElement.h @@ -1,5 +1,4 @@ -#ifndef _MAPELEMENT_H_ -#define _MAPELEMENT_H_ +#pragma once #include #include @@ -35,5 +34,3 @@ protected: int x; int y; }; - -#endif diff --git a/src/libUnuk/MapEntities.h b/src/libUnuk/MapEntities.h index 8440d70..530eb62 100644 --- a/src/libUnuk/MapEntities.h +++ b/src/libUnuk/MapEntities.h @@ -1,12 +1,10 @@ +#pragma once /* * Version of MapElement, that will check whether the SDL_Surface it * owns is NULL or not and draws. * */ -#ifndef _MAPENTITIES_H_ -#define _MAPENTITIES_H_ - #include "MapElement.h" class MapEntityGeneric : public MapElement { @@ -19,5 +17,3 @@ public: private: }; - -#endif diff --git a/src/libUnuk/MapTile.h b/src/libUnuk/MapTile.h index 31ced05..270af38 100644 --- a/src/libUnuk/MapTile.h +++ b/src/libUnuk/MapTile.h @@ -1,5 +1,4 @@ -#ifndef _MAPTILE_H_ -#define _MAPTILE_H_ +#pragma once #include #include #include @@ -65,5 +64,3 @@ private: int _mapTransitionX; int _mapTransitionY; }; - -#endif diff --git a/src/libUnuk/MemClass.h b/src/libUnuk/MemClass.h index 68042a6..6e0ea71 100644 --- a/src/libUnuk/MemClass.h +++ b/src/libUnuk/MemClass.h @@ -1,5 +1,4 @@ -#ifndef _MEMCLASS_H_ -#define _MEMCLASS_H_ +#pragma once #include "MemManager.h" extern MemManager gMemManager; @@ -31,5 +30,3 @@ private: // Complex part. double c; }; - -#endif diff --git a/src/libUnuk/MemManager.h b/src/libUnuk/MemManager.h index 528eef8..3ceee14 100644 --- a/src/libUnuk/MemManager.h +++ b/src/libUnuk/MemManager.h @@ -1,5 +1,4 @@ -#ifndef _MEMMANAGER_H_ -#define _MEMMANAGER_H_ +#pragma once #include #include #include @@ -87,5 +86,3 @@ private: set _freeMapEntries; map _arrayMemoryList; }; - -#endif diff --git a/src/libUnuk/NPC.h b/src/libUnuk/NPC.h index 971ba93..5774690 100644 --- a/src/libUnuk/NPC.h +++ b/src/libUnuk/NPC.h @@ -1,5 +1,4 @@ -#ifndef _NPC_H_ -#define _NPC_H_ +#pragma once #include "Character.h" #include "AStar.h" @@ -25,5 +24,3 @@ private: Timer _moveTimer; }; - -#endif diff --git a/src/libUnuk/ParticleEmitter.h b/src/libUnuk/ParticleEmitter.h index 24146e3..d5813ba 100644 --- a/src/libUnuk/ParticleEmitter.h +++ b/src/libUnuk/ParticleEmitter.h @@ -1,5 +1,4 @@ -#ifndef _PARTICLEEMITTER_H_ -#define _PARTICLEEMITTER_H_ +#pragma once #include #include #include @@ -51,5 +50,3 @@ private: SDL_Surface* _particleTexture; }; - -#endif diff --git a/src/libUnuk/Rect.h b/src/libUnuk/Rect.h index dd1b5b1..a7689a6 100644 --- a/src/libUnuk/Rect.h +++ b/src/libUnuk/Rect.h @@ -1,5 +1,4 @@ -#ifndef _RECT_H_ -#define _RECT_H_ +#pragma once #include #include "../Unuk/Globals.h" #include "ApplySurface.h" @@ -34,6 +33,3 @@ protected: private: SDL_Rect rect; }; - - -#endif diff --git a/src/libUnuk/Text.h b/src/libUnuk/Text.h index 7ed5744..395de51 100644 --- a/src/libUnuk/Text.h +++ b/src/libUnuk/Text.h @@ -1,5 +1,4 @@ -#ifndef _TEXT_H_ -#define _TEXT_H_ +#pragma once #include #include #include @@ -61,5 +60,3 @@ private: static TTF_Font* largeFont; static TTF_Font* vLargeFont; }; - -#endif diff --git a/src/libUnuk/Texture.h b/src/libUnuk/Texture.h index 30dcdbe..7af9efe 100644 --- a/src/libUnuk/Texture.h +++ b/src/libUnuk/Texture.h @@ -1,5 +1,4 @@ -#ifndef _TEXTURE_H_ -#define _TEXTURE_H_ +#pragma once #include "../Unuk/Globals.h" #include "ImageLoader.h" #include "ApplySurface.h" @@ -32,5 +31,3 @@ protected: private: SDL_Surface* _texture; }; - -#endif diff --git a/src/libUnuk/TextureManager.h b/src/libUnuk/TextureManager.h index e1261a2..a12a96c 100644 --- a/src/libUnuk/TextureManager.h +++ b/src/libUnuk/TextureManager.h @@ -1,3 +1,5 @@ +#pragma once + /* * The Texture Manager will keep a small "Database" * of the name of the texture that is loaded and the @@ -6,8 +8,6 @@ * or load the tture if it is not. */ -#ifndef _TEXTUREMANAGER_H_ -#define _TEXTUREMANAGER_H_ #include #include #include @@ -37,5 +37,3 @@ private: int _allocated; }; - -#endif diff --git a/src/libUnuk/Timer.h b/src/libUnuk/Timer.h index 5d3eabe..d0d51b1 100644 --- a/src/libUnuk/Timer.h +++ b/src/libUnuk/Timer.h @@ -1,5 +1,4 @@ -#ifndef _TIMER_H_ -#define _TIMER_H_ +#pragma once #include #include #include @@ -30,5 +29,3 @@ private: int _startTicks; int _pausedTicks; }; - -#endif diff --git a/src/libUnuk/WorldManager.cpp b/src/libUnuk/WorldManager.cpp index 9f7c8d8..af23a6b 100644 --- a/src/libUnuk/WorldManager.cpp +++ b/src/libUnuk/WorldManager.cpp @@ -52,4 +52,3 @@ NPC* WorldManager::GetNPC(int index) { } return NULL; } - diff --git a/src/libUnuk/WorldManager.h b/src/libUnuk/WorldManager.h index d76368c..466571c 100644 --- a/src/libUnuk/WorldManager.h +++ b/src/libUnuk/WorldManager.h @@ -18,4 +18,3 @@ public: private: std::list _npcs; }; -