Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Moved from header guards to #pragma once to compensate for Tamirs' lack of style. Joke. :)

Browse Source
This commit is contained in:
Rtch90 2012-01-11 02:43:49 +00:00
parent ee7e8a1409
commit 5db87e7433
37 changed files with 94 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Unuk-QT/Makefile
View File

@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: Unuk-QT # 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 # Project: Unuk-QT.pro
# Template: app # Template: app
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro # 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/FPS.cpp \
../src/libUnuk/MemManager.cpp \ ../src/libUnuk/MemManager.cpp \
../src/libUnuk/AStar.cpp \ ../src/libUnuk/AStar.cpp \
../src/libUnuk/ButtonGroup.cpp ../src/libUnuk/ButtonGroup.cpp \
../src/libUnuk/WorldManager.cpp
OBJECTS = Debug.o \ OBJECTS = Debug.o \
main.o \ main.o \
Input.o \ Input.o \
@ -100,7 +101,8 @@ OBJECTS = Debug.o \
FPS.o \ FPS.o \
MemManager.o \ MemManager.o \
AStar.o \ AStar.o \
ButtonGroup.o ButtonGroup.o \
WorldManager.o
DIST = /usr/share/qt4/mkspecs/common/g++.conf \ DIST = /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \ /usr/share/qt4/mkspecs/common/linux.conf \
@ -200,7 +202,7 @@ qmake: FORCE
dist: dist:
@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 @$(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 clean:compiler_clean
@ -258,16 +260,17 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/MainMenu.h \
../src/libUnuk/Debug.h \ ../src/libUnuk/Debug.h \
../src/libUnuk/Font.h \ ../src/libUnuk/Font.h \
../src/libUnuk/Rect.h \ ../src/libUnuk/Rect.h \
../src/libUnuk/MemClass.h \
../src/libUnuk/MemManager.h \
../src/libUnuk/Map.h \ ../src/libUnuk/Map.h \
../src/libUnuk/ImageLoader.h \ ../src/libUnuk/ImageLoader.h \
../src/libUnuk/MapTile.h \ ../src/libUnuk/MapTile.h \
../src/libUnuk/MapElement.h \ ../src/libUnuk/MapElement.h \
../src/libUnuk/TextureManager.h \ ../src/libUnuk/TextureManager.h \
../src/libUnuk/MapEntities.h \ ../src/libUnuk/MapEntities.h \
../src/libUnuk/WorldManager.h \
../src/libUnuk/NPC.h \ ../src/libUnuk/NPC.h \
../src/libUnuk/Character.h \ ../src/libUnuk/Character.h \
../src/libUnuk/MemClass.h \
../src/libUnuk/MemManager.h \
../src/libUnuk/Collision.h \ ../src/libUnuk/Collision.h \
../src/libUnuk/AStar.h \ ../src/libUnuk/AStar.h \
../src/libUnuk/AStarBase.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/MapTile.h \
../src/libUnuk/MapElement.h \ ../src/libUnuk/MapElement.h \
../src/libUnuk/TextureManager.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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map.cpp
Button.o: ../src/libUnuk/Button.cpp ../src/libUnuk/Button.h \ 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/Debug.h \
../src/libUnuk/Font.h \ ../src/libUnuk/Font.h \
../src/libUnuk/Rect.h \ ../src/libUnuk/Rect.h \
../src/libUnuk/MemClass.h \
../src/libUnuk/MemManager.h \
../src/libUnuk/Map.h \ ../src/libUnuk/Map.h \
../src/libUnuk/ImageLoader.h \ ../src/libUnuk/ImageLoader.h \
../src/libUnuk/MapTile.h \ ../src/libUnuk/MapTile.h \
../src/libUnuk/MapElement.h \ ../src/libUnuk/MapElement.h \
../src/libUnuk/TextureManager.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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/MainMenu.cpp
IngameMenu.o: ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/IngameMenu.h \ 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/Debug.h \
../src/libUnuk/Font.h \ ../src/libUnuk/Font.h \
../src/libUnuk/Rect.h \ ../src/libUnuk/Rect.h \
../src/libUnuk/MemClass.h \
../src/libUnuk/MemManager.h \
../src/libUnuk/ButtonToggle.h ../src/libUnuk/ButtonToggle.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/IngameMenu.cpp $(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/MapElement.h \
../src/libUnuk/TextureManager.h \ ../src/libUnuk/TextureManager.h \
../src/libUnuk/MapEntities.h \ ../src/libUnuk/MapEntities.h \
../src/libUnuk/WorldManager.h \
../src/libUnuk/Timer.h \ ../src/libUnuk/Timer.h \
../src/libUnuk/Text.h \ ../src/libUnuk/Text.h \
../src/libUnuk/Font.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/MapElement.h \
../src/libUnuk/TextureManager.h \ ../src/libUnuk/TextureManager.h \
../src/libUnuk/MapEntities.h \ ../src/libUnuk/MapEntities.h \
../src/libUnuk/WorldManager.h \
../src/libUnuk/Timer.h \ ../src/libUnuk/Timer.h \
../src/libUnuk/Text.h \ ../src/libUnuk/Text.h \
../src/libUnuk/Font.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/MapElement.h \
../src/libUnuk/TextureManager.h \ ../src/libUnuk/TextureManager.h \
../src/libUnuk/MapEntities.h \ ../src/libUnuk/MapEntities.h \
../src/libUnuk/WorldManager.h \
../src/libUnuk/Timer.h \ ../src/libUnuk/Timer.h \
../src/libUnuk/Text.h \ ../src/libUnuk/Text.h \
../src/libUnuk/Font.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/MapElement.h \
../src/libUnuk/TextureManager.h \ ../src/libUnuk/TextureManager.h \
../src/libUnuk/MapEntities.h \ ../src/libUnuk/MapEntities.h \
../src/libUnuk/WorldManager.h \
../src/libUnuk/Timer.h \ ../src/libUnuk/Timer.h \
../src/libUnuk/Text.h \ ../src/libUnuk/Text.h \
../src/libUnuk/Font.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/ApplySurface.h \
../src/libUnuk/Debug.h \ ../src/libUnuk/Debug.h \
../src/libUnuk/Font.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 $(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
install: FORCE install: FORCE

6
Unuk-QT/Unuk-QT.pro
View File

@ -43,7 +43,8 @@ HEADERS += ../src/libUnuk/Debug.h \
../src/libUnuk/Node.h \ ../src/libUnuk/Node.h \
../src/libUnuk/AStarBase.h \ ../src/libUnuk/AStarBase.h \
../src/libUnuk/AStar.h \ ../src/libUnuk/AStar.h \
../src/libUnuk/ButtonGroup.h ../src/libUnuk/ButtonGroup.h \
../src/libUnuk/WorldManager.h
SOURCES += ../src/libUnuk/Debug.cpp \ SOURCES += ../src/libUnuk/Debug.cpp \
../src/Unuk/main.cpp \ ../src/Unuk/main.cpp \
../src/libUnuk/Input.cpp \ ../src/libUnuk/Input.cpp \
@ -72,4 +73,5 @@ SOURCES += ../src/libUnuk/Debug.cpp \
../src/libUnuk/FPS.cpp \ ../src/libUnuk/FPS.cpp \
../src/libUnuk/MemManager.cpp \ ../src/libUnuk/MemManager.cpp \
../src/libUnuk/AStar.cpp \ ../src/libUnuk/AStar.cpp \
../src/libUnuk/ButtonGroup.cpp ../src/libUnuk/ButtonGroup.cpp \
../src/libUnuk/WorldManager.cpp

5
src/Unuk/Constants.h
View File

@ -1,5 +1,4 @@
#ifndef _CONSTANTS_H_ #pragma once
#define _CONSTANTS_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
const int TILE_WIDTH = 64; 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_BLACK = { 0, 0, 0 };
const SDL_Color COLOUR_WHITE = { 255, 255, 255 }; const SDL_Color COLOUR_WHITE = { 255, 255, 255 };
#endif

5
src/Unuk/Game.h
View File

@ -1,5 +1,4 @@
#ifndef _GAME_H_ #pragma once
#define _GAME_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
@ -58,5 +57,3 @@ private:
Player* _player; Player* _player;
}; };
#endif

6
src/Unuk/Globals.h
View File

@ -1,5 +1,4 @@
#ifndef _GLOBALS_H_ #pragma once
#define _GLOBALS_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
extern SDL_Surface* screen; extern SDL_Surface* screen;
@ -11,6 +10,3 @@ extern int levelWidth;
extern int levelHeight; extern int levelHeight;
extern bool debugEnabled; extern bool debugEnabled;
#endif

5
src/Unuk/Player.h
View File

@ -1,5 +1,4 @@
#ifndef _PLAYER_H_ #pragma once
#define _PLAYER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include "Globals.h" #include "Globals.h"
@ -29,5 +28,3 @@ private:
string _name; string _name;
//int _health; //int _health;
}; };
#endif

