From 5d5a1e7209eb7fa91d27069dc06bce51399ad419 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Mon, 2 Apr 2007 11:26:00 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@889 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientextras.cpp |  2 +-
 source/src/renderextras.cpp | 45 +++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp
index 1fca5cb2..aebcd947 100644
--- a/source/src/clientextras.cpp
+++ b/source/src/clientextras.cpp
@@ -33,7 +33,7 @@ void renderclient(playerent *d, char *mdlname, char *vwepname, int tex)
     else if(d->state==CS_EDITING)                   { anim = ANIM_JUMP|ANIM_END; }
     else if(d->state==CS_LAGGED)                    { anim = ANIM_SALUTE|ANIM_LOOP; }
     else if(lastmillis-d->lastpain<300)             { anim = ANIM_PAIN; speed = 300.0f/4; varseed += d->lastpain; basetime = d->lastpain; }
-    else if(!d->onfloor && d->timeinair>0)          { anim = ANIM_JUMP|ANIM_END; }
+    else if(!d->onfloor && d->timeinair>50)         { anim = ANIM_JUMP|ANIM_END; }
     else if(d->gunselect==d->lastattackgun && lastmillis-d->lastaction<300)
                                                     { anim = ANIM_ATTACK; speed = 300.0f/8; basetime = d->lastaction; }
     else if(!d->move && !d->strafe)                 { anim = ANIM_IDLE|ANIM_LOOP; }
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index 5ba8ef8d..7c8d9576 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -597,28 +597,29 @@ void addgib(playerent *d)
 void loadingscreen()
 {
     static Texture *logo = NULL;
-    if(!logo) logo = textureload("packages/misc/startscreen.png", false);
-    if(logo)
+    if(!logo) logo = textureload("packages/misc/startscreen.png");
+
+    glEnable(GL_TEXTURE_2D);
+    glDisable(GL_DEPTH_TEST);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    glClearColor(0, 0, 0, 1);
+    glColor3f(1, 1, 1);
+
+    loopi(2)
     {
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-        glEnable(GL_BLEND);
-        glEnable(GL_TEXTURE_2D);
-        glDisable(GL_DEPTH_TEST);
-        glDisable(GL_CULL_FACE);
-        glClearColor(0, 0, 0, 1);
-        loopi(2)
-        {
-            glMatrixMode(GL_PROJECTION);
-            glLoadIdentity();
-            glClear(GL_COLOR_BUFFER_BIT);
-            glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
-            quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
-            SDL_GL_SwapBuffers();
-        }
-        glDisable(GL_BLEND);
-        glDisable(GL_TEXTURE_2D);
-        glEnable(GL_DEPTH_TEST);
-        glEnable(GL_CULL_FACE);
+        glClear(GL_COLOR_BUFFER_BIT);
+        quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
+        SDL_GL_SwapBuffers();
     }
+
+    glDisable(GL_TEXTURE_2D);
+    glEnable(GL_DEPTH_TEST);
 }
+