From 6e19d0c44dbcc184c8c096b8a5fb6d015f556756 Mon Sep 17 00:00:00 2001 From: Lucas GAUTHERON Date: Thu, 27 Jun 2013 23:19:39 +0000 Subject: [PATCH] use ffa spawns in... ffa gamemodes. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7504 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index bc3cec3f..f0df61a9 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -681,7 +681,8 @@ void findplayerstart(playerent *d, bool mapcenter, int arenaspawn) loopi(r) { - spawncycle = m_ktf && numspawn[2] > 5 ? findentity(PLAYERSTART, spawncycle+1, 100) : findentity(PLAYERSTART, spawncycle+1); + // 2013jun28:lucas: SKB suggested to use FFA spawns only in FFA modes, which seems reasonable. + spawncycle = /*m_ktf && */numspawn[2] > 4 ? findentity(PLAYERSTART, spawncycle+1, 100) : findentity(PLAYERSTART, spawncycle+1); if(spawncycle < 0) continue; float dist = nearestenemy(vec(ents[spawncycle].x, ents[spawncycle].y, ents[spawncycle].z), d->team); if(!e || dist < 0 || (bestdist >= 0 && dist > bestdist)) { e = &ents[spawncycle]; bestdist = dist; }