Remove songs from git index into commercial assets. Update distribution and build scripts to not include songs commercial folder. Fix early destruction of audio buffer data causing a crash. Release Build 11544.

Adventures in Lestoria/Adventures in Lestoria.vcxproj

@@ -1201,7 +1201,23 @@
     <ClCompile Include="Zephy.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\commit.bat" />
+    <None Include="..\debug.sh" />
+    <None Include="..\debugGame.sh" />
+    <None Include="..\distribute.ps1" />
+    <None Include="..\distribute.sh" />
+    <None Include="..\emscripten_build.ps1" />
+    <None Include="..\emscripten_build.sh" />
+    <None Include="..\emscripten_debug_build.ps1" />
+    <None Include="..\emscripten_debug_build.sh" />
+    <None Include="..\emscripten_run.ps1" />
+    <None Include="..\emscripten_run.sh" />
     <None Include="..\read_debug_log.ps1" />
+    <None Include="..\release.sh" />
+    <None Include="..\runGame - NO STEAM.bat" />
+    <None Include="..\runGame.bat" />
+    <None Include="..\runGame.sh" />
+    <None Include="..\unit-testing-prebuild.ps1" />
     <None Include="ClassDiagram.cd" />
     <None Include="ClassDiagram2.cd" />
     <None Include="cpp.hint" />

Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters

