X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=f6d59539af1734216507ad36c6d5b5324ec59411;hb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;hp=83b7ca393c9021e3d749f067cd97fc61802bc369;hpb=25e3d5e35a7fd7efdffc420efe3c41a91cefe43f;p=lugaru.git

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 83b7ca3..f6d5953 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
@@ -42,7 +41,6 @@ extern Light light;
 extern Objects objects;
 extern int detail;
 extern float usermousesensitivity;
-extern bool osx;
 extern float camerashake;
 extern int slomo;
 extern float slomodelay;
@@ -137,8 +135,7 @@ int Game::DrawGLScene(StereoSide side)
 {
     static float texcoordwidth, texcoordheight;
     static float texviewwidth, texviewheight;
-    static int i, j, k, l;
-    static GLubyte color;
+    static int l;
     static XYZ checkpoint;
     static float tempmult;
     float tutorialopac;
@@ -155,6 +152,8 @@ int Game::DrawGLScene(StereoSide side)
         case stereoRight:
             glColorMask( 1.0, 0.0, 0.0, 1.0 );
             break;
+        default:
+            break;
         }
     } else {
         glColorMask( 1.0, 1.0, 1.0, 1.0 );
@@ -174,7 +173,7 @@ int Game::DrawGLScene(StereoSide side)
             numboundaries = mapradius * 2;
             if (numboundaries > 360)
                 numboundaries = 360;
-            for (i = 0; i < numboundaries; i++) {
+            for (int i = 0; i < numboundaries; i++) {
                 boundary[i] = 0;
                 boundary[i].z = 1;
                 boundary[i] = mapcenter + DoRotation(boundary[i] * mapradius, 0, i * (360 / ((float)(numboundaries))), 0);
@@ -188,12 +187,12 @@ int Game::DrawGLScene(StereoSide side)
 
         int olddrawmode = drawmode;
         if (ismotionblur && !loading) {
-            if ((findLengthfast(&player[0].velocity) > 200) && velocityblur && !cameramode) {
+            if ((findLengthfast(&Person::players[0]->velocity) > 200) && velocityblur && !cameramode) {
                 drawmode = motionblurmode;
-                motionbluramount = 200 / (findLengthfast(&player[0].velocity));
+                motionbluramount = 200 / (findLengthfast(&Person::players[0]->velocity));
                 changed = 1;
             }
-            if (player[0].damage - player[0].superpermanentdamage > (player[0].damagetolerance - player[0].superpermanentdamage) * 1 / 2 && damageeffects && !cameramode) {
+            if (Person::players[0]->damage - Person::players[0]->superpermanentdamage > (Person::players[0]->damagetolerance - Person::players[0]->superpermanentdamage) * 1 / 2 && damageeffects && !cameramode) {
                 drawmode = doublevisionmode;
                 changed = 1;
             }
@@ -231,16 +230,6 @@ int Game::DrawGLScene(StereoSide side)
         if (winfreeze || mainmenu)
             drawmode = normalmode;
 
-#if PLATFORM_MACOSX
-        if (drawmode == glowmode) {
-            RGBColor color2;
-            color2.red = 0;
-            color2.green = 0;
-            color2.blue = 0;
-            DSpContext_FadeGamma(NULL, 200, &color2);
-        }
-#endif
-
         if (drawtoggle != 2)
             drawtoggle = 1 - drawtoggle;
 
@@ -263,7 +252,6 @@ int Game::DrawGLScene(StereoSide side)
         glDrawBuffer(GL_BACK);
         glReadBuffer(GL_BACK);
 
-        //glFinish();
         static XYZ terrainlight;
         static float distance;
         if (drawmode == normalmode)
@@ -290,8 +278,8 @@ int Game::DrawGLScene(StereoSide side)
             //shake
             glRotatef(float(Random() % 100) / 10 * camerashake/*+(woozy*woozy)/10*/, 0, 0, 1);
             //sway
-            glRotatef(pitch + sin(woozy / 2) * (player[0].damage / player[0].damagetolerance) * 5, 1, 0, 0);
-            glRotatef(yaw + sin(woozy) * (player[0].damage / player[0].damagetolerance) * 5, 0, 1, 0);
+            glRotatef(pitch + sin(woozy / 2) * (Person::players[0]->damage / Person::players[0]->damagetolerance) * 5, 1, 0, 0);
+            glRotatef(yaw + sin(woozy) * (Person::players[0]->damage / Person::players[0]->damagetolerance) * 5, 0, 1, 0);
         }
         if (cameramode || freeze || winfreeze) {
             glRotatef(pitch, 1, 0, 0);
@@ -331,22 +319,22 @@ int Game::DrawGLScene(StereoSide side)
         static XYZ point;
         static float size, opacity, rotation;
         rotation = 0;
-        for (k = 0; k < numplayers; k++) {
-            if (!player[k].skeleton.free && player[k].playerdetail && player[k].howactive < typesleeping)
-                if (frustum.SphereInFrustum(player[k].coords.x, player[k].coords.y + player[k].scale * 3, player[k].coords.z, player[k].scale * 7) && player[k].occluded < 25)
-                    for (i = 0; i < player[k].skeleton.num_joints; i++) {
-                        if (player[k].skeleton.joints[i].label == leftknee || player[k].skeleton.joints[i].label == rightknee || player[k].skeleton.joints[i].label == groin) {
-                            point = DoRotation(player[k].skeleton.joints[i].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords;
+        for (unsigned k = 0; k < Person::players.size(); k++) {
+            if (!Person::players[k]->skeleton.free && Person::players[k]->playerdetail && Person::players[k]->howactive < typesleeping)
+                if (frustum.SphereInFrustum(Person::players[k]->coords.x, Person::players[k]->coords.y + Person::players[k]->scale * 3, Person::players[k]->coords.z, Person::players[k]->scale * 7) && Person::players[k]->occluded < 25)
+                    for (int i = 0; i < Person::players[k]->skeleton.num_joints; i++) {
+                        if (Person::players[k]->skeleton.joints[i].label == leftknee || Person::players[k]->skeleton.joints[i].label == rightknee || Person::players[k]->skeleton.joints[i].label == groin) {
+                            point = DoRotation(Person::players[k]->skeleton.joints[i].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                             size = .4f;
-                            opacity = .4 - player[k].skeleton.joints[i].position.y * player[k].scale / 5 - (player[k].coords.y - terrain.getHeight(player[k].coords.x, player[k].coords.z)) / 10;
+                            opacity = .4 - Person::players[k]->skeleton.joints[i].position.y * Person::players[k]->scale / 5 - (Person::players[k]->coords.y - terrain.getHeight(Person::players[k]->coords.x, Person::players[k]->coords.z)) / 10;
                             if (k != 0 && tutoriallevel == 1) {
-                                opacity = .2 + .2 * sin(smoketex * 6 + i) - player[k].skeleton.joints[i].position.y * player[k].scale / 5 - (player[k].coords.y - terrain.getHeight(player[k].coords.x, player[k].coords.z)) / 10;
+                                opacity = .2 + .2 * sin(smoketex * 6 + i) - Person::players[k]->skeleton.joints[i].position.y * Person::players[k]->scale / 5 - (Person::players[k]->coords.y - terrain.getHeight(Person::players[k]->coords.x, Person::players[k]->coords.z)) / 10;
                             }
                             terrain.MakeDecal(shadowdecal, point, size, opacity, rotation);
-                            for (l = 0; l < terrain.patchobjectnum[player[k].whichpatchx][player[k].whichpatchz]; l++) {
-                                j = terrain.patchobjects[player[k].whichpatchx][player[k].whichpatchz][l];
-                                if (objects.position[j].y < player[k].coords.y || objects.type[j] == tunneltype || objects.type[j] == weirdtype) {
-                                    point = DoRotation(DoRotation(player[k].skeleton.joints[i].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords - objects.position[j], 0, -objects.yaw[j], 0);
+                            for (l = 0; l < terrain.patchobjectnum[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz]; l++) {
+                                int j = terrain.patchobjects[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz][l];
+                                if (objects.position[j].y < Person::players[k]->coords.y || objects.type[j] == tunneltype || objects.type[j] == weirdtype) {
+                                    point = DoRotation(DoRotation(Person::players[k]->skeleton.joints[i].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords - objects.position[j], 0, -objects.yaw[j], 0);
                                     size = .4f;
                                     opacity = .4f;
                                     if (k != 0 && tutoriallevel == 1) {
@@ -357,27 +345,27 @@ int Game::DrawGLScene(StereoSide side)
                             }
                         }
                     }
-            if ((player[k].skeleton.free || player[k].howactive >= typesleeping) && player[k].playerdetail)
-                if (frustum.SphereInFrustum(player[k].coords.x, player[k].coords.y, player[k].coords.z, player[k].scale * 5) && player[k].occluded < 25)
-                    for (i = 0; i < player[k].skeleton.num_joints; i++) {
-                        if (player[k].skeleton.joints[i].label == leftknee || player[k].skeleton.joints[i].label == rightknee || player[k].skeleton.joints[i].label == groin || player[k].skeleton.joints[i].label == leftelbow || player[k].skeleton.joints[i].label == rightelbow || player[k].skeleton.joints[i].label == neck) {
-                            if (player[k].skeleton.free)
-                                point = player[k].skeleton.joints[i].position * player[k].scale + player[k].coords;
+            if ((Person::players[k]->skeleton.free || Person::players[k]->howactive >= typesleeping) && Person::players[k]->playerdetail)
+                if (frustum.SphereInFrustum(Person::players[k]->coords.x, Person::players[k]->coords.y, Person::players[k]->coords.z, Person::players[k]->scale * 5) && Person::players[k]->occluded < 25)
+                    for (int i = 0; i < Person::players[k]->skeleton.num_joints; i++) {
+                        if (Person::players[k]->skeleton.joints[i].label == leftknee || Person::players[k]->skeleton.joints[i].label == rightknee || Person::players[k]->skeleton.joints[i].label == groin || Person::players[k]->skeleton.joints[i].label == leftelbow || Person::players[k]->skeleton.joints[i].label == rightelbow || Person::players[k]->skeleton.joints[i].label == neck) {
+                            if (Person::players[k]->skeleton.free)
+                                point = Person::players[k]->skeleton.joints[i].position * Person::players[k]->scale + Person::players[k]->coords;
                             else
-                                point = DoRotation(player[k].skeleton.joints[i].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords;
+                                point = DoRotation(Person::players[k]->skeleton.joints[i].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                             size = .4f;
-                            opacity = .4 - player[k].skeleton.joints[i].position.y * player[k].scale / 5 - (player[k].coords.y - terrain.getHeight(player[k].coords.x, player[k].coords.z)) / 5;
+                            opacity = .4 - Person::players[k]->skeleton.joints[i].position.y * Person::players[k]->scale / 5 - (Person::players[k]->coords.y - terrain.getHeight(Person::players[k]->coords.x, Person::players[k]->coords.z)) / 5;
                             if (k != 0 && tutoriallevel == 1) {
-                                opacity = .2 + .2 * sin(smoketex * 6 + i) - player[k].skeleton.joints[i].position.y * player[k].scale / 5 - (player[k].coords.y - terrain.getHeight(player[k].coords.x, player[k].coords.z)) / 10;
+                                opacity = .2 + .2 * sin(smoketex * 6 + i) - Person::players[k]->skeleton.joints[i].position.y * Person::players[k]->scale / 5 - (Person::players[k]->coords.y - terrain.getHeight(Person::players[k]->coords.x, Person::players[k]->coords.z)) / 10;
                             }
                             terrain.MakeDecal(shadowdecal, point, size, opacity * .7, rotation);
-                            for (l = 0; l < terrain.patchobjectnum[player[k].whichpatchx][player[k].whichpatchz]; l++) {
-                                j = terrain.patchobjects[player[k].whichpatchx][player[k].whichpatchz][l];
-                                if (objects.position[j].y < player[k].coords.y || objects.type[j] == tunneltype || objects.type[j] == weirdtype) {
-                                    if (player[k].skeleton.free)
-                                        point = DoRotation(player[k].skeleton.joints[i].position * player[k].scale + player[k].coords - objects.position[j], 0, -objects.yaw[j], 0);
+                            for (l = 0; l < terrain.patchobjectnum[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz]; l++) {
+                                int j = terrain.patchobjects[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz][l];
+                                if (objects.position[j].y < Person::players[k]->coords.y || objects.type[j] == tunneltype || objects.type[j] == weirdtype) {
+                                    if (Person::players[k]->skeleton.free)
+                                        point = DoRotation(Person::players[k]->skeleton.joints[i].position * Person::players[k]->scale + Person::players[k]->coords - objects.position[j], 0, -objects.yaw[j], 0);
                                     else
-                                        point = DoRotation(DoRotation(player[k].skeleton.joints[i].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords - objects.position[j], 0, -objects.yaw[j], 0);
+                                        point = DoRotation(DoRotation(Person::players[k]->skeleton.joints[i].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords - objects.position[j], 0, -objects.yaw[j], 0);
                                     size = .4f;
                                     opacity = .4f;
                                     if (k != 0 && tutoriallevel == 1) {
@@ -389,15 +377,15 @@ int Game::DrawGLScene(StereoSide side)
                         }
                     }
 
-            if (!player[k].playerdetail)
-                if (frustum.SphereInFrustum(player[k].coords.x, player[k].coords.y, player[k].coords.z, player[k].scale * 5)) {
-                    point = player[k].coords;
+            if (!Person::players[k]->playerdetail)
+                if (frustum.SphereInFrustum(Person::players[k]->coords.x, Person::players[k]->coords.y, Person::players[k]->coords.z, Person::players[k]->scale * 5)) {
+                    point = Person::players[k]->coords;
                     size = .7;
-                    opacity = .4 - (player[k].coords.y - terrain.getHeight(player[k].coords.x, player[k].coords.z)) / 5;
+                    opacity = .4 - (Person::players[k]->coords.y - terrain.getHeight(Person::players[k]->coords.x, Person::players[k]->coords.z)) / 5;
                     terrain.MakeDecal(shadowdecal, point, size, opacity * .7, rotation);
-                    for (l = 0; l < terrain.patchobjectnum[player[k].whichpatchx][player[k].whichpatchz]; l++) {
-                        j = terrain.patchobjects[player[k].whichpatchx][player[k].whichpatchz][l];
-                        point = DoRotation(player[k].coords - objects.position[j], 0, -objects.yaw[j], 0);
+                    for (l = 0; l < terrain.patchobjectnum[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz]; l++) {
+                        int j = terrain.patchobjects[Person::players[k]->whichpatchx][Person::players[k]->whichpatchz][l];
+                        point = DoRotation(Person::players[k]->coords - objects.position[j], 0, -objects.yaw[j], 0);
                         size = .7;
                         opacity = .4f;
                         objects.model[j].MakeDecal(shadowdecal, &point, &size, &opacity, &rotation);
@@ -417,9 +405,6 @@ int Game::DrawGLScene(StereoSide side)
         terrain.draw(0);
         terraintexture2.bind();
         terrain.draw(1);
-        //glBindTexture( GL_TEXTURE_2D, terraintexture3);
-        //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-        //terrain.draw(2);
 
         terrain.drawdecals();
 
@@ -449,38 +434,39 @@ int Game::DrawGLScene(StereoSide side)
             glEnable(GL_CULL_FACE);
             glCullFace(GL_FRONT);
             glDepthMask(1);
-            for (k = 0; k < numplayers; k++) {
+            for (unsigned k = 0; k < Person::players.size(); k++) {
                 if (k == 0 || tutoriallevel != 1) {
                     glEnable(GL_BLEND);
                     glEnable(GL_LIGHTING);
-                    terrainlight = terrain.getLighting(player[k].coords.x, player[k].coords.z);
-                    distance = distsq(&viewer, &player[k].coords);
+                    terrainlight = terrain.getLighting(Person::players[k]->coords.x, Person::players[k]->coords.z);
+                    distance = distsq(&viewer, &Person::players[k]->coords);
                     distance = (viewdistance * viewdistance - (distance - (viewdistance * viewdistance * fadestart)) * (1 / (1 - fadestart))) / viewdistance / viewdistance;
                     glColor4f(terrainlight.x, terrainlight.y, terrainlight.z, distance);
                     if (distance >= 1)
                         glDisable(GL_BLEND);
                     if (distance >= .5) {
-                        checkpoint = DoRotation(player[k].skeleton.joints[abs(Random() % player[k].skeleton.num_joints)].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords;
+                        checkpoint = DoRotation(Person::players[k]->skeleton.joints[abs(Random() % Person::players[k]->skeleton.num_joints)].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                         checkpoint.y += 1;
-                        if (!player[k].occluded == 0)
-                            i = checkcollide(viewer, checkpoint, player[k].lastoccluded);
-                        if (i == -1 || player[k].occluded == 0)
+                        int i = -1;
+                        if (Person::players[k]->occluded != 0)
+                            i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
+                        if (i == -1)
                             i = checkcollide(viewer, checkpoint);
                         if (i != -1) {
-                            player[k].occluded += 1;
-                            player[k].lastoccluded = i;
+                            Person::players[k]->occluded += 1;
+                            Person::players[k]->lastoccluded = i;
                         } else {
-                            player[k].occluded = 0;
+                            Person::players[k]->occluded = 0;
                         }
-                        if (player[k].occluded < 25)
-                            player[k].DrawSkeleton();
+                        if (Person::players[k]->occluded < 25)
+                            Person::players[k]->DrawSkeleton();
                     }
                 }
             }
         }
 
         if (!cameramode && musictype == stream_fighttheme)
-            playerdist = distsqflat(&player[0].coords, &viewer);
+            playerdist = distsqflat(&Person::players[0]->coords, &viewer);
         else
             playerdist = -100;
         glPushMatrix();
@@ -513,31 +499,32 @@ int Game::DrawGLScene(StereoSide side)
         glEnable(GL_CULL_FACE);
         glCullFace(GL_FRONT);
         glDepthMask(1);
-        for (k = 0; k < numplayers; k++) {
+        for (unsigned k = 0; k < Person::players.size(); k++) {
             if (!(k == 0 || tutoriallevel != 1)) {
                 glEnable(GL_BLEND);
                 glEnable(GL_LIGHTING);
-                terrainlight = terrain.getLighting(player[k].coords.x, player[k].coords.z);
-                distance = distsq(&viewer, &player[k].coords);
+                terrainlight = terrain.getLighting(Person::players[k]->coords.x, Person::players[k]->coords.z);
+                distance = distsq(&viewer, &Person::players[k]->coords);
                 distance = (viewdistance * viewdistance - (distance - (viewdistance * viewdistance * fadestart)) * (1 / (1 - fadestart))) / viewdistance / viewdistance;
                 glColor4f(terrainlight.x, terrainlight.y, terrainlight.z, distance);
                 if (distance >= 1)
                     glDisable(GL_BLEND);
                 if (distance >= .5) {
-                    checkpoint = DoRotation(player[k].skeleton.joints[abs(Random() % player[k].skeleton.num_joints)].position, 0, player[k].yaw, 0) * player[k].scale + player[k].coords;
+                    checkpoint = DoRotation(Person::players[k]->skeleton.joints[abs(Random() % Person::players[k]->skeleton.num_joints)].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                     checkpoint.y += 1;
-                    if (!player[k].occluded == 0)
-                        i = checkcollide(viewer, checkpoint, player[k].lastoccluded);
-                    if (i == -1 || player[k].occluded == 0)
+                    int i = -1;
+                    if (Person::players[k]->occluded != 0)
+                        i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
+                    if (i == -1)
                         i = checkcollide(viewer, checkpoint);
                     if (i != -1) {
-                        player[k].occluded += 1;
-                        player[k].lastoccluded = i;
+                        Person::players[k]->occluded += 1;
+                        Person::players[k]->lastoccluded = i;
                     } else {
-                        player[k].occluded = 0;
+                        Person::players[k]->occluded = 0;
                     }
-                    if (player[k].occluded < 25)
-                        player[k].DrawSkeleton();
+                    if (Person::players[k]->occluded < 25)
+                        Person::players[k]->DrawSkeleton();
                 }
             }
         }
@@ -565,11 +552,11 @@ int Game::DrawGLScene(StereoSide side)
             glDisable(GL_COLOR_MATERIAL);
             glColor4f(1, 1, 0, 1);
 
-            for (k = 0; k < numplayers; k++) {
-                if (player[k].numwaypoints > 1) {
+            for (unsigned k = 0; k < Person::players.size(); k++) {
+                if (Person::players[k]->numwaypoints > 1) {
                     glBegin(GL_LINE_LOOP);
-                    for (i = 0; i < player[k].numwaypoints; i++) {
-                        glVertex3f(player[k].waypoints[i].x, player[k].waypoints[i].y + .5, player[k].waypoints[i].z);
+                    for (int i = 0; i < Person::players[k]->numwaypoints; i++) {
+                        glVertex3f(Person::players[k]->waypoints[i].x, Person::players[k]->waypoints[i].y + .5, Person::players[k]->waypoints[i].z);
                     }
                     glEnd();
                 }
@@ -578,9 +565,9 @@ int Game::DrawGLScene(StereoSide side)
 
             if (numpathpoints > 1) {
                 glColor4f(0, 1, 0, 1);
-                for (k = 0; k < numpathpoints; k++) {
+                for (unsigned k = 0; int(k) < numpathpoints; k++) {
                     if (numpathpointconnect[k]) {
-                        for (i = 0; i < numpathpointconnect[k]; i++) {
+                        for (int i = 0; i < numpathpointconnect[k]; i++) {
                             glBegin(GL_LINE_LOOP);
                             glVertex3f(pathpoint[k].x, pathpoint[k].y + .5, pathpoint[k].z);
                             glVertex3f(pathpoint[pathpointconnect[k][i]].x, pathpoint[pathpointconnect[k][i]].y + .5, pathpoint[pathpointconnect[k][i]].z);
@@ -601,9 +588,6 @@ int Game::DrawGLScene(StereoSide side)
         glEnable(GL_TEXTURE_2D);
         glColor4f(.5, .5, .5, 1);
         if (!console) {
-            sprintf (string, " ", (int)(fps));
-            text->glPrint(10, 30, string, 0, .8, screenwidth, screenheight);
-
             if (!tutoriallevel)
                 if (bonus > 0 && bonustime < 1 && !winfreeze && indialogue == -1/*bonustime<4*/) {
                     const char *bonus_name;
@@ -696,7 +680,7 @@ int Game::DrawGLScene(StereoSide side)
                     sprintf (string3, "Be sure to use the movement keys to press against the wall");
                 }
                 if (tutorialstage == 12) {
-                    sprintf (string, "While in the air, you can press crouch to flip.", Input::keyToChar(jumpkey));
+                    sprintf (string, "While in the air, you can press crouch to flip.");
                     sprintf (string2, "Walljumps and flips confuse enemies and give you more control.");
                     sprintf (string3, " ");
                 }
@@ -917,7 +901,7 @@ int Game::DrawGLScene(StereoSide side)
                 text->glPrint(screenwidth / 2 - 7.6 * strlen(string2)*screenwidth / 1024, screenheight / 16 + screenheight * 4 / 5 - 20 * screenwidth / 1024, string2, 1, 1.5 * screenwidth / 1024, screenwidth, screenheight);
                 text->glPrint(screenwidth / 2 - 7.6 * strlen(string3)*screenwidth / 1024, screenheight / 16 + screenheight * 4 / 5 - 40 * screenwidth / 1024, string3, 1, 1.5 * screenwidth / 1024, screenwidth, screenheight);
 
-                sprintf (string, "Press 'tab' to skip to the next item.", Input::keyToChar(jumpkey));
+                sprintf (string, "Press 'tab' to skip to the next item.");
                 sprintf (string2, "Press escape at any time to");
                 sprintf (string3, "pause or exit the tutorial.");
 
@@ -933,14 +917,13 @@ int Game::DrawGLScene(StereoSide side)
             //Hot spots
 
             if (numhotspots && (bonustime >= 1 || bonus <= 0 || bonustime < 0) && !tutoriallevel) {
-                int closest = -1;
                 float closestdist = -1;
                 float distance = 0;
-                closest = currenthotspot;
-                for (i = 0; i < numhotspots; i++) {
-                    distance = distsq(&player[0].coords, &hotspot[i]);
+                int closest = currenthotspot;
+                for (int i = 0; i < numhotspots; i++) {
+                    distance = distsq(&Person::players[0]->coords, &hotspot[i]);
                     if (closestdist == -1 || distance < closestdist) {
-                        if (distsq(&player[0].coords, &hotspot[i]) < hotspotsize[i] && ((hotspottype[i] <= 10 && hotspottype[i] >= 0) || (hotspottype[i] <= 40 && hotspottype[i] >= 20))) {
+                        if (distsq(&Person::players[0]->coords, &hotspot[i]) < hotspotsize[i] && ((hotspottype[i] <= 10 && hotspottype[i] >= 0) || (hotspottype[i] <= 40 && hotspottype[i] >= 20))) {
                             closestdist = distance;
                             closest = i;
                         }
@@ -950,7 +933,7 @@ int Game::DrawGLScene(StereoSide side)
                     currenthotspot = closest;
                 if (currenthotspot != -1) {
                     if (hotspottype[closest] <= 10) {
-                        if (distsq(&player[0].coords, &hotspot[closest]) < hotspotsize[closest])
+                        if (distsq(&Person::players[0]->coords, &hotspot[closest]) < hotspotsize[closest])
                             tutorialstagetime = 0;
                         tutorialmaxtime = 1;
                         tutorialopac = tutorialmaxtime - tutorialstagetime;
@@ -964,7 +947,7 @@ int Game::DrawGLScene(StereoSide side)
                         int lastline = 0;
                         int line = 0;
                         bool done = false;
-                        i = 0;
+                        int i = 0;
                         while (!done) {
                             if (string[i] == '\n' || string[i] > 'z' || string[i] < ' ' || string[i] == '\0') {
                                 glColor4f(0, 0, 0, tutorialopac);
@@ -982,13 +965,13 @@ int Game::DrawGLScene(StereoSide side)
                         }
                     } else if (hotspottype[closest] >= 20 && dialoguegonethrough[hotspottype[closest] - 20] == 0) {
                         whichdialogue = hotspottype[closest] - 20;
-                        for (j = 0; j < numdialogueboxes[whichdialogue]; j++) {
-                            player[participantfocus[whichdialogue][j]].coords = participantlocation[whichdialogue][participantfocus[whichdialogue][j]];
-                            player[participantfocus[whichdialogue][j]].yaw = participantyaw[whichdialogue][participantfocus[whichdialogue][j]];
-                            player[participantfocus[whichdialogue][j]].targetyaw = participantyaw[whichdialogue][participantfocus[whichdialogue][j]];
-                            player[participantfocus[whichdialogue][j]].velocity = 0;
-                            player[participantfocus[whichdialogue][j]].animTarget = player[participantfocus[whichdialogue][j]].getIdle();
-                            player[participantfocus[whichdialogue][j]].frameTarget = 0;
+                        for (int j = 0; j < numdialogueboxes[whichdialogue]; j++) {
+                            Person::players[participantfocus[whichdialogue][j]]->coords = participantlocation[whichdialogue][participantfocus[whichdialogue][j]];
+                            Person::players[participantfocus[whichdialogue][j]]->yaw = participantyaw[whichdialogue][participantfocus[whichdialogue][j]];
+                            Person::players[participantfocus[whichdialogue][j]]->targetyaw = participantyaw[whichdialogue][participantfocus[whichdialogue][j]];
+                            Person::players[participantfocus[whichdialogue][j]]->velocity = 0;
+                            Person::players[participantfocus[whichdialogue][j]]->animTarget = Person::players[participantfocus[whichdialogue][j]]->getIdle();
+                            Person::players[participantfocus[whichdialogue][j]]->frameTarget = 0;
                         }
                         directing = 0;
                         indialogue = 0;
@@ -1015,7 +998,7 @@ int Game::DrawGLScene(StereoSide side)
                             if (dialogueboxsound[whichdialogue][indialogue] == -2) whichsoundplay = firestartsound;
                             if (dialogueboxsound[whichdialogue][indialogue] == -3) whichsoundplay = consolesuccesssound;
                             if (dialogueboxsound[whichdialogue][indialogue] == -4) whichsoundplay = consolefailsound;
-                            emit_sound_at(whichsoundplay, player[participantfocus[whichdialogue][indialogue]].coords);
+                            emit_sound_at(whichsoundplay, Person::players[participantfocus[whichdialogue][indialogue]]->coords);
                         }
                     }
                 }
@@ -1071,11 +1054,11 @@ int Game::DrawGLScene(StereoSide side)
                 char tempname[264];
                 bool goodchar;
                 int tempnum = 0;
-                for (i = 0; i < 264; i++) {
+                for (int i = 0; i < 264; i++) {
                     tempname[i] = '\0';
                 }
 
-                for (i = 0; i < (int)strlen(dialoguename[whichdialogue][indialogue]); i++) {
+                for (int i = 0; i < (int)strlen(dialoguename[whichdialogue][indialogue]); i++) {
                     tempname[tempnum] = dialoguename[whichdialogue][indialogue][i];
                     goodchar = 1;
                     if (dialoguename[whichdialogue][indialogue][i] == '#' || dialoguename[whichdialogue][indialogue][i] == '\0')
@@ -1099,7 +1082,7 @@ int Game::DrawGLScene(StereoSide side)
                 }
 
                 tempnum = 0;
-                for (i = 0; i < (int)strlen(dialoguetext[whichdialogue][indialogue]) + 1; i++) {
+                for (int i = 0; i < (int)strlen(dialoguetext[whichdialogue][indialogue]) + 1; i++) {
                     tempname[tempnum] = dialoguetext[whichdialogue][indialogue][i];
                     if (dialoguetext[whichdialogue][indialogue][i] != '#')
                         tempnum++;
@@ -1110,7 +1093,7 @@ int Game::DrawGLScene(StereoSide side)
                 int lastline = 0;
                 int line = 0;
                 bool done = false;
-                i = 0;
+                int i = 0;
                 while (!done) {
                     if (string[i] == '\n' || string[i] > 'z' || string[i] < ' ' || string[i] == '\0') {
                         if (dialogueboxcolor[whichdialogue][indialogue][0] + dialogueboxcolor[whichdialogue][indialogue][1] + dialogueboxcolor[whichdialogue][indialogue][2] < 1.5) {
@@ -1164,7 +1147,7 @@ int Game::DrawGLScene(StereoSide side)
                     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                     glEnable(GL_BLEND);
                     glColor4f(0.0, 0.4, 0.0, 0.7);
-                    float bar = ((float)player[0].damage) / player[0].damagetolerance;
+                    float bar = ((float)Person::players[0]->damage) / Person::players[0]->damagetolerance;
                     glBegin(GL_QUADS);
                     glVertex3f((bar < 1 ? bar : 1), 0, 0.0f);
                     glVertex3f(1, 0, 0.0f);
@@ -1172,7 +1155,7 @@ int Game::DrawGLScene(StereoSide side)
                     glVertex3f((bar < 1 ? bar : 1), 1, 0.0f);
                     glEnd();
                     glColor4f(0.1, 0.0, 0.0, 1);
-                    bar = ((float)player[0].bloodloss) / player[0].damagetolerance;
+                    bar = ((float)Person::players[0]->bloodloss) / Person::players[0]->damagetolerance;
                     glBegin(GL_QUADS);
                     glVertex3f(0, 0, 0.0f);
                     glVertex3f((bar < 1 ? bar : 1), 0, 0.0f);
@@ -1180,7 +1163,7 @@ int Game::DrawGLScene(StereoSide side)
                     glVertex3f(0, 1, 0.0f);
                     glEnd();
                     glColor4f(0.4, 0.0, 0.0, 0.7);
-                    bar = ((float)player[0].damage) / player[0].damagetolerance;
+                    bar = ((float)Person::players[0]->damage) / Person::players[0]->damagetolerance;
                     glBegin(GL_QUADS);
                     glVertex3f(0, 0, 0.0f);
                     glVertex3f((bar < 1 ? bar : 1), 0, 0.0f);
@@ -1188,7 +1171,7 @@ int Game::DrawGLScene(StereoSide side)
                     glVertex3f(0, 1, 0.0f);
                     glEnd();
                     glColor4f(0.4, 0.0, 0.0, 0.7);
-                    bar = ((float)player[0].permanentdamage) / player[0].damagetolerance;
+                    bar = ((float)Person::players[0]->permanentdamage) / Person::players[0]->damagetolerance;
                     glBegin(GL_QUADS);
                     glVertex3f(0, 0, 0.0f);
                     glVertex3f((bar < 1 ? bar : 1), 0, 0.0f);
@@ -1196,7 +1179,7 @@ int Game::DrawGLScene(StereoSide side)
                     glVertex3f(0, 1, 0.0f);
                     glEnd();
                     glColor4f(0.4, 0.0, 0.0, 0.7);
-                    bar = ((float)player[0].superpermanentdamage) / player[0].damagetolerance;
+                    bar = ((float)Person::players[0]->superpermanentdamage) / Person::players[0]->damagetolerance;
                     glBegin(GL_QUADS);
                     glVertex3f(0, 0, 0.0f);
                     glVertex3f((bar < 1 ? bar : 1), 0, 0.0f);
@@ -1224,7 +1207,7 @@ int Game::DrawGLScene(StereoSide side)
                     glEnable(GL_TEXTURE_2D);
 
                     // writing the numbers :
-                    sprintf (string, "Damages : %d/%d (%d)", (int)(player[0].damage), (int)(player[0].damagetolerance), (int)(player[0].bloodloss));
+                    sprintf (string, "Damages : %d/%d (%d)", (int)(Person::players[0]->damage), (int)(Person::players[0]->damagetolerance), (int)(Person::players[0]->bloodloss));
                     glColor4f(0, 0, 0, 1);
                     text->glPrintOutline(1024 / 40 - 4, 768 / 16 - 4 + 768 * 14 / 16 - 40, string, 1, 1.5 * 1.25, 1024, 768);
                     glColor4f(1, 0, 0, 1);
@@ -1299,9 +1282,9 @@ int Game::DrawGLScene(StereoSide side)
                     }
                     text->glPrint(130, 120, string, 0, .8, 1024, 768);
 
-                    sprintf (string, "Numplayers: %d", numplayers);
+                    sprintf (string, "Numplayers: %lu", Person::players.size());
                     text->glPrint(10, 155, string, 0, .8, 1024, 768);
-                    sprintf (string, "Player %d: numwaypoints: %d", numplayers, player[numplayers - 1].numwaypoints);
+                    sprintf (string, "Player %d: numwaypoints: %d", (int(Person::players.size()) - 1), Person::players.back()->numwaypoints);
                     text->glPrint(10, 140, string, 0, .8, 1024, 768);
                 }
                 sprintf (string, "Difficulty: %d", difficulty);
@@ -1343,7 +1326,7 @@ int Game::DrawGLScene(StereoSide side)
             glDepthMask(1);
         }
 
-        if ((((blackout && damageeffects) || (player[0].bloodloss > 0 && damageeffects && player[0].blooddimamount > 0) || player[0].dead) && !cameramode) || console) {
+        if ((((blackout && damageeffects) || (Person::players[0]->bloodloss > 0 && damageeffects && Person::players[0]->blooddimamount > 0) || Person::players[0]->dead) && !cameramode) || console) {
             glDisable(GL_DEPTH_TEST);
             glDisable(GL_CULL_FACE);
             glDisable(GL_LIGHTING);
@@ -1359,20 +1342,20 @@ int Game::DrawGLScene(StereoSide side)
             glScalef(screenwidth, screenheight, 1);
             glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
             glEnable(GL_BLEND);
-            if (player[0].dead)
+            if (Person::players[0]->dead)
                 blackout += multiplier * 3;
-            if (player[0].dead == 1)
+            if (Person::players[0]->dead == 1)
                 blackout = .4f;
-            if (player[0].dead == 2 && blackout > .6)
+            if (Person::players[0]->dead == 2 && blackout > .6)
                 blackout = .6;
             glColor4f(0, 0, 0, blackout);
-            if (!player[0].dead) {
-                if ((player[0].bloodloss / player[0].damagetolerance * (sin(woozy) / 4 + .5))*.3 < .3) {
-                    glColor4f(0, 0, 0, player[0].blooddimamount * player[0].bloodloss / player[0].damagetolerance * (sin(woozy) / 4 + .5)*.3);
-                    blackout = player[0].blooddimamount * player[0].bloodloss / player[0].damagetolerance * (sin(woozy) / 4 + .5) * .3;
+            if (!Person::players[0]->dead) {
+                if ((Person::players[0]->bloodloss / Person::players[0]->damagetolerance * (sin(woozy) / 4 + .5))*.3 < .3) {
+                    glColor4f(0, 0, 0, Person::players[0]->blooddimamount * Person::players[0]->bloodloss / Person::players[0]->damagetolerance * (sin(woozy) / 4 + .5)*.3);
+                    blackout = Person::players[0]->blooddimamount * Person::players[0]->bloodloss / Person::players[0]->damagetolerance * (sin(woozy) / 4 + .5) * .3;
                 } else {
-                    glColor4f(0, 0, 0, player[0].blooddimamount * .3);
-                    blackout = player[0].blooddimamount * .3;
+                    glColor4f(0, 0, 0, Person::players[0]->blooddimamount * .3);
+                    blackout = Person::players[0]->blooddimamount * .3;
                 }
             }
             if (console)
@@ -1436,22 +1419,12 @@ int Game::DrawGLScene(StereoSide side)
             displaytime[0] = 0;
             glEnable(GL_TEXTURE_2D);
             glColor4f(1, 1, 1, 1);
-            if (chatting) {
-                sprintf (string, " ]");
-                text->glPrint(10, 30 + screenheight - 330, string, 0, 1, screenwidth, screenheight);
-                if (displayblink) {
-                    sprintf (string, "_");
-                    text->glPrint(30 + (float)(displayselected) * 10, 30 + (screenheight - 330), string, 0, 1, screenwidth, screenheight);
-                }
-            }
-            for (i = 0; i < 15; i++)
-                if ((i != 0 || chatting) && displaytime[i] < 4)
-                    for (j = 0; j < displaychars[i]; j++) {
+            for (unsigned i = 1; i < 15; i++)
+                if (displaytime[i] < 4)
+                    for (unsigned j = 0; j < displaytext[i].size(); j++) {
                         glColor4f(1, 1, 1, 4 - displaytime[i]);
-                        if (j < displaychars[i]) {
-                            sprintf (string, "%c", displaytext[i][j]);
-                            text->glPrint(30 + j * 10, 30 + i * 20 + (screenheight - 330), string, 0, 1, screenwidth, screenheight);
-                        }
+                        sprintf (string, "%c", displaytext[i][j]);
+                        text->glPrint(30 + j * 10, 30 + i * 20 + (screenheight - 330), string, 0, 1, screenwidth, screenheight);
                     }
         }
 
@@ -1487,59 +1460,57 @@ int Game::DrawGLScene(StereoSide side)
             float distcheck;
             int numliveplayers = 0;
             center = 0;
-            for (i = 0; i < numplayers; i++) {
-                if (!player[i].dead)
+            for (unsigned i = 0; i < Person::players.size(); i++) {
+                if (!Person::players[i]->dead)
                     numliveplayers++;
             }
 
             int numadd = 0;
 
-            for (i = 0; i < objects.numobjects; i++) {
+            for (int i = 0; i < objects.numobjects; i++) {
                 if (objects.type[i] == treetrunktype || objects.type[i] == boxtype) {
                     center += objects.position[i];
                     numadd++;
                 }
             }
-            for (i = 0; i < numplayers; i++) {
-                if (!player[i].dead)
-                    center += player[i].coords;
+            for (unsigned i = 0; i < Person::players.size(); i++) {
+                if (!Person::players[i]->dead)
+                    center += Person::players[i]->coords;
             }
             center /= numadd + numliveplayers;
 
-            center = player[0].coords;
+            center = Person::players[0]->coords;
 
             float maxdistance = 0;
             float tempdist;
             //~ int whichclosest;
-            for (i = 0; i < objects.numobjects; i++) {
+            for (int i = 0; i < objects.numobjects; i++) {
                 tempdist = distsq(&center, &objects.position[i]);
                 if (tempdist > maxdistance) {
                     //~ whichclosest=i;
                     maxdistance = tempdist;
                 }
             }
-            for (i = 0; i < numplayers; i++) {
-                if (!player[i].dead) {
-                    tempdist = distsq(&center, &player[i].coords);
+            for (unsigned i = 0; i < Person::players.size(); i++) {
+                if (!Person::players[i]->dead) {
+                    tempdist = distsq(&center, &Person::players[i]->coords);
                     if (tempdist > maxdistance) {
                         //~ whichclosest=i;
                         maxdistance = tempdist;
                     }
                 }
             }
-            radius = fast_sqrt(maxdistance);
-
             radius = 110;
 
             glScalef(.25 / radius * 256 * terrain.scale * .4, .25 / radius * 256 * terrain.scale * .4, 1);
             glPushMatrix();
             glScalef(1 / (1 / radius * 256 * terrain.scale * .4), 1 / (1 / radius * 256 * terrain.scale * .4), 1);
             glPopMatrix();
-            glRotatef(player[0].lookyaw * -1 + 180, 0, 0, 1);
+            glRotatef(Person::players[0]->lookyaw * -1 + 180, 0, 0, 1);
             glTranslatef(-(center.x / terrain.scale / 256 * -2 + 1), (center.z / terrain.scale / 256 * -2 + 1), 0);
-            for (i = 0; i < objects.numobjects; i++) {
+            for (int i = 0; i < objects.numobjects; i++) {
                 if (objects.type[i] == treetrunktype) {
-                    distcheck = distsq(&player[0].coords, &objects.position[i]);
+                    distcheck = distsq(&Person::players[0]->coords, &objects.position[i]);
                     if (distcheck < mapviewdist) {
                         Mapcircletexture.bind();
                         glColor4f(0, .3, 0, opac * (1 - distcheck / mapviewdist));
@@ -1561,7 +1532,7 @@ int Game::DrawGLScene(StereoSide side)
                     }
                 }
                 if (objects.type[i] == boxtype) {
-                    distcheck = distsq(&player[0].coords, &objects.position[i]);
+                    distcheck = distsq(&Person::players[0]->coords, &objects.position[i]);
                     if (distcheck < mapviewdist) {
                         Mapboxtexture.bind();
                         glColor4f(.4, .4, .4, opac * (1 - distcheck / mapviewdist));
@@ -1585,7 +1556,7 @@ int Game::DrawGLScene(StereoSide side)
             }
             if (editorenabled) {
                 Mapcircletexture.bind();
-                for (i = 0; i < numboundaries; i++) {
+                for (int i = 0; i < numboundaries; i++) {
                     glColor4f(0, 0, 0, opac / 3);
                     glPushMatrix();
                     glTranslatef(boundary[i].x / terrain.scale / 256 * -2 + 1, boundary[i].z / terrain.scale / 256 * 2 - 1, 0);
@@ -1603,25 +1574,25 @@ int Game::DrawGLScene(StereoSide side)
                     glPopMatrix();
                 }
             }
-            for (i = 0; i < numplayers; i++) {
-                distcheck = distsq(&player[0].coords, &player[i].coords);
+            for (unsigned i = 0; i < Person::players.size(); i++) {
+                distcheck = distsq(&Person::players[0]->coords, &Person::players[i]->coords);
                 if (distcheck < mapviewdist) {
                     glPushMatrix();
                     Maparrowtexture.bind();
                     if (i == 0)
                         glColor4f(1, 1, 1, opac);
-                    else if (player[i].dead == 2 || player[i].howactive > typesleeping)
+                    else if (Person::players[i]->dead == 2 || Person::players[i]->howactive > typesleeping)
                         glColor4f(0, 0, 0, opac * (1 - distcheck / mapviewdist));
-                    else if (player[i].dead)
+                    else if (Person::players[i]->dead)
                         glColor4f(.3, .3, .3, opac * (1 - distcheck / mapviewdist));
-                    else if (player[i].aitype == attacktypecutoff)
+                    else if (Person::players[i]->aitype == attacktypecutoff)
                         glColor4f(1, 0, 0, opac * (1 - distcheck / mapviewdist));
-                    else if (player[i].aitype == passivetype)
+                    else if (Person::players[i]->aitype == passivetype)
                         glColor4f(0, 1, 0, opac * (1 - distcheck / mapviewdist));
                     else
                         glColor4f(1, 1, 0, 1);
-                    glTranslatef(player[i].coords.x / terrain.scale / 256 * -2 + 1, player[i].coords.z / terrain.scale / 256 * 2 - 1, 0);
-                    glRotatef(player[i].yaw + 180, 0, 0, 1);
+                    glTranslatef(Person::players[i]->coords.x / terrain.scale / 256 * -2 + 1, Person::players[i]->coords.z / terrain.scale / 256 * 2 - 1, 0);
+                    glRotatef(Person::players[i]->yaw + 180, 0, 0, 1);
                     glScalef(.005, .005, .005);
                     glBegin(GL_QUADS);
                     glTexCoord2f(0, 0);
@@ -1648,7 +1619,7 @@ int Game::DrawGLScene(StereoSide side)
             glDepthMask(1);
         }
 
-        if (loading && !stealthloading && (!campaign || player[0].dead)) {
+        if (loading && !stealthloading && (!campaign || Person::players[0]->dead)) {
             glDisable(GL_DEPTH_TEST);
             glDisable(GL_CULL_FACE);
             glDisable(GL_LIGHTING);
@@ -1695,7 +1666,6 @@ int Game::DrawGLScene(StereoSide side)
                 text->glPrint(1024 / 2 - 90, 768 / 2, string, 1, 2, 1024, 768);
             }
             loading = 2;
-            //if(ismotionblur)drawmode=motionblurmode;
             drawmode = normalmode;
         }
 
@@ -1755,7 +1725,8 @@ int Game::DrawGLScene(StereoSide side)
 
             char temp[255];
 
-            for (i = 0; i < 255; i++)string[i] = '\0';
+            for (int i = 0; i < 255; i++)
+                string[i] = '\0';
             sprintf (temp, "Time:      %d:", (int)(((int)leveltime - (int)(leveltime) % 60) / 60));
             strcat(string, temp);
             if ((int)(leveltime) % 60 < 10)
@@ -1768,7 +1739,7 @@ int Game::DrawGLScene(StereoSide side)
             int awards[award_count];
             int numawards = award_awards(awards);
 
-            for (i = 0; i < numawards && i < 6; i++)
+            for (int i = 0; i < numawards && i < 6; i++)
                 text->glPrintOutlined(1024 / 30, 768 * 6 / 8 - 90 - 40 * i, award_names[awards[i]], 1, 2, 1024, 768);
         }
 
@@ -1781,7 +1752,6 @@ int Game::DrawGLScene(StereoSide side)
                     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
                     GLfloat subtractColor[4] = { 0.5, 0.5, 0.5, 0.0 };
                     glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, subtractColor);
-                    //glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_SUBTRACT);
                     glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
                     glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_CONSTANT_EXT);
                     glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 2.0f);
@@ -1809,7 +1779,6 @@ int Game::DrawGLScene(StereoSide side)
                     glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, kTextureSize, kTextureSize, 0);
                 }
             }
-            //glFlush();
         }
 
         glClear(GL_DEPTH_BUFFER_BIT);
@@ -1846,7 +1815,6 @@ int Game::DrawGLScene(StereoSide side)
             if (drawmode == motionblurmode) {
                 if (motionbluramount < .2)
                     motionbluramount = .2;
-                //glColor4f(1,1,1,fast_sqrt(multiplier)*2.9*motionbluramount);
                 glColor4f(1, 1, 1, motionbluramount);
                 glPushMatrix();
                 glBegin(GL_QUADS);
@@ -1897,7 +1865,7 @@ int Game::DrawGLScene(StereoSide side)
             }
             if (drawmode == doublevisionmode) {
                 static float crosseyedness;
-                crosseyedness = abs(player[0].damage - player[0].superpermanentdamage - (player[0].damagetolerance - player[0].superpermanentdamage) * 1 / 2) / 30;
+                crosseyedness = abs(Person::players[0]->damage - Person::players[0]->superpermanentdamage - (Person::players[0]->damagetolerance - Person::players[0]->superpermanentdamage) * 1 / 2) / 30;
                 if (crosseyedness > 1)
                     crosseyedness = 1;
                 if (crosseyedness < 0)
@@ -1994,8 +1962,7 @@ int Game::DrawGLScene(StereoSide side)
                 glPopMatrix();
             }
             if (drawmode == radialzoommode) {
-                for (i = 0; i < 3; i++) {
-                    //glRotatef((float)i*.1,0,0,1);
+                for (int i = 0; i < 3; i++) {
                     glColor4f(1, 1, 1, 1 / ((float)i + 1));
                     glPushMatrix();
                     glScalef(1 + (float)i * .01, 1 + (float)i * .01, 1);
@@ -2035,13 +2002,11 @@ int Game::DrawGLScene(StereoSide side)
                 sprintf (string, "_");
                 text->glPrint(30 + (float)(consoleselected) * 10 - offset * 10, 30, string, 0, 1, 1024, 768);
             }
-            for (i = 0; i < 15; i++)
-                for (j = 0; j < consolechars[i]; j++) {
+            for (unsigned i = 0; i < 15; i++)
+                for (unsigned j = 0; j < consoletext[i].size(); j++) {
                     glColor4f(1, 1, 1, 1 - (float)(i) / 16);
-                    if (j < consolechars[i]) {
-                        sprintf (string, "%c", consoletext[i][j]);
-                        text->glPrint(30 + j * 10 - offset * 10, 30 + i * 20, string, 0, 1, 1024, 768);
-                    }
+                    sprintf (string, "%c", consoletext[i][j]);
+                    text->glPrint(30 + j * 10 - offset * 10, 30 + i * 20, string, 0, 1, 1024, 768);
                 }
         }
     }
@@ -2059,17 +2024,14 @@ int Game::DrawGLScene(StereoSide side)
         multiplier = 0;
     }
 
-    //glFlush();
     if ( side == stereoRight || side == stereoCenter ) {
         if (drawmode != motionblurmode || mainmenu) {
             swap_gl_buffers();
         }
     }
 
-    //myassert(glGetError() == GL_NO_ERROR);
     glDrawBuffer(GL_BACK);
     glReadBuffer(GL_BACK);
-    //glFlush();
 
     weapons.DoStuff();
 
@@ -2191,7 +2153,6 @@ void DrawMenu()
         glColor4f(1, 1, 1, 1);
         Game::cursortexture.bind();
         glPushMatrix();
-        //glScalef(.25,.25,.25);
         glBegin(GL_QUADS);
         glTexCoord2f(0, 0);
         glVertex3f(-1, -1, 0.0f);