kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TESTING: avoid being stuck in editmode + minor stuff

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5737 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-10-09 22:59:24 +00:00
parent 7b7d93f845
commit 0a077bbae3
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -1
View File
@@ -574,7 +574,7 @@ void spawnplayer(playerent *d)
{
d->respawn();
d->spawnstate(gamemode);
d->state = d==player1 && editmode ? CS_EDITING : CS_ALIVE;
d->state = CS_ALIVE;//TESTING:avoid being stuck in editmode// (d==player1 && editmode) ? CS_EDITING : CS_ALIVE;
findplayerstart(d);
}
source/src/editing.cpp
+5 -1
View File
@@ -35,7 +35,11 @@ VAR(editing, 1, 0, 0);
void toggleedit(bool force)
{
if(player1->state==CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
if(!force && !editmode && !allowedittoggle()) return; // not in most multiplayer modes
if(!force && !editmode && !allowedittoggle())
{
if(player1->state==CS_EDITING) player1->state = CS_ALIVE; //TESTING: avoid being stuck in editmode
return; // not in most multiplayer modes
}
if(!(editmode = !editmode))
{
entinmap(player1); // find spawn closest to current floating pos
source/src/protos.h
+1 -1
View File
@@ -342,7 +342,7 @@ extern void c2sinfo(playerent *d);
extern void c2skeepalive();
extern void neterr(const char *s);
extern int getclientnum();
extern void changeteam(int team, bool respawn = true);
extern void changeteam(int team, bool respawn = true); // deprecated?
extern void getmap();
extern void newteam(char *name);
extern bool securemapcheck(const char *map, bool msg = true);
source/src/renderhud.cpp
+1 -1
View File
@@ -920,7 +920,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
{
glLoadIdentity();
glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
const char *specttext = "GHOST [free]";//SPECTATING";
const char *specttext = "GHOST";
if(player1->team == TEAM_SPECT) specttext = "GHOST";
else if(player1->team == TEAM_CLA_SPECT) specttext = "[CLA]";
else if(player1->team == TEAM_RVSF_SPECT) specttext = "[RVSF]";