Changeset 279Tweet

Timestamp:

Jan 24, 2011, 1:52:54 PM (10 years ago)

Author:

sam

Message:

Play a few additional sounds (whip and pop).

Location:

trunk

Files:

• monsterz/board.cpp (modified) (9 diffs)
• monsterz/mash.cpp (modified) (4 diffs)
• monsterz/monsterz.h (modified) (1 diff)
• win32/monsterz.vcxproj (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -35 +35 @@
     Game *game;
     int screen, board, tiles;
-    int click;
+    int click, whip;
     Piece *pieces[8][8];
     Piece *grabbed;
@@ -43 +43 @@
     Int2 mouse;
     Int3 buttons;
-    float nextblink;
+    float nextblink, whipdelay;
 
     enum
@@ -67 +67 @@
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
     data->click = Sampler::Register(WAV_CLICK);
+    data->whip = Sampler::Register(WAV_WHIP);
 
     srand(rand() ^ time(NULL));
@@ -74 +75 @@
         for (int i = 0; i < 8; i++)
         {
-            int id = 25 + 5 * (rand() % 8);
+            int id = 25 + 5 * (rand() % 7);
             data->pieces[i][j] = new Piece(game, Int2(i, j), id);
             if (j)
@@ -95 +96 @@
     data->mashes = NULL;
     data->nextblink = 0.0f;
+    data->whipdelay = 0.0f;
     data->state = BoardData::IDLE;
 }
@@ -111 +113 @@
         data->nextblink = (float)(200 + rand() % 500);
     }
+
+    /* Do not whip too often, the sound may become annoying */
+    data->whipdelay -= deltams;
 
     /* Get rid of finished mashes */
@@ -164 +169 @@
             if (cur_cell != data->dst_cell)
             {
+                if (data->whipdelay < 0.0f)
+                {
+                    Sampler::PlaySample(data->whip);
+                    data->whipdelay = 300.0f;
+                }
                 if (data->dst_cell != Int2(-1))
                     data->pieces[data->dst_cell.i]
@@ -295 +305 @@
              * the board. */
             Int2 newpos = Int2(i * 48, below->GetPos().y + 48);
-            int id = 25 + 5 * (rand() % 8);
+            int id = 25 + 5 * (rand() % 7);
             data->pieces[i][7] = new Piece(data->game, Int2(i, 7), id);
             data->pieces[i][7]->SetBelow(below);
@@ -359 +369 @@
     Tiler::Deregister(data->tiles);
     Sampler::Deregister(data->click);
+    Sampler::Deregister(data->whip);
     delete data;
 }

trunk/monsterz/mash.cpp

@@ -31 +31 @@
 private:
     Game *game;
+    int duh, pop;
     Piece *pieces[8 * 8];
     Int2 cells[8 * 8];
@@ -54 +55 @@
     data->game = game;
     Ticker::Ref(game);
+    data->duh = Sampler::Register(WAV_DUH);
+    data->pop = Sampler::Register(WAV_POP);
     data->npieces = 0;
     data->state = MashData::WAIT;
@@ -91 +94 @@
         if (allready)
         {
+            Sampler::PlaySample(data->pop);
             for (int n = 0; n < data->npieces; n++)
                 data->pieces[n]->Pop();
@@ -137 +141 @@
     for (int n = 0; n < data->npieces; n++)
         Ticker::Unref(data->pieces[n]);
+    Sampler::Deregister(data->duh);
+    Sampler::Deregister(data->pop);
     Ticker::Unref(data->game);
     delete data;

trunk/monsterz/monsterz.h

@@ -14 +14 @@
 
 static char const * const WAV_CLICK = "monsterz/click.wav";
-
+static char const * const WAV_DUH = "monsterz/duh.wav";
+static char const * const WAV_POP = "monsterz/pop.wav";
+static char const * const WAV_WHIP = "monsterz/whip.wav";

trunk/win32/monsterz.vcxproj

@@ -15 +15 @@
     <ClInclude Include="..\monsterz\game.h" />
     <ClInclude Include="..\monsterz\mash.h" />
+    <ClInclude Include="..\monsterz\monsterz.h" />
     <ClInclude Include="..\monsterz\piece.h" />
     <ClInclude Include="..\src\audio.h" />