From 1f6007d35f97690bb530170eade9f07480a9c6a5 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 10 May 2008 12:19:15 +0000 Subject: [PATCH] demo fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1910 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/entity.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index c5066d3e..f8b121d5 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -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); diff --git a/source/src/entity.h b/source/src/entity.h index 0f796331..e0d854f6 100644 --- a/source/src/entity.h +++ b/source/src/entity.h @@ -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 vectorplayers; - if(player1->isspectating()) - { - if(player1->spectating==SM_FOLLOW1ST && players.inrange(player1->followplayercn)) return players[player1->followplayercn]; - else return NULL; - } - else return player1; - }*/ };