TESTING: avoid being stuck in editmode + minor stuff

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
+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