6
src/libUnuk/AStar.h
View File

@ -1,5 +1,4 @@
#ifndef _ASTAR_H_ #pragma once
#define _ASTAR_H_
#include <vector> #include <vector>
#include <map> #include <map>
#include <queue> #include <queue>
@ -29,6 +28,3 @@ private:
std::vector<AStarBase*> GetSolutionSequence(AStarBase* node); std::vector<AStarBase*> GetSolutionSequence(AStarBase* node);
std::vector<AStarBase*> _solution; std::vector<AStarBase*> _solution;
}; };
#endif

6
src/libUnuk/AStarBase.h
View File

@ -1,5 +1,4 @@
#ifndef _ASTARBASE_H_ #pragma once
#define _ASTARBASE_H_
#include <vector> #include <vector>
class AStarBase { class AStarBase {
@ -25,6 +24,3 @@ public:
long _key; long _key;
}; };
#endif

5
src/libUnuk/ApplySurface.h
View File

@ -1,5 +1,4 @@
#ifndef _APPLYSURFACE_H_ #pragma once
#define _APPLYSURFACE_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <assert.h> #include <assert.h>
#include "Debug.h" #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. // 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); void ApplySurfaceLiteral(int x, int y, SDL_Surface* source, SDL_Surface* destination, SDL_Rect* clip = NULL);
#endif

