From: Clyne Sullivan <tullivan99@gmail.com>
Date: Fri, 13 Nov 2015 13:49:37 +0000 (-0500)
Subject: major font fixes
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=5b41789c0e129c1e276917ef91ed53a1559cf31b;p=clyne%2Fgamedev.git

major font fixes
---

5b41789c0e129c1e276917ef91ed53a1559cf31b
diff --cc main.cpp
index 24c6e2b,61aa3ae..a9d9a48
--- a/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 a243846,aacef57..972edcb
--- a/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'`