diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-08-06 21:48:11 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:12 +0000 |
| commit | ebb0b9355c4431f7ad148a8be01b072dd8c6378e (patch) | |
| tree | cb635ad9ef8603673d559ac0d9f13994612e7116 | |
| parent | 786fa4540110bd35471cdd69060b7390ab7dadf1 (diff) | |
* (bug 5001) Fix repeater BP queueing, build them with full BP available (/dev/humancontroller)
- Set the queue time short to encourage builders to wait for the queue rather than replace the repeater (Norfenstein)
| -rw-r--r-- | src/game/g_buildable.c | 7 | ||||
| -rw-r--r-- | src/game/g_main.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 0ff698b2..7a27e806 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -240,7 +240,7 @@ qboolean G_FindPower( gentity_t *self, qboolean searchUnspawned ) } } - if( self->usesBuildPointZone && level.buildPointZones[ ent->buildPointZone ].active ) + if( ent->usesBuildPointZone && level.buildPointZones[ ent->buildPointZone ].active ) buildPoints -= level.buildPointZones[ ent->buildPointZone ].queuedBuildPoints; buildPoints -= BG_Buildable( self->s.modelindex )->buildPoints; @@ -1814,8 +1814,9 @@ void HRepeater_Think( gentity_t *self ) if( !zone->active ) { - // Initialise the BP queue with all BP queued - zone->queuedBuildPoints = zone->totalBuildPoints = g_humanRepeaterBuildPoints.integer; + // Initialise the BP queue with no BP queued + zone->queuedBuildPoints = 0; + zone->totalBuildPoints = g_humanRepeaterBuildPoints.integer; zone->nextQueueTime = level.time; zone->active = qtrue; diff --git a/src/game/g_main.c b/src/game/g_main.c index 5aea9b7a..05035c84 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -1242,11 +1242,10 @@ void G_CalculateBuildPoints( void ) while( zone->queuedBuildPoints > 0 && zone->nextQueueTime < level.time ) { + zone->queuedBuildPoints--; zone->nextQueueTime += G_NextQueueTime( zone->queuedBuildPoints, zone->totalBuildPoints, g_humanRepeaterBuildQueueTime.integer ); - - zone->queuedBuildPoints--; } } else diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 7327fa6e..f81c3562 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -668,7 +668,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define DEFAULT_HUMAN_BUILDPOINTS "100" #define DEFAULT_HUMAN_QUEUE_TIME "8000" #define DEFAULT_HUMAN_REPEATER_BUILDPOINTS "20" -#define DEFAULT_HUMAN_REPEATER_QUEUE_TIME "0" +#define DEFAULT_HUMAN_REPEATER_QUEUE_TIME "2000" #define DEFAULT_HUMAN_REPEATER_MAX_ZONES "500" #define DEFAULT_HUMAN_STAGE2_THRESH "6000" #define DEFAULT_HUMAN_STAGE3_THRESH "12000" |