5
src/libUnuk/Button.h
View File

@ -1,5 +1,4 @@
#ifndef _BUTTON_H_ #pragma once
#define _BUTTON_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <SDL/SDL_ttf.h> #include <SDL/SDL_ttf.h>
@ -61,5 +60,3 @@ private:
bool _mouseOver; bool _mouseOver;
}; };
#endif

1
src/libUnuk/ButtonGroup.cpp
View File

@ -99,4 +99,3 @@ Button* ButtonGroup::GetButton(int index) {
} }
return NULL; return NULL;
} }

6
src/libUnuk/ButtonGroup.h
View File

@ -1,5 +1,4 @@
#ifndef _BUTTONGROUP_H_ #pragma once
#define _BUTTONGROUP_H_
#include <list> #include <list>
#include "Button.h" #include "Button.h"
@ -32,6 +31,3 @@ private:
std::list<Button*> _buttons; std::list<Button*> _buttons;
int _selectedButton; int _selectedButton;
}; };
#endif

6
src/libUnuk/ButtonToggle.h
View File

@ -1,5 +1,4 @@
#ifndef _BUTTONTOGGLE_H_ #pragma once
#define _BUTTONTOGGLE_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <SDL/SDL_ttf.h> #include <SDL/SDL_ttf.h>
@ -35,6 +34,3 @@ private:
Text _onText; Text _onText;
}; };
#endif

5
src/libUnuk/Character.h
View File

@ -1,5 +1,4 @@
#ifndef _CHARACTER_H_ #pragma once
#define _CHARACTER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <SDL/SDL_gfxPrimitives.h> #include <SDL/SDL_gfxPrimitives.h>
#include <list> #include <list>
@ -116,5 +115,3 @@ private:
Timer _speachBubbleTimer; Timer _speachBubbleTimer;
Text _speachBubbleText; Text _speachBubbleText;
}; };
#endif

4
src/libUnuk/Collision.h
View File

@ -1,8 +1,6 @@
#ifndef _COLLISION_H_ #pragma once
#define _COLLISION_H_ #define _COLLISION_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
bool CheckCollisionRect(SDL_Rect a, SDL_Rect b); 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); bool CheckCollisionXY(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
#endif

5
src/libUnuk/Debug.h
View File

@ -1,5 +1,4 @@
#ifndef _DEBUG_H_ #pragma once
#define _DEBUG_H_
#include <fstream> #include <fstream>
#include "string" #include "string"
@ -19,5 +18,3 @@ public:
private: private:
std::ofstream _logFile; std::ofstream _logFile;
}; };
#endif // _DEBUG_H_

5
src/libUnuk/FPS.h
View File

@ -1,5 +1,4 @@
#ifndef _FPS_H_ #pragma once
#define _FPS_H_
#include "../Unuk/Globals.h" #include "../Unuk/Globals.h"
#include "Timer.h" #include "Timer.h"
@ -24,5 +23,3 @@ private:
Timer _frameTimer; Timer _frameTimer;
Timer _fpsCalc; Timer _fpsCalc;
}; };
#endif

