htf fix for no-flag maps

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2497 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-07 13:35:59 +00:00
parent 8191162962
commit 7c4b80ce5d
1 changed files with 2 additions and 1 deletions
@@ -68,6 +68,7 @@ void renderentities()
                }
                break;
            case CTFF_INBASE:
+                if(!numflagspawn[i]) break;
            case CTFF_DROPPED:
            {
                entity &e = *f.flagent;
@@ -201,7 +202,7 @@ void checkitems(playerent *d)
    {
        flaginfo &f = flaginfos[i];
        entity &e = *f.flagent;
-        if(!e.spawned) continue;
+        if(!e.spawned || (f.state == CTFF_INBASE && !numflagspawn[i])) continue;
        if(OUTBORD(e.x, e.y)) continue;
        if(f.state==CTFF_DROPPED) // 3d collision for dropped ctf flags
        {