*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@914 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-04-04 02:23:00 +00:00
parent 5c9c9fe6c7
commit addcd2f8b0
5 changed files with 40 additions and 41 deletions
+1 -3
View File
@@ -303,8 +303,6 @@ char *CBotManager::GetBotTeam()
return szOutput;
}
extern void renderplayer(playerent *d);
void CBotManager::RenderBots()
{
//static bool drawblue;
@@ -315,7 +313,7 @@ void CBotManager::RenderBots()
{
/*drawblue = (m_sp || isteam(player1->team, bots[i]->team));
renderclient(bots[i], drawblue, "playermodels/counterterrorist", 1.6f);*/
renderplayer(bots[i]);
renderclient(bots[i]);
}
}
}
+1 -35
View File
@@ -56,45 +56,11 @@
#include "geom.h"
#include "world.h"
#include "model.h"
#include "entity.h"
#include "protocol.h"
#include "entity.h"
#include "sound.h"
#include "command.h"
/* Gamemodes
0 tdm
1 coop edit
2 dm
3 survivor
4 team survior
5 ctf
6 pistols
7 bot tdm
8 bot dm
9 last swiss standing
10 one shot, one kill
11 team one shot, one kill
12 bot one shot, one kill
*/
#define m_lms (gamemode==3 || gamemode==4)
#define m_ctf (gamemode==5)
#define m_pistol (gamemode==6)
#define m_lss (gamemode==9)
#define m_osok (gamemode>=10 && gamemode<=12)
#define m_noitems (m_lms || m_osok)
#define m_noitemsnade (m_lss)
#define m_nopistol (m_osok || m_lss)
#define m_noprimary (m_pistol || m_lss)
#define m_noguns (m_nopistol && m_noprimary)
#define m_arena (m_lms || m_lss || m_osok)
#define m_teammode (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11)
#define m_tarena (m_arena && m_teammode)
#define m_botmode (gamemode==7 || gamemode == 8 || gamemode==12)
#define m_valid(mode) ((mode)>=0 && (mode)<=12)
#define m_mp(mode) (m_valid(mode) && (mode)!=7 && (mode)!=8 && (mode)!=12)
typedef vector<char *> cvector;
typedef vector<int> ivector;
+34
View File
@@ -32,3 +32,37 @@ enum { MCMD_KICK = 0, MCMD_BAN, MCMD_REMBANS, MCMD_MASTERMODE, MCMD_AUTOTEAM };
enum { DISC_NONE = 0, DISC_EOP, DISC_CN, DISC_MKICK, DISC_MBAN, DISC_TAGT, DISC_BANREFUSE, DISC_WRONGPW, DISC_MLOGINFAIL, DISC_MAXCLIENTS, DISC_MASTERMODE, DISC_NUM };
/* Gamemodes
0 tdm
1 coop edit
2 dm
3 survivor
4 team survior
5 ctf
6 pistols
7 bot tdm
8 bot dm
9 last swiss standing
10 one shot, one kill
11 team one shot, one kill
12 bot one shot, one kill
*/
#define m_lms (gamemode==3 || gamemode==4)
#define m_ctf (gamemode==5)
#define m_pistol (gamemode==6)
#define m_lss (gamemode==9)
#define m_osok (gamemode>=10 && gamemode<=12)
#define m_noitems (m_lms || m_osok)
#define m_noitemsnade (m_lss)
#define m_nopistol (m_osok || m_lss)
#define m_noprimary (m_pistol || m_lss)
#define m_noguns (m_nopistol && m_noprimary)
#define m_arena (m_lms || m_lss || m_osok)
#define m_teammode (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11)
#define m_tarena (m_arena && m_teammode)
#define m_botmode (gamemode==7 || gamemode == 8 || gamemode==12)
#define m_valid(mode) ((mode)>=0 && (mode)<=12)
#define m_mp(mode) (m_valid(mode) && (mode)!=7 && (mode)!=8 && (mode)!=12)
+1
View File
@@ -249,6 +249,7 @@ extern void preload_playermodels();
extern void preload_hudguns();
extern void preload_mapmodels();
extern void renderclients();
extern void renderclient(playerent *d);
extern void renderclient(playerent *d, char *mdlname, char *vwepname, int tex = 0);
// hudgun
+3 -3
View File
@@ -226,7 +226,7 @@ void renderclient(playerent *d, char *mdlname, char *vwepname, int tex)
extern int democlientnum;
void renderplayer(playerent *d)
void renderclient(playerent *d)
{
if(!d) return;
@@ -241,7 +241,7 @@ void renderplayer(playerent *d)
void renderclients()
{
playerent *d;
loopv(players) if((d = players[i]) && (!demoplayback || i!=democlientnum)) renderplayer(d);
if(player1->state==CS_DEAD) renderplayer(player1);
loopv(players) if((d = players[i]) && (!demoplayback || i!=democlientnum)) renderclient(d);
if(player1->state==CS_DEAD) renderclient(player1);
}