Changeset 4503

Timestamp:

2013-07-05 12:48:27 (10 years ago)

Author:

jaollipa

Message:

Fixed.

Location:

2013/27/JaakkoL/RampageRebellion

Files:

• RampageRebellion.suo (modified) (previous)
• RampageRebellion/RampageRebellion/RRBegin.cs (modified) (3 diffs)
• RampageRebellion/RampageRebellion/RREnemy.cs (modified) (1 diff)
• RampageRebellion/RampageRebellion/bin/x86/Debug/RampageRebellion.exe (modified) (previous)
• RampageRebellion/RampageRebellion/bin/x86/Debug/RampageRebellion.pdb (modified) (previous)
• RampageRebellion/RampageRebellion/obj/x86/Debug/RampageRebellion.exe (modified) (previous)
• RampageRebellion/RampageRebellion/obj/x86/Debug/RampageRebellion.pdb (modified) (previous)

2013/27/JaakkoL/RampageRebellion/RampageRebellion/RampageRebellion/RRBegin.cs

@@ -273 +273 @@
     public volatile List<IntMeter> pwArsenalUpgrades;
     public volatile List<Label> pwArsenalLabels;
+    public volatile GameObject pauseMenuDummy;
+    public volatile Image pauseMenu;
     #endregion
 
@@ -308 +310 @@
     private void hideArsenalLabels()
     {
+        pauseMenuDummy.Image = null;
         for (int i = 0; i < 4; i++) {
             pwArsenalLabels[i].Destroy();
@@ -324 +327 @@
         pwArsenalLabels = new List<Label>(new Label[] { new Label(METER_LENGTH, METER_HEIGHT), new Label(METER_LENGTH, METER_HEIGHT), new Label(METER_LENGTH, METER_HEIGHT), new Label(METER_LENGTH, METER_HEIGHT) });
 
+        pauseMenuDummy = new GameObject(1600, 1200, Shape.Rectangle);
+        pauseMenuDummy.Position = new Vector(-100.0, 150.0);
+        pauseMenuDummy.Color = new Color(0, 0, 0, 0);
+        pauseMenu = LoadImage("PauseBckg-WUpgrades-NoBckg");
+        pauseMenuDummy.Image = pauseMenu;
+        Add(pauseMenuDummy);
+
         for (int i = 0; i < 4; i++)
         {
             pwArsenalLabels[i].BindTo(pwArsenalUpgrades[i]);
-
-            GameObject pauseMenuDummy = new GameObject(1600, 1200, Shape.Rectangle);
-            pauseMenuDummy.Position = new Vector(-100.0, 150.0);
-            pauseMenuDummy.Color = new Color(0, 0, 0, 0);
-            Image pauseMenu = LoadImage("PauseBckg-WUpgrades-NoBckg");
-            pauseMenuDummy.Image = pauseMenu;
-            Add(pauseMenuDummy);
             
             pwArsenalLabels[i].Position = new Vector(ARSENAL_BASE_POSITION.X+i*200, ARSENAL_BASE_POSITION.Y);

2013/27/JaakkoL/RampageRebellion/RampageRebellion/RampageRebellion/RREnemy.cs

@@ -94 +94 @@
 
         shootingTimer = new Timer();
-        //shootingTimer.Interval = shootingInterval;
-        shootingTimer.Interval = RandomGen.NextDouble(0.1, 3.0);
+        //shootingTimer.Interval = shootingInterval; // should get inherited from SmallEnemy!
+        shootingTimer.Interval = RandomGen.NextDouble(0.7, 1.5);
         shootingTimer.Start();