From: drumsetmonkey Date: Wed, 13 Apr 2016 11:41:29 +0000 (-0400) Subject: s X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=a3f1f1bff9b58d90a2b60405ca40728cdd836fa6;p=clyne%2Fgamedev.git s --- diff --git a/config/settings.xml.example b/config/settings.xml.example index 1c8fcd9..e82c454 100644 --- a/config/settings.xml.example +++ b/config/settings.xml.example @@ -23,3 +23,5 @@ Available fonts: + + diff --git a/main.cpp b/main.cpp index 4f6bd44..548056c 100644 --- a/main.cpp +++ b/main.cpp @@ -475,7 +475,6 @@ void mainLoop(void){ if(!prevTime){ prevTime=currentTime; } - /* * Update timing values. This is crucial to calling logic and updating the window (basically * the entire game). @@ -704,7 +703,7 @@ void render() { glBegin(GL_LINES); /*glColor3ub(255,0,0); glVertex2i(0,0); - glVertex2i(0,SCREEN_HEIGHT);*/ + glVertexdw2i(0,SCREEN_HEIGHT);*/ /*glColor3ub(255,255,255); glVertex2i(player->loc.x + player->width/2,0);