From b9293196a60fcb266df159e5bf1d1ce1f97c7477 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Mon, 24 Oct 2005 17:32:07 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@64 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientextras.cpp | 27 ++++++++++++++++-----------
 source/src/renderextras.cpp |  2 +-
 source/src/rendergl.cpp     |  4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp
index 6f73f844..97835e3b 100644
--- a/source/src/clientextras.cpp
+++ b/source/src/clientextras.cpp
@@ -9,24 +9,30 @@
 int frame[] = { 178, 184, 190, 137, 183, 189, 197, 164, 46, 51, 54, 32, 0,  0, 40, 1,  162, 162, 67, 168 };
 int range[] = { 6,   6,   8,   28,  1,   1,   1,   1,   8,  19, 4,  18, 40, 1, 6,  15, 1,   1,   1,  1   };
 
-void renderclient(dynent *d, bool team, char *mdlname, bool hellpig, float scale)
+void renderclient(dynent *d, bool team, char *mdlname, bool vwep, float scale)
 {
     int n = 3;
     float speed = 100.0f;
     float mz = d->o.z-d->eyeheight+1.55f*scale;
     int basetime = -((int)d&0xFFF);
     if(d->state==CS_DEAD)
-    {
-        /*int r;
-        if(hellpig) { n = 2; r = range[3]; } else { n = (int)d%3; r = range[n]; };
+    {
+        if(vwep) mz = S((int)d->o.x, (int)d->o.y)->floor;
+        int r;
+        n = (int)d%3; r = range[n];
         basetime = d->lastaction;
         int t = lastmillis-d->lastaction;
         if(t<0 || t>20000) return;
         if(t>(r-1)*100) { n += 4; if(t>(r+10)*100) { t -= (r+10)*100; mz -= t*t/10000000000.0f*t; }; };
-        if(mz<-1000) return;*/
+        if(mz<-1000) return;
         //mdl = (((int)d>>6)&1)+1;
         //mz = d->o.z-d->eyeheight+0.2f;
-        //scale = 1.2f;
+        //scale = 1.2f;
+        if(vwep) 
+        {
+            rendermodel(mdlname, 0, 1, 0, 1.5f, d->o.x, mz, d->o.y, -90, 90, team, scale, speed, 0, basetime);
+            return;
+        };
     }
     else if(d->state==CS_EDITING)                   { n = 16; }
     else if(d->state==CS_LAGGED)                    { n = 17; }
@@ -34,8 +40,7 @@ void renderclient(dynent *d, bool team, char *mdlname, bool hellpig, float scale
     else if(d->monsterstate==M_PAIN)                { n = 10; } 
     else if((!d->move && !d->strafe) || !d->moving) { n = 12; } 
     else if(!d->onfloor && d->timeinair>100)        { n = 18; }
-    else                                            { n = 14; speed = 1200/d->maxspeed*scale; if(hellpig) speed = 300/d->maxspeed;  }; 
-    if(hellpig) { n++; scale *= 32; mz -= 1.9f; };
+    else                                            { n = 14; speed = 1200/d->maxspeed*scale; }; 
     rendermodel(mdlname, frame[n], range[n], 0, 1.5f, d->o.x, mz, d->o.y, d->yaw+90, d->pitch/2, team, scale, speed, 0, basetime);
 };
 
@@ -47,7 +52,7 @@ void renderclients()
     loopv(players)
           if((d = players[i]) && (!demoplayback || i!=democlientnum))
           {
-            if (d->state==CS_DEAD) break; //cheap hack fix of 
+            //if (d->state==CS_DEAD) break; //cheap hack fix of 
             
             if (!strcmp(d->team,"CT"))
             {
@@ -58,7 +63,7 @@ void renderclients()
                   renderclient(d, isteam(player1->team, d->team), "playermodels/terrorist", false, 1.4f);
             }
             
-            renderclient(d, isteam(player1->team, d->team), "vwep/subgun", false, 1.4f);
+            renderclient(d, isteam(player1->team, d->team), "vwep/subgun", true, 1.4f);
           };
     if(player1->state==CS_DEAD)
     {
@@ -67,7 +72,7 @@ void renderclients()
         else
             renderclient(player1, true, "playermodels/terrorist", false, 1.4f);
 
-        renderclient(player1, true, "vwep/subgun", false, 1.4f);
+        renderclient(player1, true, "vwep/subgun", true, 1.4f);
     };
 };
 
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index 74e0cbce..c464611b 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -464,7 +464,7 @@ void rendershotlines()
         
         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
         glBegin(GL_LINES);
-            glColor4f(1.0f, 1.0f, 0.7f, 0.25f);
+            glColor4f(1.0f, 1.0f, 0.7f, 0.5f);
             glVertex3f(s->from.x, s->from.z, s->from.y);
             glVertex3f(s->to.x, s->to.z, s->to.y);
         glEnd();
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 7dc818da..99cd342b 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -251,7 +251,7 @@ void transplayer()
         float t = (lastmillis-player1->lastaction)/1000.0f;
         if(t >= 1.6f) t = 1.6f;
         
-        player1->pitch = (float) sin(t)*(-45.0f-player1->oldpitch)+player1->oldpitch;
+        player1->pitch = (float) sin(t)*(-70.0f-player1->oldpitch)+player1->oldpitch;
         glRotated(player1->pitch,-1.0,0.0,0.0);
         glRotated(player1->yaw,0.0,1.0,0.0);
 
@@ -286,7 +286,7 @@ void drawhudmodel(int start, int end, float speed, int base)
 
 void drawhudgun(int w, int h, float aspect, int farplane)
 {
-    if(!hudgun) return;
+    if(!hudgun || player1->state==CS_DEAD) return;
     
     glEnable(GL_CULL_FACE);