5
src/libUnuk/Font.h
View File

@ -1,5 +1,4 @@
#ifndef _FONT_H_ #pragma once
#define _FONT_H_
#include <SDL/SDL_ttf.h> #include <SDL/SDL_ttf.h>
#include <fstream> #include <fstream>
#include <assert.h> #include <assert.h>
@ -7,5 +6,3 @@
using namespace std; using namespace std;
TTF_Font* Font(const char* filename, const int size); TTF_Font* Font(const char* filename, const int size);
#endif

5
src/libUnuk/ImageLoader.h
View File

@ -1,5 +1,4 @@
#ifndef _IMAGELOADER_H_ #pragma once
#define _IMAGELOADER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <SDL/SDL_image.h> #include <SDL/SDL_image.h>
#include "../Unuk/Globals.h" #include "../Unuk/Globals.h"
@ -7,5 +6,3 @@
SDL_Surface* LoadImage(const char* filename); SDL_Surface* LoadImage(const char* filename);
SDL_Surface* LoadImageAlpha(const char* filename); SDL_Surface* LoadImageAlpha(const char* filename);
#endif

5
src/libUnuk/IngameMenu.h
View File

@ -1,5 +1,4 @@
#ifndef _INGAMEMENU_H_ #pragma once
#define _INGAMEMENU_H_
#include "../Unuk/Globals.h" #include "../Unuk/Globals.h"
#include "../Unuk/Constants.h" #include "../Unuk/Constants.h"
@ -31,5 +30,3 @@ private:
ButtonGroup _buttons; ButtonGroup _buttons;
}; };
#endif

5
src/libUnuk/Input.h
View File

@ -1,5 +1,4 @@
#ifndef _INPUT_H_ #pragma once
#define _INPUT_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
typedef struct mouse_s { typedef struct mouse_s {
@ -42,5 +41,3 @@ typedef struct input_s {
bool MouseStillUp(int button); bool MouseStillUp(int button);
void DestroyInput(void); void DestroyInput(void);
#endif

5
src/libUnuk/MainMenu.h
View File

@ -1,5 +1,4 @@
#ifndef _MAINMENU_H_ #pragma once
#define _MAINMENU_H_
#include "../Unuk/Constants.h" #include "../Unuk/Constants.h"
#include "FPS.h" #include "FPS.h"
@ -36,5 +35,3 @@ private:
Text lblNewGame; Text lblNewGame;
ButtonGroup grpNewGame; ButtonGroup grpNewGame;
}; };
#endif

5
src/libUnuk/Map.h
View File

@ -1,5 +1,4 @@
#ifndef _MAP_H_ #pragma once
#define _MAP_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -63,5 +62,3 @@ private:
WorldManager _world; WorldManager _world;
}; };
#endif

5
src/libUnuk/MapElement.h
View File

@ -1,5 +1,4 @@
#ifndef _MAPELEMENT_H_ #pragma once
#define _MAPELEMENT_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <string> #include <string>
@ -35,5 +34,3 @@ protected:
int x; int x;
int y; int y;
}; };
#endif

6
src/libUnuk/MapEntities.h
View File

@ -1,12 +1,10 @@
#pragma once
/* /*
* Version of MapElement, that will check whether the SDL_Surface it * Version of MapElement, that will check whether the SDL_Surface it
* owns is NULL or not and draws. * owns is NULL or not and draws.
* *
*/ */
#ifndef _MAPENTITIES_H_
#define _MAPENTITIES_H_
#include "MapElement.h" #include "MapElement.h"
class MapEntityGeneric : public MapElement { class MapEntityGeneric : public MapElement {
@ -19,5 +17,3 @@ public:
private: private:
}; };
#endif

5
src/libUnuk/MapTile.h
View File

@ -1,5 +1,4 @@
#ifndef _MAPTILE_H_ #pragma once
#define _MAPTILE_H_
#include <list> #include <list>
#include <string> #include <string>
#include <SDL/SDL.h> #include <SDL/SDL.h>
@ -65,5 +64,3 @@ private:
int _mapTransitionX; int _mapTransitionX;
int _mapTransitionY; int _mapTransitionY;
}; };
#endif

5
src/libUnuk/MemClass.h
View File

