added field REGENRESPAWNTIME to set the respan time for regen capture…

… mode
inexorgame-obsolete · Feb 26, 2018 · 00441fc · 00441fc
1 parent 6f3560c
commit 00441fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/inexor/client/gamemode/capture_client.hpp b/inexor/client/gamemode/capture_client.hpp
@@ -38,8 +38,8 @@ struct captureclientmode : clientmode, capturemode_common
 
     int respawnwait(fpsent *d) override
     {
-        if(m_regencapture) return -1;
-        return max(0, RESPAWNSECS-(lastmillis-d->lastpain)/1000);
+        // if(m_regencapture) return -1;
+        return max(0, (m_regencapture ? REGENRESPAWNSECS : RESPAWNSECS)-(lastmillis-d->lastpain)/1000);
     }
 
     int clipconsole(int w, int h) override

diff --git a/inexor/gamemode/capture_common.hpp b/inexor/gamemode/capture_common.hpp
@@ -26,6 +26,7 @@ struct capturemode_common
     static const int MAXAMMO = 5;
     static const int REPAMMODIST = 32;
     static const int RESPAWNSECS = 10;
+    static const int REGENRESPAWNSECS = 0;
     static const int MAXBASES = 100;
 
     struct baseinfo

diff --git a/inexor/server/gamemode/capture_server.hpp b/inexor/server/gamemode/capture_server.hpp
@@ -88,7 +88,7 @@ struct captureservermode : servmode, capturemode_common
 
     bool canspawn(clientinfo *ci, bool connecting) override
     {
-        return m_regencapture || connecting || !ci->state.lastdeath || gamemillis+curtime-ci->state.lastdeath >= RESPAWNSECS*1000;
+        return connecting || !ci->state.lastdeath || gamemillis+curtime-ci->state.lastdeath >= (m_regencapture ? REGENRESPAWNSECS : RESPAWNSECS)*1000;
     }
 
     void moved(clientinfo *ci, const vec &oldpos, bool oldclip, const vec &newpos, bool newclip) override