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

Merge branch 'master' of https://github.com/Allanis/Unuk

Browse Source
This commit is contained in:
Tamir Atias 2012-01-14 06:45:39 +02:00
commit 4ee9354769
25 changed files with 104 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bin/Makefile
View File

@ -12,11 +12,11 @@ all:
$(MAKE) -C ../src/libUnuk/Map $(MAKE) -C ../src/libUnuk/Map
$(MAKE) -C ../src/libUnuk/Sprite $(MAKE) -C ../src/libUnuk/Sprite
$(MAKE) -C ../src/libUnuk/System $(MAKE) -C ../src/libUnuk/System
$(MAKE) -C ../src/libUnuk/Ui $(MAKE) -C ../src/libUnuk/UI
$(MAKE) -C ../src/Unuk $(MAKE) -C ../src/Unuk
$(CC) $(CFLAGS) -o Unuk ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ../src/libUnuk/Map/*.o \ $(CC) $(CFLAGS) -o Unuk ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ../src/libUnuk/Map/*.o \
../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/Ui/*.o \ ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/UI/*.o \
../src/Unuk/*.o $(LDADD) ../src/Unuk/*.o $(LDADD)
static: static:
@ -26,11 +26,11 @@ static:
$(MAKE) -C ../src/libUnuk/Map $(MAKE) -C ../src/libUnuk/Map
$(MAKE) -C ../src/libUnuk/Sprite $(MAKE) -C ../src/libUnuk/Sprite
$(MAKE) -C ../src/libUnuk/System $(MAKE) -C ../src/libUnuk/System
$(MAKE) -C ../src/libUnuk/Ui $(MAKE) -C ../src/libUnuk/UI
$(MAKE) -C ../src/Unuk $(MAKE) -C ../src/Unuk
$(CC) $(CFLAGS) -o build/Unuk-static ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ..src/libUnuk/Map/*.o \ $(CC) $(CFLAGS) -o build/Unuk-static ../src/Unuk/main.cpp ../src/libUnuk/Engine/*.o ..src/libUnuk/Map/*.o \
../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/Ui/*.o \ ../src/libUnuk/Sprite/*.o ../src/libUnuk/System/*.o ../src/libUnuk/UI/*.o \
../src/Unuk/*.o $(LDADDSTATIC) ../src/Unuk/*.o $(LDADDSTATIC)
clean: clean:
@ -38,7 +38,7 @@ clean:
$(MAKE) -C ../src/libUnuk/Map clean $(MAKE) -C ../src/libUnuk/Map clean
$(MAKE) -C ../src/libUnuk/Sprite clean $(MAKE) -C ../src/libUnuk/Sprite clean
$(MAKE) -C ../src/libUnuk/System clean $(MAKE) -C ../src/libUnuk/System clean
$(MAKE) -C ../src/libUnuk/Ui clean $(MAKE) -C ../src/libUnuk/UI clean
$(MAKE) -C ../src/Unuk clean $(MAKE) -C ../src/Unuk clean
rm -f Unuk Debug.log ../Data/Debug.log ../Unuk-QT/Unuk-QT rm -f Unuk Debug.log ../Data/Debug.log ../Unuk-QT/Unuk-QT

162
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: Sat Jan 14 02:35:09 2012 # Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 03:32:22 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
@ -62,13 +62,13 @@ SOURCES = ../src/libUnuk/Engine/WorldManager.cpp \
../src/libUnuk/System/Input.cpp \ ../src/libUnuk/System/Input.cpp \
../src/libUnuk/System/FPS.cpp \ ../src/libUnuk/System/FPS.cpp \
../src/libUnuk/System/Debug.cpp \ ../src/libUnuk/System/Debug.cpp \
../src/libUnuk/Ui/Text.cpp \ ../src/libUnuk/UI/Text.cpp \
../src/libUnuk/Ui/MainMenu.cpp \ ../src/libUnuk/UI/MainMenu.cpp \
../src/libUnuk/Ui/IngameMenu.cpp \ ../src/libUnuk/UI/IngameMenu.cpp \
../src/libUnuk/Ui/Font.cpp \ ../src/libUnuk/UI/Font.cpp \
../src/libUnuk/Ui/ButtonToggle.cpp \ ../src/libUnuk/UI/ButtonToggle.cpp \
../src/libUnuk/Ui/ButtonGroup.cpp \ ../src/libUnuk/UI/ButtonGroup.cpp \
../src/libUnuk/Ui/Button.cpp \ ../src/libUnuk/UI/Button.cpp \
../src/Unuk/Player.cpp \ ../src/Unuk/Player.cpp \
../src/Unuk/main.cpp \ ../src/Unuk/main.cpp \
../src/Unuk/Globals.cpp \ ../src/Unuk/Globals.cpp \
@ -202,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/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Map/MapTile.h ../src/libUnuk/Map/MapEntities.h ../src/libUnuk/Map/MapElement.h ../src/libUnuk/Map/Map.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/Ui/MainMenu.h ../src/libUnuk/Ui/IngameMenu.h ../src/libUnuk/Ui/Font.h ../src/libUnuk/Ui/ButtonToggle.h ../src/libUnuk/Ui/ButtonGroup.h ../src/libUnuk/Ui/Button.h ../src/libUnuk/Ui/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/Ui/Text.cpp ../src/libUnuk/Ui/MainMenu.cpp ../src/libUnuk/Ui/IngameMenu.cpp ../src/libUnuk/Ui/Font.cpp ../src/libUnuk/Ui/ButtonToggle.cpp ../src/libUnuk/Ui/ButtonGroup.cpp ../src/libUnuk/Ui/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.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/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Map/MapTile.h ../src/libUnuk/Map/MapEntities.h ../src/libUnuk/Map/MapElement.h ../src/libUnuk/Map/Map.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.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
@ -261,8 +261,6 @@ WorldManager.o: ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/Wor
../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/TextureManager.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp
@ -291,8 +289,6 @@ NPC.o: ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/NPC.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp
@ -319,9 +315,7 @@ Character.o: ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/Character
../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/TextureManager.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp
AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \ AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \
@ -362,8 +356,6 @@ Map.o: ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Map/Map.h \
../src/libUnuk/Engine/MemManager.h \ ../src/libUnuk/Engine/MemManager.h \
../src/libUnuk/Engine/Collision.h \ ../src/libUnuk/Engine/Collision.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map/Map.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map/Map.cpp
@ -411,90 +403,68 @@ FPS.o: ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/FPS.h \
Debug.o: ../src/libUnuk/System/Debug.cpp ../src/libUnuk/System/Debug.h Debug.o: ../src/libUnuk/System/Debug.cpp ../src/libUnuk/System/Debug.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Debug.o ../src/libUnuk/System/Debug.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Debug.o ../src/libUnuk/System/Debug.cpp
Text.o: ../src/libUnuk/Ui/Text.cpp ../src/libUnuk/Ui/Text.h \ Text.o: ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/Text.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/libUnuk/Sprite/ApplySurface.h \ ../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \ ../src/libUnuk/System/Debug.h
../src/libUnuk/Ui/Font.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Text.o ../src/libUnuk/UI/Text.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Text.o ../src/libUnuk/Ui/Text.cpp
MainMenu.o: ../src/libUnuk/Ui/MainMenu.cpp ../src/libUnuk/Ui/MainMenu.h \ MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \
../src/Unuk/Constants.h \ ../src/Unuk/Constants.h \
../src/libUnuk/System/FPS.h \ ../src/libUnuk/System/FPS.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/MemClass.h \
../src/libUnuk/Engine/MemManager.h \
../src/libUnuk/Map/Map.h \ ../src/libUnuk/Map/Map.h \
../src/libUnuk/Sprite/ImageLoader.h \ ../src/libUnuk/Sprite/ImageLoader.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/Map/MapTile.h \ ../src/libUnuk/Map/MapTile.h \
../src/libUnuk/Map/MapElement.h \ ../src/libUnuk/Map/MapElement.h \
../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/TextureManager.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/WorldManager.h \
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/Ui/MainMenu.cpp ../src/libUnuk/System/Rect.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/UI/MainMenu.cpp
IngameMenu.o: ../src/libUnuk/Ui/IngameMenu.cpp ../src/libUnuk/Ui/IngameMenu.h \ IngameMenu.o: ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/IngameMenu.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/Unuk/Constants.h \ ../src/Unuk/Constants.h \
../src/libUnuk/Ui/ButtonGroup.h \ ../src/libUnuk/UI/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/MemClass.h \ ../src/libUnuk/Engine/MemClass.h \
../src/libUnuk/Engine/MemManager.h \ ../src/libUnuk/Engine/MemManager.h \
../src/libUnuk/Ui/ButtonToggle.h ../src/libUnuk/UI/ButtonToggle.h \
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/Ui/IngameMenu.cpp ../src/libUnuk/UI/Button.h \
Font.o: ../src/libUnuk/Ui/Font.cpp ../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Debug.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Font.o ../src/libUnuk/Ui/Font.cpp
ButtonToggle.o: ../src/libUnuk/Ui/ButtonToggle.cpp ../src/libUnuk/Ui/ButtonToggle.h \
../src/libUnuk/Ui/Button.h \
../src/Unuk/Globals.h \
../src/libUnuk/System/Input.h \ ../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Rect.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonToggle.o ../src/libUnuk/Ui/ButtonToggle.cpp
ButtonGroup.o: ../src/libUnuk/Ui/ButtonGroup.cpp ../src/libUnuk/Ui/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \
../src/Unuk/Globals.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Rect.h \ ../src/libUnuk/System/Rect.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/UI/IngameMenu.cpp
Font.o: ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/Font.h \
../src/libUnuk/System/Debug.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Font.o ../src/libUnuk/UI/Font.cpp
ButtonToggle.o: ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonToggle.h \
../src/libUnuk/UI/Button.h \
../src/Unuk/Globals.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonToggle.o ../src/libUnuk/UI/ButtonToggle.cpp
ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h \
../src/libUnuk/Engine/MemClass.h \ ../src/libUnuk/Engine/MemClass.h \
../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemManager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/Ui/ButtonGroup.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/UI/ButtonGroup.cpp
Button.o: ../src/libUnuk/Ui/Button.cpp ../src/libUnuk/Ui/Button.h \ Button.o: ../src/libUnuk/UI/Button.cpp ../src/libUnuk/UI/Button.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/libUnuk/System/Input.h \ ../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \ ../src/libUnuk/System/Rect.h \
../src/libUnuk/Sprite/ApplySurface.h \ ../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \ ../src/libUnuk/System/Debug.h
../src/libUnuk/Ui/Font.h \ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Button.o ../src/libUnuk/UI/Button.cpp
../src/libUnuk/System/Rect.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Button.o ../src/libUnuk/Ui/Button.cpp
Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
@ -512,42 +482,30 @@ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/TextureManager.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp
main.o: ../src/Unuk/main.cpp ../src/libUnuk/Ui/MainMenu.h \ main.o: ../src/Unuk/main.cpp ../src/libUnuk/Engine/NPC.h \
../src/Unuk/Constants.h \ ../src/libUnuk/Engine/Character.h \
../src/libUnuk/System/FPS.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/libUnuk/System/Timer.h \ ../src/Unuk/Constants.h \
../src/libUnuk/Ui/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/MemClass.h \ ../src/libUnuk/Engine/MemClass.h \
../src/libUnuk/Engine/MemManager.h \ ../src/libUnuk/Engine/MemManager.h \
../src/libUnuk/Map/Map.h \ ../src/libUnuk/Sprite/ApplySurface.h \
../src/libUnuk/System/Debug.h \
../src/libUnuk/Sprite/ImageLoader.h \ ../src/libUnuk/Sprite/ImageLoader.h \
../src/libUnuk/Engine/Collision.h \
../src/libUnuk/Map/Map.h \
../src/libUnuk/Map/MapTile.h \ ../src/libUnuk/Map/MapTile.h \
../src/libUnuk/Map/MapElement.h \ ../src/libUnuk/Map/MapElement.h \
../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/TextureManager.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/Engine/NPC.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Engine/Character.h \
../src/libUnuk/Engine/Collision.h \
../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h \ ../src/libUnuk/Engine/AStarBase.h \
../src/Unuk/Game.h \ ../src/Unuk/Game.h \
../src/Unuk/Player.h \ ../src/Unuk/Player.h
../src/libUnuk/Ui/IngameMenu.h \
../src/libUnuk/Ui/ButtonToggle.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp
Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h
@ -571,14 +529,6 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \
../src/libUnuk/Map/MapEntities.h \ ../src/libUnuk/Map/MapEntities.h \
../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/Text.h \
../src/libUnuk/Ui/Font.h \
../src/libUnuk/Ui/IngameMenu.h \
../src/libUnuk/Ui/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Ui/ButtonToggle.h \
../src/libUnuk/Engine/NPC.h \ ../src/libUnuk/Engine/NPC.h \
../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStarBase.h

BIN
Unuk-QT/Unuk-QT Executable file
View File

Binary file not shown.

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

@ -29,13 +29,13 @@ HEADERS += ../src/Libs/wglext.h \
../src/libUnuk/System/FPS.h \ ../src/libUnuk/System/FPS.h \
../src/libUnuk/System/Debug.h \ ../src/libUnuk/System/Debug.h \
../src/libUnuk/System/Timer.h \ ../src/libUnuk/System/Timer.h \
../src/libUnuk/Ui/MainMenu.h \ ../src/libUnuk/UI/MainMenu.h \
../src/libUnuk/Ui/IngameMenu.h \ ../src/libUnuk/UI/IngameMenu.h \
../src/libUnuk/Ui/Font.h \ ../src/libUnuk/UI/Font.h \
../src/libUnuk/Ui/ButtonToggle.h \ ../src/libUnuk/UI/ButtonToggle.h \
../src/libUnuk/Ui/ButtonGroup.h \ ../src/libUnuk/UI/ButtonGroup.h \
../src/libUnuk/Ui/Button.h \ ../src/libUnuk/UI/Button.h \
../src/libUnuk/Ui/Text.h \ ../src/libUnuk/UI/Text.h \
../src/Unuk/Globals.h \ ../src/Unuk/Globals.h \
../src/Unuk/Game.h \ ../src/Unuk/Game.h \
../src/Unuk/Constants.h \ ../src/Unuk/Constants.h \
@ -59,13 +59,13 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
../src/libUnuk/System/Input.cpp \ ../src/libUnuk/System/Input.cpp \
../src/libUnuk/System/FPS.cpp \ ../src/libUnuk/System/FPS.cpp \
../src/libUnuk/System/Debug.cpp \ ../src/libUnuk/System/Debug.cpp \
../src/libUnuk/Ui/Text.cpp \ ../src/libUnuk/UI/Text.cpp \
../src/libUnuk/Ui/MainMenu.cpp \ ../src/libUnuk/UI/MainMenu.cpp \
../src/libUnuk/Ui/IngameMenu.cpp \ ../src/libUnuk/UI/IngameMenu.cpp \
../src/libUnuk/Ui/Font.cpp \ ../src/libUnuk/UI/Font.cpp \
../src/libUnuk/Ui/ButtonToggle.cpp \ ../src/libUnuk/UI/ButtonToggle.cpp \
../src/libUnuk/Ui/ButtonGroup.cpp \ ../src/libUnuk/UI/ButtonGroup.cpp \
../src/libUnuk/Ui/Button.cpp \ ../src/libUnuk/UI/Button.cpp \
../src/Unuk/Player.cpp \ ../src/Unuk/Player.cpp \
../src/Unuk/main.cpp \ ../src/Unuk/main.cpp \
../src/Unuk/Globals.cpp \ ../src/Unuk/Globals.cpp \

32
Unuk-QT/Unuk-QT.pro.user
View File

@ -1,24 +1,20 @@
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<qtcreator> <qtcreator>
<data>
<variable>RunConfiguration0-Arguments</variable>
<valuelist type="QVariantList"/>
</data>
<data> <data>
<variable>RunConfiguration0-BaseEnvironmentBase</variable> <variable>RunConfiguration0-BaseEnvironmentBase</variable>
<value type="int">2</value> <value type="int">2</value>
</data> </data>
<data> <data>
<variable>RunConfiguration0-CommandLineArguments</variable> <variable>RunConfiguration0-Executable</variable>
<valuelist type="QVariantList"/> <value type="QString"></value>
</data>
<data>
<variable>RunConfiguration0-ProFile</variable>
<value type="QString">Unuk-QT.pro</value>
</data> </data>
<data> <data>
<variable>RunConfiguration0-RunConfiguration.name</variable> <variable>RunConfiguration0-RunConfiguration.name</variable>
<value type="QString">Unuk-QT</value> <value type="QString">Custom Executable</value>
</data>
<data>
<variable>RunConfiguration0-UseDyldImageSuffix</variable>
<value type="bool">false</value>
</data> </data>
<data> <data>
<variable>RunConfiguration0-UseTerminal</variable> <variable>RunConfiguration0-UseTerminal</variable>
@ -28,21 +24,21 @@
<variable>RunConfiguration0-UserEnvironmentChanges</variable> <variable>RunConfiguration0-UserEnvironmentChanges</variable>
<valuelist type="QVariantList"/> <valuelist type="QVariantList"/>
</data> </data>
<data>
<variable>RunConfiguration0-UserName</variable>
<value type="QString"></value>
</data>
<data> <data>
<variable>RunConfiguration0-UserSetName</variable> <variable>RunConfiguration0-UserSetName</variable>
<value type="bool">false</value> <value type="bool">false</value>
</data> </data>
<data> <data>
<variable>RunConfiguration0-UserSetWorkingDirectory</variable> <variable>RunConfiguration0-WorkingDirectory</variable>
<value type="bool">false</value> <value type="QString">$BUILDDIR</value>
</data>
<data>
<variable>RunConfiguration0-UserWorkingDirectory</variable>
<value type="QString"></value>
</data> </data>
<data> <data>
<variable>RunConfiguration0-type</variable> <variable>RunConfiguration0-type</variable>
<value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> <value type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value>
</data> </data>
<data> <data>
<variable>activeRunConfiguration</variable> <variable>activeRunConfiguration</variable>

0
linecount.sh Normal file → Executable file
View File

12
src/Unuk/Game.cpp
View File

@ -54,17 +54,17 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
_gameRunning = true; _gameRunning = true;
while(_gameRunning) { while(_gameRunning) {
bool stillRunning = true; bool stillRunning = true;
updateTimer.Start(); updateTimer.Start();
while((int)SDL_GetTicks() > nextGameTick) { while((int)SDL_GetTicks() > nextGameTick) {
HandleInput(); HandleInput();
if (!_gameRunning) { if (!_gameRunning) {
stillRunning = false; stillRunning = false;
break; break;
} }
UpdateGame(); UpdateGame();
nextGameTick += SKIP_TICKS; nextGameTick += SKIP_TICKS;
} }
@ -188,7 +188,7 @@ void Game::UpdateGame(void) {
} }
void Game::Render(void) { void Game::Render(void) {
// SDL_FillRect(screen, NULL, 0); // You might want to clear the buffer! --konom // SDL_FillRect(screen, NULL, 0); // You might want to clear the buffer! --konom
if(_ingameMenu.GetStatus() == false) { if(_ingameMenu.GetStatus() == false) {
_map.Render(); _map.Render();
_player->Render(); _player->Render();

4
src/Unuk/Game.h
View File

@ -10,11 +10,11 @@
#include "Constants.h" #include "Constants.h"
#include "Globals.h" #include "Globals.h"
#include "Player.h" #include "Player.h"
#include "../libUnuk/Ui/IngameMenu.h" #include "../libUnuk/UI/IngameMenu.h"
#include "../libUnuk/Map/Map.h" #include "../libUnuk/Map/Map.h"
#include "../libUnuk/System/Timer.h" #include "../libUnuk/System/Timer.h"
#include "../libUnuk/System/Debug.h" #include "../libUnuk/System/Debug.h"
#include "../libUnuk/Ui/Text.h" #include "../libUnuk/UI/Text.h"
#include "../libUnuk/Engine/MemClass.h" #include "../libUnuk/Engine/MemClass.h"
using namespace std; using namespace std;

2
src/Unuk/main.cpp
View File

@ -4,7 +4,7 @@
#include <time.h> #include <time.h>
#include <iostream> #include <iostream>
#include "../libUnuk/Ui/MainMenu.h" #include "../libUnuk/UI/MainMenu.h"
#include "../libUnuk/Engine/NPC.h" #include "../libUnuk/Engine/NPC.h"
#include "../libUnuk/System/Debug.h" #include "../libUnuk/System/Debug.h"
#include "../libUnuk/Engine/MemClass.h" #include "../libUnuk/Engine/MemClass.h"

2
src/libUnuk/Engine/Character.h
View File

@ -11,7 +11,7 @@
#include "../Engine/Collision.h" #include "../Engine/Collision.h"
#include "../Map/Map.h" #include "../Map/Map.h"
#include "../System/Timer.h" #include "../System/Timer.h"
#include "../Ui/Text.h" #include "../UI/Text.h"
#include "../System/Debug.h" #include "../System/Debug.h"
using namespace std; using namespace std;

0
src/libUnuk/Ui/Button.cpp → src/libUnuk/UI/Button.cpp
View File

2
src/libUnuk/Ui/Button.h → src/libUnuk/UI/Button.h
View File

@ -4,7 +4,7 @@
#include "../../Unuk/Globals.h" #include "../../Unuk/Globals.h"
#include "../System/Input.h" #include "../System/Input.h"
#include "../Ui/Text.h" #include "../UI/Text.h"
#include "../System/Rect.h" #include "../System/Rect.h"
class Button { class Button {

0
src/libUnuk/Ui/ButtonGroup.cpp → src/libUnuk/UI/ButtonGroup.cpp
View File

2
src/libUnuk/Ui/ButtonGroup.h → src/libUnuk/UI/ButtonGroup.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <list> #include <list>
#include "../Ui/Button.h" #include "../UI/Button.h"
#include "../Engine/MemClass.h" #include "../Engine/MemClass.h"
class ButtonGroup { class ButtonGroup {

0
src/libUnuk/Ui/ButtonToggle.cpp → src/libUnuk/UI/ButtonToggle.cpp
View File

0
src/libUnuk/Ui/ButtonToggle.h → src/libUnuk/UI/ButtonToggle.h
View File

0
src/libUnuk/Ui/Font.cpp → src/libUnuk/UI/Font.cpp
View File

0
src/libUnuk/Ui/Font.h → src/libUnuk/UI/Font.h
View File

0
src/libUnuk/Ui/IngameMenu.cpp → src/libUnuk/UI/IngameMenu.cpp
View File

0
src/libUnuk/Ui/IngameMenu.h → src/libUnuk/UI/IngameMenu.h
View File

0
src/libUnuk/Ui/MainMenu.cpp → src/libUnuk/UI/MainMenu.cpp
View File

4
src/libUnuk/Ui/MainMenu.h → src/libUnuk/UI/MainMenu.h
View File

@ -2,10 +2,10 @@
#include "../../Unuk/Constants.h" #include "../../Unuk/Constants.h"
#include "../System/FPS.h" #include "../System/FPS.h"
#include "../Ui/ButtonGroup.h" #include "../UI/ButtonGroup.h"
#include "../Map/Map.h" #include "../Map/Map.h"
#include "../System/Rect.h" #include "../System/Rect.h"
#include "../Ui/Text.h" #include "../UI/Text.h"
enum mainMenuNavVal_t { enum mainMenuNavVal_t {
mainMenuNewGame, mainMenuNewGame,

0
src/libUnuk/Ui/Makefile → src/libUnuk/UI/Makefile
View File

0
src/libUnuk/Ui/Text.cpp → src/libUnuk/UI/Text.cpp
View File

2
src/libUnuk/Ui/Text.h → src/libUnuk/UI/Text.h
View File

@ -6,7 +6,7 @@
#include "../../Unuk/Globals.h" #include "../../Unuk/Globals.h"
#include "../Sprite/ApplySurface.h" #include "../Sprite/ApplySurface.h"
#include "../Ui/Font.h" #include "../UI/Font.h"
#include "../System/Debug.h" #include "../System/Debug.h"
using namespace std; using namespace std;