git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1910 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-10 12:19:15 +00:00
parent 87c7755754
commit 1f6007d35f
2 changed files with 1 additions and 14 deletions
+1 -1
View File
@@ -215,7 +215,7 @@ void movelocalplayer()
moveplayer(player1, 10, false);
}
}
else if(player1->state!=CS_SPECTATE && !intermission)
else if(!intermission)
{
moveplayer(player1, 20, true);
checkitems(player1);
-13
View File
@@ -406,19 +406,6 @@ struct playerent : dynent, playerstate
void setprimary(int w) { primweap = weapons[(primary = w)]; }
void setnextprimary(int w) { nextprimweap = weapons[(nextprimary = w)]; }
bool isspectating() { return state==CS_SPECTATE || (state==CS_DEAD && spectating); }
/*
static struct playerent *cameraplayer()
{
extern playerent *player1;
extern vector<struct playerent *>players;
if(player1->isspectating())
{
if(player1->spectating==SM_FOLLOW1ST && players.inrange(player1->followplayercn)) return players[player1->followplayercn];
else return NULL;
}
else return player1;
}*/
};