revert bogus and really fix stuck-in-editmode bug

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5741 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-10-10 13:34:58 +00:00
parent 0c0ffc79be
commit af5902b370
3 changed files with 3 additions and 7 deletions
+1 -6
View File
@@ -35,18 +35,13 @@ 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())
{
if(player1->state==CS_EDITING) player1->state = CS_ALIVE; //TESTING: avoid being stuck in editmode
return; // not in most multiplayer modes
}
if(!force && !editmode && !allowedittoggle()) return; // not in most multiplayer modes
if(!(editmode = !editmode))
{
entinmap(player1); // find spawn closest to current floating pos
}
else
{
//player1->health = 100; // illusion only (client-side) and unwanted anyway (bug found by grenadier)
//put call to clear/restart gamemode
player1->attacking = false;
}