major font fixes

diff --cc Makefile
Simple merge

diff --cc include/world.h
Simple merge

diff --cc main.cpp
index 24c6e2b739deb17a2a16a3436d455a5b493a6971,61aa3aee0a9c40d8a44525306a65258458b53be2..a9d9a48b1d8e56d93880208ac5e8d87e1b117b0d
--- 1/main.cpp
--- 2/main.cpp
+++ b/main.cpp
@@@ -879,9 -879,11 +879,9 @@@ void render()
  
        if(ui::debug){
                
 -              ui::setFontSize(16);
 -              
                ui::putText(offset.x-SCREEN_WIDTH/2,
                                        (offset.y+SCREEN_HEIGHT/2)-ui::fontSize,
-                                       "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n     (y)%+.2f\nTc: %u\nQc: %u\n HA: %+.2f",
+                                       "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n     (y)%+.2f\nTc: %u\nHA: %+.2f",
                                        fps,
                                        player->ground,
                                        SCREEN_WIDTH,                           // Window dimensions
@@@ -890,10 -892,8 +890,9 @@@
                                        player->loc.x,                          // The player's x coordinate
                                        debugY,                                         // The player's y coordinate
                                        tickCount,
-                                       player->qh.current.size(),      // Active quest count
                                        handAngle
                                        );
 +              
                if(ui::posFlag){
                        glBegin(GL_LINES);
                                glColor3ub(255,0,0);

diff --cc src/Makefile
index a243846937aa25fecec9f36a614d74e0dbd303ec,aacef575c2349860915b6724aaef5fba0becdca7..972edcbd8b5ad1c73c66b2b538a8f2e76131a5ad
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -1,6 -1,6 +1,6 @@@
- LIBS = -lGL -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
+ LIBS = -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
  
 -FLAGS = -std=c++11 -I../include -I../include/freetype2
 +FLAGS = -m32 -std=c++11 -I../include -I../include/freetype2
  
  OUT = `echo "" $$(ls -c $(wildcard *.cpp)) | sed s/.cpp/.o/g | sed 's/ / ..\/out\//g'`
  

diff --cc src/entities.cpp
Simple merge

diff --cc src/world.cpp
Simple merge