From c3f003bdeac432f68466b5f8bb09856dbb0176f9 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Wed, 26 Apr 2006 17:15:31 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@262 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/client.cpp       | 3 +--
 source/src/cube.h           | 6 +++---
 source/src/entities.cpp     | 2 +-
 source/src/renderextras.cpp | 2 +-
 source/src/weapon.cpp       | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/source/src/client.cpp b/source/src/client.cpp
index 4ad48b18..5bfc1f9b 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -67,8 +67,7 @@ void newname(char *name) { c2sinit = false; strn0cpy(player1->name, name, 16); }
 void newteam(char *name) 
 { 
     c2sinit = false; 
-    if(m_ctf) ctf_team(name);    
-    else strn0cpy(player1->team, name, 5); 
+    ctf_team(name);    
 };
 
 COMMANDN(team, newteam, ARG_1STR);
diff --git a/source/src/cube.h b/source/src/cube.h
index ed033001..b7633544 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -328,11 +328,11 @@ extern bool demoplayback;
 #define m_ctf         (gamemode==5)
 
 #define TEAM_CLA 0 //
-#define TEAM_RSVF 1 //
+#define TEAM_RVSF 1 //
 // rb means red/blue
 #define rb_team_string(t) ((t) ? "RVSF" : "CLA")
-#define rb_team_int(t) (strcmp((t), "CLA") == 0 ? TEAM_CLA : TEAM_RSVF)
-#define rb_opposite(o) ((o) == TEAM_CLA ? TEAM_RSVF : TEAM_CLA)
+#define rb_team_int(t) (strcmp((t), "CLA") == 0 ? TEAM_CLA : TEAM_RVSF)
+#define rb_opposite(o) ((o) == TEAM_CLA ? TEAM_RVSF : TEAM_CLA)
 
 enum    // function signatures for script functions, see command.cpp
 {
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index 15443f1d..dcb2f387 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -45,7 +45,7 @@ void renderentities()
                 sprintf_sd(path)("pickups/flags/%s", rb_team_string(e.attr2));
                 mapmodelinfo mmi = {10, 4, 0, 0, path};
                 if(!&mmi) continue;
-                rendermodel(mmi.name, 0, 7, 0, (float)mmi.rad, e.x, f.state==CTFF_INBASE ? (float)S(e.x, e.y)->floor : e.z, e.y, (float)((e.attr1+7)-(e.attr1+7)%15), 0, false, 1.0f, 120.0f, mmi.snap);
+                rendermodel(mmi.name, 0, 1, 0, (float)mmi.rad, e.x, f.state==CTFF_INBASE ? (float)S(e.x, e.y)->floor : e.z, e.y, (float)((e.attr1+7)-(e.attr1+7)%15), 0, false, 1.0f, 120.0f, mmi.snap);
             };
         }
         else
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index fedf0640..e0eca82b 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -414,7 +414,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
             glColor4f(1.0f, 1.0f, 1.0f, 0.2f);            
             if(flaginfos[TEAM_CLA].state == CTFF_INBASE) glDisable(GL_BLEND); else glEnable(GL_BLEND);
             drawicon(64*ctf_scl, 0, 1940, 1650, 11, 1.0f/4.0f);    
-            if(flaginfos[TEAM_RSVF].state == CTFF_INBASE) glDisable(GL_BLEND); else glEnable(GL_BLEND);
+            if(flaginfos[TEAM_RVSF].state == CTFF_INBASE) glDisable(GL_BLEND); else glEnable(GL_BLEND);
             drawicon(0, 0, 1820, 1650, 11, 1.0f/4.0f); 
             glDisable(GL_BLEND);
             drawicon(rb_team_int(player1->team)*64*ctf_scl, 64*ctf_scl, VIRTW-128-10, 10, 11, 1.0f/4.0f); // shows which team you are
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index bb2a9658..a11e2ced 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -62,7 +62,7 @@ void reload()
       if(akimbo)
       {
         akimbolastaction[akimboside?1:0] = lastmillis;
-        akimbolastaction[akimboside?0:1] = lastmillis + (reloadtime(GUN_PISTOL)/2);
+        akimbolastaction[akimboside?0:1] = lastmillis;// + (reloadtime(GUN_PISTOL)/2);
       };
 
       player1->gunwait = guns[player1->gunselect].reloadtime;