@ -1,5 +1,4 @@
#ifndef _MEMCLASS_H_ #pragma once
#define _MEMCLASS_H_
#include "MemManager.h" #include "MemManager.h"
extern MemManager gMemManager; extern MemManager gMemManager;
@ -31,5 +30,3 @@ private:
// Complex part. // Complex part.
double c; double c;
}; };
#endif

5
src/libUnuk/MemManager.h
View File

@ -1,5 +1,4 @@
#ifndef _MEMMANAGER_H_ #pragma once
#define _MEMMANAGER_H_
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <string> #include <string>
@ -87,5 +86,3 @@ private:
set<BitMapEntry*> _freeMapEntries; set<BitMapEntry*> _freeMapEntries;
map<void*, ArrayMemoryInfo> _arrayMemoryList; map<void*, ArrayMemoryInfo> _arrayMemoryList;
}; };
#endif

5
src/libUnuk/NPC.h
View File

@ -1,5 +1,4 @@
#ifndef _NPC_H_ #pragma once
#define _NPC_H_
#include "Character.h" #include "Character.h"
#include "AStar.h" #include "AStar.h"
@ -25,5 +24,3 @@ private:
Timer _moveTimer; Timer _moveTimer;
}; };
#endif

5
src/libUnuk/ParticleEmitter.h
View File

@ -1,5 +1,4 @@
#ifndef _PARTICLEEMITTER_H_ #pragma once
#define _PARTICLEEMITTER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <vector> #include <vector>
#include <string> #include <string>
@ -51,5 +50,3 @@ private:
SDL_Surface* _particleTexture; SDL_Surface* _particleTexture;
}; };
#endif

6
src/libUnuk/Rect.h
View File

@ -1,5 +1,4 @@
#ifndef _RECT_H_ #pragma once
#define _RECT_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include "../Unuk/Globals.h" #include "../Unuk/Globals.h"
#include "ApplySurface.h" #include "ApplySurface.h"
@ -34,6 +33,3 @@ protected:
private: private:
SDL_Rect rect; SDL_Rect rect;
}; };
#endif

5
src/libUnuk/Text.h
View File

@ -1,5 +1,4 @@
#ifndef _TEXT_H_ #pragma once
#define _TEXT_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <SDL/SDL_ttf.h> #include <SDL/SDL_ttf.h>
#include <string> #include <string>
@ -61,5 +60,3 @@ private:
static TTF_Font* largeFont; static TTF_Font* largeFont;
static TTF_Font* vLargeFont; static TTF_Font* vLargeFont;
}; };
#endif

5
src/libUnuk/Texture.h
View File

@ -1,5 +1,4 @@
#ifndef _TEXTURE_H_ #pragma once
#define _TEXTURE_H_
#include "../Unuk/Globals.h" #include "../Unuk/Globals.h"
#include "ImageLoader.h" #include "ImageLoader.h"
#include "ApplySurface.h" #include "ApplySurface.h"
@ -32,5 +31,3 @@ protected:
private: private:
SDL_Surface* _texture; SDL_Surface* _texture;
}; };
#endif

6
src/libUnuk/TextureManager.h
View File

@ -1,3 +1,5 @@
#pragma once
/* /*
* The Texture Manager will keep a small "Database" * The Texture Manager will keep a small "Database"
* of the name of the texture that is loaded and the * of the name of the texture that is loaded and the
@ -6,8 +8,6 @@
* or load the tture if it is not. * or load the tture if it is not.
*/ */
#ifndef _TEXTUREMANAGER_H_
#define _TEXTUREMANAGER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <string> #include <string>
#include <assert.h> #include <assert.h>
@ -37,5 +37,3 @@ private:
int _allocated; int _allocated;
}; };
#endif

5
src/libUnuk/Timer.h
View File

@ -1,5 +1,4 @@
#ifndef _TIMER_H_ #pragma once
#define _TIMER_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <string> #include <string>
#include <assert.h> #include <assert.h>
@ -30,5 +29,3 @@ private:
int _startTicks; int _startTicks;
int _pausedTicks; int _pausedTicks;
}; };
#endif

1
src/libUnuk/WorldManager.cpp
View File

@ -52,4 +52,3 @@ NPC* WorldManager::GetNPC(int index) {
} }
return NULL; return NULL;
} }

1
src/libUnuk/WorldManager.h
View File

@ -18,4 +18,3 @@ public:
private: private:
std::list<NPC*> _npcs; std::list<NPC*> _npcs;
}; };