From a9f159ac1a8241dd8ccbfeff9e5628e14106e6be Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Fri, 13 Nov 2015 17:41:06 -0500 Subject: Re-added active quest listing --- Makefile | 4 +++- src/Makefile | 2 +- src/ui.cpp | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6f6942d..8ecebf8 100644 --- a/Makefile +++ b/Makefile @@ -2,16 +2,18 @@ LIBS = -lGL -lGLEW -lSDL2 -lfreetype -lSDL2_image -lSDL2_mixer WIN_LIBS = -lopengl32 -lglew32 -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype -FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2 +FLAGS = -std=c++11 -Iinclude -Iinclude/freetype2 MFLAGS64 = 64 all: + @echo "Building for 32-bit target" @rm -f out/*.o @cd src; $(MAKE) $(MFLAGS) @echo " CXX main.cpp" @g++ $(FLAGS) -m32 -o main main.cpp out/*.o $(LIBS) -lSDL2main 64: + @echo "Building for 64-bit target" @rm -f out64/*.o @cd src; $(MAKE) $(MFLAGS64) @echo " CXX main.cpp" diff --git a/src/Makefile b/src/Makefile index d7fea67..f40ab90 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ LIBS = -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype -FLAGS = -m32 -std=c++11 -I../include -I../include/freetype2 +FLAGS = -std=c++11 -I../include -I../include/freetype2 OUT = `echo "" $$(ls -c $(wildcard *.cpp)) | sed s/.cpp/.o/g | sed 's/ / ..\/out\//g'` OUT64 = `echo "" $$(ls -c $(wildcard *.cpp)) | sed s/.cpp/.o/g | sed 's/ / ..\/out64\//g'` diff --git a/src/ui.cpp b/src/ui.cpp index 4c503cf..6fff65f 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -467,6 +467,14 @@ namespace ui { ((SCREEN_WIDTH/2+offset.x)-125)+((player->health/player->maxHealth)*100), (offset.y+SCREEN_HEIGHT/2)-32+12); } + /* + * Lists all of the quests the player has + */ + putText(((SCREEN_WIDTH/2)+offset.x)-125,(offset.y+SCREEN_HEIGHT/2)-fontSize*4, "Current Quests:",NULL); + + for(auto &c : player->qh.current){ + putText(((SCREEN_WIDTH/2)+offset.x)-125,(offset.y+SCREEN_HEIGHT/2)-fontSize*5, "%s",c->title); + } } void handleEvents(void){ unsigned char i; -- cgit v1.2.3