Changeset 4666fae in advance-wars for src/com/medievaltech/advancewars/Game.java

Timestamp:

Oct 20, 2011, 3:25:50 PM (13 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

bb2fa26

Parents:

331d180

Message:

Moved many widely used variables to the Static class.

File:

• src/com/medievaltech/advancewars/Game.java (modified) (6 diffs)

src/com/medievaltech/advancewars/Game.java

@@ -9 +9 @@
 import android.view.MenuItem;
 import android.view.Window;
-import android.widget.TextView;
 
-import com.medievaltech.advancewars.GameView.*;
 import com.medievaltech.advancewars.Enum.*;
 
 public class Game extends Activity {
-    public DrawingThread mThread;
-    private GameView mGameView;
-    
+        
     /**
      * Invoked during init to give the Activity a chance to set up its Menu.
@@ -47 +43 @@
         
         if(i == MenuOption.END_TURN.ordinal()) {
-                mThread.mTurn = Turn.ENEMY_TURN;
+                Static.turn = Turn.ENEMY_TURN;
         }else if(i == MenuOption.SAVE.ordinal()) {
                 try {
@@ -57 +53 @@
                 }
         }else if(i == MenuOption.MAIN.ordinal()) {
-                mThread.mGameState = GameState.MAIN_MENU;
+                Static.gameState = GameState.MAIN_MENU;
         }else if(i == MenuOption.EXIT.ordinal()) {
                 finish();
@@ -85 +81 @@
         setContentView(R.layout.main);
 
-        mGameView = (GameView) findViewById(R.id.lunar);
-        mThread = mGameView.getThread();
-        mGameView.mGame = this;
-
-        mGameView.setTextView((TextView) findViewById(R.id.text));
+        Static.game = this;
 
         if (savedInstanceState == null) {       // we were just launched: set up a new game
@@ -96 +88 @@
             Log.w("AdvanceWars", "SIS is nonnull");
             
-            mGameView.getThread().mGameState = (GameState)savedInstanceState.getSerializable("gameState");
+            Static.gameState = (GameState)savedInstanceState.getSerializable("gameState");
         }
     }
@@ -108 +100 @@
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        outState.putSerializable("gameState", mGameView.getThread().mGameState);
+        outState.putSerializable("gameState", Static.gameState);
         
         super.onSaveInstanceState(outState);