@@ -100,6 +100,9 @@
     <Filter Include="Documentation\Admin">
       <UniqueIdentifier>{e565fb16-43e6-4d18-a450-af7474df70b9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Scripts">
+      <UniqueIdentifier>{eba9dd86-1d5d-4c68-8dcb-760c759099c0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="olcPixelGameEngine.h">
@@ -1235,6 +1238,54 @@
       <Filter>Header Files\steam</Filter>
     </None>
     <None Include="..\read_debug_log.ps1" />
+    <None Include="..\commit.bat">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\debug.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\debugGame.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\distribute.ps1">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\distribute.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_build.ps1">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_build.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_debug_build.ps1">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_debug_build.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_run.ps1">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\emscripten_run.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\release.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\runGame - NO STEAM.bat">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\runGame.bat">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\runGame.sh">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="..\unit-testing-prebuild.ps1">
+      <Filter>Scripts</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="InitialConcept.txt">

Adventures in Lestoria/Version.h

@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 2
 #define VERSION_PATCH 5
-#define VERSION_BUILD 11541
+#define VERSION_BUILD 11544
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Adventures in Lestoria/assets/config/audio/bgm.txt

@@ -7,7 +7,7 @@ BGM
 	{
 		Track Name = Foresty
 
-		channel[0]=foresty_full1.ogg
+		channel[0]=commercial_assets/foresty_full1.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -25,7 +25,7 @@ BGM
 	{
 		Track Name = Overworld
 
-		channel[0]=overworld_v2.ogg
+		channel[0]=commercial_assets/overworld_v2.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -43,7 +43,7 @@ BGM
 	{
 		Track Name = Foresty Boss
 
-		channel[0]=foresty_boss.ogg
+		channel[0]=commercial_assets/foresty_boss.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -61,9 +61,9 @@ BGM
 	{
 		Track Name = Foresty Loop 2
 
-		channel[0]=loop2/foresty1_1_loop2_bass.ogg
-		channel[1]=loop2/foresty1_1_loop2_staccato.ogg
-		channel[2]=loop2/foresty1_1_loop2_strings.ogg
+		channel[0]=commercial_assets/loop2/foresty1_1_loop2_bass.ogg
+		channel[1]=commercial_assets/loop2/foresty1_1_loop2_staccato.ogg
+		channel[2]=commercial_assets/loop2/foresty1_1_loop2_strings.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -82,16 +82,16 @@ BGM
 	{
 		Track Name = Base Camp
 
-		channel[0]=AIL_baseCamp_bass.ogg
-		channel[1]=AIL_baseCamp_flute.ogg
-		channel[2]=AIL_baseCamp_kick.ogg
-		channel[3]=AIL_baseCamp_piano1.ogg
-		channel[4]=AIL_baseCamp_piano2.ogg
-		channel[5]=AIL_baseCamp_pizzicato.ogg
-		channel[6]=AIL_baseCamp_ride.ogg
-		channel[7]=AIL_baseCamp_snare.ogg
-		channel[8]=AIL_baseCamp_strings.ogg
-		channel[9]=AIL_baseCamp_xtra perc.ogg
+		channel[0]=commercial_assets/AIL_baseCamp_bass.ogg
+		channel[1]=commercial_assets/AIL_baseCamp_flute.ogg
+		channel[2]=commercial_assets/AIL_baseCamp_kick.ogg
+		channel[3]=commercial_assets/AIL_baseCamp_piano1.ogg
+		channel[4]=commercial_assets/AIL_baseCamp_piano2.ogg
+		channel[5]=commercial_assets/AIL_baseCamp_pizzicato.ogg
+		channel[6]=commercial_assets/AIL_baseCamp_ride.ogg
+		channel[7]=commercial_assets/AIL_baseCamp_snare.ogg
+		channel[8]=commercial_assets/AIL_baseCamp_strings.ogg
+		channel[9]=commercial_assets/AIL_baseCamp_xtra perc.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -111,10 +111,10 @@ BGM
 	{
 		Track Name = Foresty Story
 
-		channel[0]=foresty1_1_drums.ogg
-		channel[1]=foresty1_1_flute.ogg
-		channel[2]=foresty1_1_strings.ogg
-		channel[3]=foresty1_1_xtra perc.ogg
+		channel[0]=commercial_assets/foresty1_1_drums.ogg
+		channel[1]=commercial_assets/foresty1_1_flute.ogg
+		channel[2]=commercial_assets/foresty1_1_strings.ogg
+		channel[3]=commercial_assets/foresty1_1_xtra perc.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -132,7 +132,7 @@ BGM
 	{
 		Track Name = Foresty
 
-		channel[0]=AiL_mountain2_2.ogg
+		channel[0]=commercial_assets/AiL_mountain2_2.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0
@@ -150,7 +150,7 @@ BGM
 	{
 		Track Name = Mountain Boss
 
-		channel[0]=AiL_mountain_boss.ogg
+		channel[0]=commercial_assets/AiL_mountain_boss.ogg
 
 		# Transition time between one phase to the next.
 		Fade Time = 2.0

Adventures in Lestoria/olcPGEX_MiniAudio.h

@@ -159,12 +159,8 @@ namespace olc
         std::vector<ma_sound*> vecSounds;
         std::vector<ma_sound*> vecOneOffSounds;
         struct ResourceData{
-            ma_engine*engine;
             ResourceBuffer data;
             std::string pathName;
-            ~ResourceData(){
-                if(ma_resource_manager_unregister_data(ma_engine_get_resource_manager(engine),pathName.data())!=MA_SUCCESS)ERR(std::format("WARNING! Could not clear resources for {}!",pathName));
-            };
         };
         std::unordered_map<size_t,ResourceData>vecResourceData;
     };
@@ -332,7 +328,7 @@ namespace olc
         if(!foundSound)vecSounds.emplace_back(sound);
 
         if(soundType==BGM){
-            vecResourceData[id]={&engine,game->gamepack.GetFileBuffer(path),path};
+            vecResourceData[id]={game->gamepack.GetFileBuffer(path),path};
             if(ma_resource_manager_register_encoded_data(ma_engine_get_resource_manager(&engine),path.data(),vecResourceData[id].data.vMemory.data(),vecResourceData[id].data.vMemory.size())!=MA_SUCCESS)ERR(std::format("WARNING! Could not load resources for {}!",path));
         }
         if(ma_sound_init_from_file(&engine, path.c_str(), MA_SOUND_FLAG_DECODE | MA_SOUND_FLAG_ASYNC, NULL, NULL, sound) != MA_SUCCESS)
@@ -346,7 +342,10 @@ namespace olc
         ma_sound_uninit(vecSounds.at(id));
         delete vecSounds.at(id);
         vecSounds.at(id) = nullptr;
-        if(vecResourceData.count(id))vecResourceData.erase(id);
+        if(vecResourceData.count(id)){
+            if(ma_resource_manager_unregister_data(ma_engine_get_resource_manager(&engine),vecResourceData[id].pathName.data())!=MA_SUCCESS)ERR(std::format("WARNING! Could not clear resources for {}!",vecResourceData[id].pathName));
+            vecResourceData.erase(id);
+        }
     }
 
     void MiniAudio::Play(const int id, const bool loop)

distribute.ps1

@@ -11,6 +11,7 @@ rm -R bin/assets/backgrounds/commercial_assets
 rm -R bin/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" bin/assets
 cp -R "Adventures in Lestoria/assets/music" bin/assets
+rm -R bin/assets/music/commercial_assets
 cp -R "Adventures in Lestoria/assets/npcs" bin/assets
 cp -R "Adventures in Lestoria/assets/sounds" bin/assets
 cp -R "Adventures in Lestoria/assets/themes" bin/assets

distribute.sh

@@ -11,6 +11,7 @@ rm -R release/assets/backgrounds/commercial_assets
 rm -R release/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" release/assets
 cp -R "Adventures in Lestoria/assets/music" release/assets
+rm -R release/assets/music/commercial_assets
 cp -R "Adventures in Lestoria/assets/npcs" release/assets
 cp -R "Adventures in Lestoria/assets/sounds" release/assets
 cp -R "Adventures in Lestoria/assets/themes" release/assets

emscripten_build.ps1

@@ -12,6 +12,7 @@ rm -R bin/assets/backgrounds/commercial_assets
 rm -R bin/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" bin/assets
 cp -R "Adventures in Lestoria/assets/music" bin/assets
+rm -R bin/assets/music/commercial_assets
 cp -R "Adventures in Lestoria/assets/npcs" bin/assets
 cp -R "Adventures in Lestoria/assets/sounds" bin/assets
 cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets

emscripten_build.sh

@@ -3,16 +3,21 @@ clear
 
 mkdir bin
 mkdir bin/assets
-
+cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html
 cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets
 cp -R "Adventures in Lestoria/assets/config" bin/assets
 cp -R "Adventures in Lestoria/assets/maps" bin/assets
+cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets
+rm -R bin/assets/backgrounds/commercial_assets
 rm -R bin/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" bin/assets
 cp -R "Adventures in Lestoria/assets/music" bin/assets
+rm -R bin/assets/music/commercial_assets
 cp -R "Adventures in Lestoria/assets/npcs" bin/assets
 cp -R "Adventures in Lestoria/assets/sounds" bin/assets
 cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets
+cp -R "Adventures in Lestoria/assets/themes" bin/assets
+cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets
 
 source ./emsdk/emsdk_env.sh
 emcmake cmake -DCMAKE_BUILD_TYPE=Release .

emscripten_debug_build.ps1

@@ -13,6 +13,7 @@ rm -R bin/assets/backgrounds/commercial_assets
 rm -R bin/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" bin/assets
 cp -R "Adventures in Lestoria/assets/music" bin/assets
+rm -R bin/assets/music/commercial_assets
 cp -R "Adventures in Lestoria/assets/npcs" bin/assets
 cp -R "Adventures in Lestoria/assets/sounds" bin/assets
 cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets