aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 17:41:06 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 17:41:06 -0500
commita9f159ac1a8241dd8ccbfeff9e5628e14106e6be (patch)
treea215daea9892c9c3f5fa26cb914bbe434cb4a96a /src
parent23cccb0435bad7330eeaf3d8aee39b3023ac26c8 (diff)
Re-added active quest listing
Diffstat (limited to 'src')
-rw-r--r--src/Makefile2
-rw-r--r--src/ui.cpp8
2 files changed, 9 insertions, 1 deletions
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;