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 
Conflicts:
	src/Unuk/Game.cpp
This commit is contained in:
Tamir Atias 2012-01-15 17:04:50 +02:00
commit 200dcb15e9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Unuk/Game.cpp
View File

@ -37,8 +37,13 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
_gameRenderTime.SetXY(10, 50); _gameRenderTime.SetXY(10, 50);
_gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK); _gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK);
<<<<<<< HEAD
_gameUpdateTime.SetXY(10, 70); _gameUpdateTime.SetXY(10, 70);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK); _gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
=======
_gameUpdateTime.SetXY(10, 30);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
>>>>>>> 5269706e05ea3558838a6eaa330cd8cc53b3cd58
stringstream playerXYString; stringstream playerXYString;
_playerXY.SetXY(10, 90); _playerXY.SetXY(10, 90);

2
src/libUnuk/LevelGen/Makefile
View File

@ -1,7 +1,7 @@
CC = g++ CC = g++
CFLAGS = -ansi -Wall -g CFLAGS = -ansi -Wall -g
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
objects = Map.o MapElement.o MapEntities.o \ objects = LevelGen.o MapElement.o MapEntities.o \
.PHONY: default all clean .PHONY: default all clean