Add sound

include/awoorwae.h

@@ -2,6 +2,7 @@
 #define AWOORWAE_H
 
 #include "olcPixelGameEngine.h"
+#include "olcPGEX_Sound.h"
 #include "player.h"
 
 namespace pabloader {
@@ -24,6 +25,9 @@ public:
 public:
     bool OnUserCreate() override;
     bool OnUserUpdate(float fElapsedTime) override;
+    bool OnUserDestroy() override;
+
+public:
     olc::ResourcePack pack;
 };
 }

include/player.h

@@ -3,6 +3,7 @@
 
 #include "entity.h"
 #include "olcPGE_Common.h"
+#include "olcPGEX_Sound.h"
 
 namespace pabloader {
 
@@ -12,8 +13,10 @@ public:
     olc::rcode Load() override;
     void Update(float dt) override;
     void Draw() override;
-};
 
+private:
+    int fallSample;
+};
 }
 
 #endif

pge/include/olcPGEX_Sound.h

@@ -168,7 +168,7 @@ namespace olc
 
 	private:
 #ifdef USE_WINDOWS // Windows specific sound management
-		static void CALLBACK waveOutProc(HWAVEOUT hWaveOut, UINT uMsg, DWORD dwParam1, DWORD dwParam2);
+		static void CALLBACK waveOutProc(HWAVEOUT hWaveOut, UINT uMsg, DWORD_PTR dwInstance, DWORD dwParam1, DWORD dwParam2);
 		static unsigned int m_nSampleRate;
 		static unsigned int m_nChannels;
 		static unsigned int m_nBlockCount;

pge/src/olcPGEX_Sound.cpp

@@ -286,7 +286,7 @@ namespace olc
 	}
 
 	// Handler for soundcard request for more data
-	void CALLBACK SOUND::waveOutProc(HWAVEOUT hWaveOut, UINT uMsg, DWORD dwParam1, DWORD dwParam2)
+	void CALLBACK SOUND::waveOutProc(HWAVEOUT hWaveOut, UINT uMsg, DWORD_PTR dwInstance, DWORD dwParam1, DWORD dwParam2)
 	{
 		if (uMsg != WOM_DONE) return;
 		m_nBlockFree++;

src/awoorwae.cpp

@@ -1,21 +1,26 @@
 #include "awoorwae.h"
 #include <cmath>
-#include <string>
 #include <iostream>
+#include <string>
 
 namespace pabloader {
 
 bool Awoorwae::OnUserCreate()
 {
+    if (!olc::SOUND::InitialiseAudio()) {
+        std::cerr << "Cannot init audio" << std::endl;
+        return false;
+    }
+
     if (!pack.LoadPack("awoorwae.pgp")) {
         std::cerr << "Cannot load resource pack res/awoorwae.pgp" << std::endl;
         return false;
     }
+
     if (!player->Load())
         return false;
 
     SetPixelMode(olc::Pixel::MASK);
-
     pack.ClearPack();
     return true;
 }
@@ -28,4 +33,10 @@ bool Awoorwae::OnUserUpdate(float fElapsedTime)
     player->Draw();
     return true;
 }
+
+bool Awoorwae::OnUserDestroy()
+{
+    olc::SOUND::DestroyAudio();
+    return true;
+}
 }

src/player.cpp

@@ -10,17 +10,24 @@ Player::Player(Awoorwae* game_)
 
 olc::rcode Player::Load()
 {
-    const std::string fileName = "res/player.pgs";
-    olc::rcode result = img.LoadFromPGESprFile(fileName, &game->pack);
-    if (result) {
+    const std::string spriteFile = "res/player.pgs";
+    const std::string fallFile = "res/fall.wav";
+    if (img.LoadFromPGESprFile(spriteFile, &game->pack)) {
         w = img.width / 4;
         h = img.height / 4;
         x = (game->ScreenWidth() - w) / 2;
         y = game->ScreenHeight() / 2;
     } else {
-        std::cerr << "File " << fileName << " is not found" << std::endl;
+        std::cerr << "File " << spriteFile << " is not found" << std::endl;
+        return olc::FAIL;
     }
-    return result;
+    fallSample = olc::SOUND::LoadAudioSample(fallFile, &game->pack);
+    if (fallSample < 0) {
+        std::cerr << "File " << fallFile << " is not found" << std::endl;
+        return olc::FAIL;
+    }
+
+    return olc::OK;
 }
 
 void Player::Update(float dt)
@@ -69,11 +76,13 @@ void Player::Update(float dt)
     if (x > game->ScreenWidth() - w / 2) {
         xv *= -0.3;
         x = game->ScreenWidth() - w / 2;
+        olc::SOUND::PlaySample(fallSample);
     }
 
     if (x < w / 2) {
         xv *= -0.3;
         x = w / 2;
+        olc::SOUND::PlaySample(fallSample);
     }
 
     if (y > game->ScreenHeight() - h / 2) {
@@ -85,7 +94,11 @@ void Player::Update(float dt)
         y = game->ScreenHeight() - h / 2;
     }
 
-    onGround = y >= game->ScreenHeight() - h / 2;
+    bool newOnGround = y >= game->ScreenHeight() - h / 2;
+    if (newOnGround && !onGround) {
+        olc::SOUND::PlaySample(fallSample);
+    }
+    onGround = newOnGround;
 
     if (onGround) {
         tile = 2;