Queue buildpoints in main zone and unpowered buildables

2 files changed, 13 insertions, 4 deletions

diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index dd81c992..40654f00 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2520,7 +2520,6 @@ void G_QueueBuildPoints( gentity_t *self )
 	  {
         switch( powerEntity->s.modelindex )
 	    {
-          default:
           case BA_H_REACTOR:
             if( !level.humanBuildPointQueue )
               level.humanNextQueueTime = level.time + g_humanBuildQueueTime.integer;
@@ -2540,9 +2539,19 @@ void G_QueueBuildPoints( gentity_t *self )
                 BG_Buildable( self->s.modelindex )->buildPoints;
             }
             break;
+
+          default:
+            break;
         }
       }
-      break;
+      else
+      {
+        if( !level.humanBuildPointQueue )
+          level.humanNextQueueTime = level.time + g_humanBuildQueueTime.integer;
+
+        level.humanBuildPointQueue +=
+            BG_Buildable( self->s.modelindex )->buildPoints;
+      }
   }
 }
 
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 16a4093d..7b1ff789 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1142,8 +1142,8 @@ void G_CalculateBuildPoints( void )
     }
   }
 
-  level.humanBuildPoints = g_humanBuildPoints.integer;
-  level.alienBuildPoints = g_alienBuildPoints.integer;
+  level.humanBuildPoints = g_humanBuildPoints.integer - level.humanBuildPointQueue;
+  level.alienBuildPoints = g_alienBuildPoints.integer - level.humanBuildPointQueue;
 
   level.reactorPresent = qfalse;
   level.overmindPresent = qfalse;