Changeset 348Tweet

Timestamp:

Feb 4, 2011, 12:42:16 AM (10 years ago)

Author:

sam

Message:

Display spawn counts in Fusion mode, and generate random pieces accordingly.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (1 diff)
• fusion.cpp (modified) (9 diffs)
• fusion.h (modified) (2 diffs)
• interface.cpp (modified) (1 diff)
• thumbs.cpp (modified) (1 diff)
• thumbs.h (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -317 +317 @@
             /* The mash becomes the new owner of the disappearing piece */
             mash->AddPiece(data->pairs[i][j].piece);
-            data->thumbs->AddCount(data->pairs[i][j].id - 1, 1);
+            data->thumbs->AddCount(data->pairs[i][j].id, 1);
 
 #if 0 // Test for piece creation

trunk/monsterz/fusion.cpp

@@ -36 +36 @@
 private:
     int2 dim;
-    int npieces, maxnpieces;
+    int minnpieces, npieces, maxnpieces;
     int board, tiles;
 
@@ -65 +65 @@
  */
 
-Fusion::Fusion(int2 dim, int npieces, int maxnpieces)
+Fusion::Fusion(int2 dim, int minnpieces, int maxnpieces)
   : data(new FusionData())
 {
     data->dim = dim;
-    data->npieces = npieces;
+    data->minnpieces = minnpieces;
+    data->npieces = minnpieces;
     data->maxnpieces = maxnpieces;
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
@@ -77 +78 @@
     Ticker::Ref(data->emitter);
 
-    data->thumbs = new Thumbs(npieces);
+    data->thumbs = new Thumbs(minnpieces + 1);
     Ticker::Ref(data->thumbs);
 
@@ -84 +85 @@
             data->pairs[i][j].id = 0;
 
-    data->current[0].id = 1 + rand() % data->npieces;
-    data->current[1].id = 1 + rand() % data->npieces;
+    data->current[0].id = GetRandomId();
+    data->current[1].id = GetRandomId();
     data->current[0].piece = new Piece(data->emitter, int2(3, 8),
                                        80 + 20 * data->current[0].id);
@@ -97 +98 @@
     data->mashes = NULL;
 
-    data->next[0] = 1 + rand() % data->npieces;
-    data->next[1] = 1 + rand() % data->npieces;
+    data->next[0] = GetRandomId();
+    data->next[1] = GetRandomId();
     data->rotation = 0;
 
@@ -179 +180 @@
                     data->current[t].piece->Move(int2(i, j) * 48);
                     data->pairs[i][j] = data->current[t];
+                    data->thumbs->AddCount(data->current[t].id, 1);
                     break;
                 }
@@ -195 +197 @@
         data->current[0].piece->Move(data->current[0].piece->GetCell() * 48);
         data->current[1].piece->Move(data->current[1].piece->GetCell() * 48);
-        data->next[0] = 1 + rand() % data->npieces;
-        data->next[1] = 1 + rand() % data->npieces;
+        data->next[0] = GetRandomId();
+        data->next[1] = GetRandomId();
         data->rotation = 0;
 
@@ -215 +217 @@
     Scene::GetDefault()->AddTile((data->board << 16) | 0,
                                  position.x, position.y, 1, 0);
+}
+
+int Fusion::GetRandomId() const
+{
+    int max = data->npieces;
+
+    if (max > data->minnpieces)
+        max--;
+
+    return 1 + rand() % max;
 }
 
@@ -292 +304 @@
         Ticker::Ref(data->pairs[i][j].piece);
         data->pairs[i][j].piece->SetPos(int2(i, j) * 48);
+        data->thumbs->AddCount(data->pairs[i][j].id, 1);
         count[list[i][j]] = 0;
         list[i][j] = -1;

trunk/monsterz/fusion.h

@@ -24 +24 @@
 {
 public:
-    Fusion(int2 dim, int npieces, int maxnpieces);
+    Fusion(int2 dim, int minnpieces, int maxnpieces);
     virtual ~Fusion();
 
@@ -32 +32 @@
 
 private:
+    int GetRandomId() const;
     void Resolve();
     int TagNeighbours(int list[MAX_PIECES][MAX_PIECES], int i, int j);

trunk/monsterz/interface.cpp

@@ -83 +83 @@
             Ticker::Unref(data->title);
             data->title = NULL;
-            data->fusion = new Fusion(int2(8, 7), 4, 12);
+            data->fusion = new Fusion(int2(8, 7), 3, 12);
             Ticker::Ref(data->fusion);
 #if 0

trunk/monsterz/thumbs.cpp

@@ -95 +95 @@
 void Thumbs::AddCount(int id, int count)
 {
-    if (id >= 0 && id < data->npieces)
-        data->count[id] += count;
+    if (id > 0 && id <= data->npieces)
+        data->count[id - 1] += count;
+}
+
+int Thumbs::GetCount(int id)
+{
+    if (id > 0 && id <= data->npieces)
+        return data->count[id - 1];
+    else
+        return 0;
 }
 

trunk/monsterz/thumbs.h

@@ -29 +29 @@
     void SetMax(int npieces);
     void AddCount(int id, int count);
+    int GetCount(int id);
 
 protected: