Changeset 4503 for 2013/27


Ignore:
Timestamp:
2013-07-05 12:48:27 (6 years ago)
Author:
jaollipa
Message:

Fixed.

Location:
2013/27/JaakkoL/RampageRebellion
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • 2013/27/JaakkoL/RampageRebellion/RampageRebellion/RampageRebellion/RRBegin.cs

    r4490 r4503  
    273273    public volatile List<IntMeter> pwArsenalUpgrades; 
    274274    public volatile List<Label> pwArsenalLabels; 
     275    public volatile GameObject pauseMenuDummy; 
     276    public volatile Image pauseMenu; 
    275277    #endregion 
    276278 
     
    308310    private void hideArsenalLabels() 
    309311    { 
     312        pauseMenuDummy.Image = null; 
    310313        for (int i = 0; i < 4; i++) { 
    311314            pwArsenalLabels[i].Destroy(); 
     
    324327        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) }); 
    325328 
     329        pauseMenuDummy = new GameObject(1600, 1200, Shape.Rectangle); 
     330        pauseMenuDummy.Position = new Vector(-100.0, 150.0); 
     331        pauseMenuDummy.Color = new Color(0, 0, 0, 0); 
     332        pauseMenu = LoadImage("PauseBckg-WUpgrades-NoBckg"); 
     333        pauseMenuDummy.Image = pauseMenu; 
     334        Add(pauseMenuDummy); 
     335 
    326336        for (int i = 0; i < 4; i++) 
    327337        { 
    328338            pwArsenalLabels[i].BindTo(pwArsenalUpgrades[i]); 
    329  
    330             GameObject pauseMenuDummy = new GameObject(1600, 1200, Shape.Rectangle); 
    331             pauseMenuDummy.Position = new Vector(-100.0, 150.0); 
    332             pauseMenuDummy.Color = new Color(0, 0, 0, 0); 
    333             Image pauseMenu = LoadImage("PauseBckg-WUpgrades-NoBckg"); 
    334             pauseMenuDummy.Image = pauseMenu; 
    335             Add(pauseMenuDummy); 
    336339             
    337340            pwArsenalLabels[i].Position = new Vector(ARSENAL_BASE_POSITION.X+i*200, ARSENAL_BASE_POSITION.Y); 
  • 2013/27/JaakkoL/RampageRebellion/RampageRebellion/RampageRebellion/RREnemy.cs

    r4490 r4503  
    9494 
    9595        shootingTimer = new Timer(); 
    96         //shootingTimer.Interval = shootingInterval; 
    97         shootingTimer.Interval = RandomGen.NextDouble(0.1, 3.0); 
     96        //shootingTimer.Interval = shootingInterval; // should get inherited from SmallEnemy! 
     97        shootingTimer.Interval = RandomGen.NextDouble(0.7, 1.5); 
    9898        shootingTimer.Start(); 
    9999 
Note: See TracChangeset for help on using the changeset viewer.