Re-added active quest listing

diff --git a/Makefile b/Makefile
index 6f6942df260fba6489a594440cb597d553aba0c1..8ecebf8e3828ece551b912c41c4b177eafdcbc79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,18 @@ LIBS = -lGL -lGLEW -lSDL2 -lfreetype -lSDL2_image -lSDL2_mixer
 \r
 WIN_LIBS = -lopengl32 -lglew32 -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype\r
 \r
-FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2\r
+FLAGS = -std=c++11 -Iinclude -Iinclude/freetype2\r
 \r
 MFLAGS64 = 64\r
 all:\r
+       @echo "Building for 32-bit target"\r
        @rm -f out/*.o\r
        @cd src; $(MAKE) $(MFLAGS)\r
        @echo "  CXX  main.cpp"\r
        @g++ $(FLAGS) -m32 -o main main.cpp out/*.o $(LIBS) -lSDL2main\r
 \r
 64:\r
+       @echo "Building for 64-bit target"\r
        @rm -f out64/*.o\r
        @cd src; $(MAKE) $(MFLAGS64)\r
        @echo "  CXX  main.cpp"\r

diff --git a/src/Makefile b/src/Makefile
index d7fea6710c8dd42dcf18002ac61cf48e9512cb0b..f40ab90a71f66e964e39fda497f82619ee95bcce 100644 (file)
--- 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 4c503cfa48bb1f55306fc1286c81dec7a07369c3..6fff65f95102b997827baf0d85b750858bdafa29 100644 (file)
--- 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;