Changes in / [38ac100:9d030cb] in galcon-client

Location:

src/com/example/helloandroid

Files:

• Fleet.java (modified) (1 diff)
• GameView.java (modified) (4 diffs)
• Planet.java (modified) (4 diffs)

src/com/example/helloandroid/Fleet.java

@@ -264 +264 @@
                                 }
                         } else {
-                                angle = speed/(double)nearPlanet.radius*.1;
+                                angle = speed/(double)nearPlanet.radius;
                                 
                                 if(isClockwise){

src/com/example/helloandroid/GameView.java

@@ -131 +131 @@
         public void run() {
             while (mRun) {
-                //Log.i("Gencon", "run called");
-                
                 Canvas c = null;
                 try {
                     c = mSurfaceHolder.lockCanvas(null);
-                    synchronized (mSurfaceHolder) {
-                        //Log.i("Gencon", "about to call stuff: mode is "+mMode);
-                        
-                        if (mMode == STATE_RUNNING) updatePhysics();
+                    synchronized(mSurfaceHolder) {
+                        if(mMode == STATE_RUNNING)
+                                updatePhysics();
                         doDraw(c);
                     }
@@ -372 +369 @@
          */
         private void updatePhysics() {
-                //Log.i("Gencon", "updatePhysics called");
-                
             long now = System.currentTimeMillis();
 
@@ -380 +375 @@
             // by 100ms or whatever.
             if (mLastTime > now) return;
-
+            
             synchronized(planetsLock) {
                 for(Planet p : planets) {
@@ -399 +394 @@
             }
 
-            mLastTime = now;
+            mLastTime = now+50;
         }
     }

src/com/example/helloandroid/Planet.java

@@ -11 +11 @@
 public class Planet {
         int radius;
-        int regenRate;  // ships per second
         private int x;
         private int y;
@@ -18 +17 @@
         boolean selected;
         private Bitmap selection;
+        private int frameCount, framesUntilSpawn;
         
         public Planet(int radius, int x, int y) {
@@ -27 +27 @@
                 selected = false;
                 
-                regenRate = 0;  //change this to some expression / funcion call
+                frameCount = 0;
+                framesUntilSpawn = 100/radius;
                 
                 int size = getRadius()+15;
@@ -132 +133 @@
         
         public void update() {
-                if(faction != 0)
-                        numShips += radius/10;
-                
+                if(faction != 0) {
+                        frameCount++;
+                        
+                        if(frameCount == framesUntilSpawn) {
+                                frameCount = 0;
+                                numShips++;
+                        }
+                }
         }