Merge pull request #385 from OneLoneCoder/develop

How to really frustrate Moros
OneLoneCoder · Sep 14, 2024 · 110f50e · 110f50e
2 parents 7f266f3 + b3fc0aa
commit 110f50e
Show file tree

Hide file tree

Showing 2 changed files with 324 additions and 96 deletions.
diff --git a/extensions/olcPGEX_SplashScreen.h b/extensions/olcPGEX_SplashScreen.h
@@ -165,7 +165,7 @@ namespace olc
 		for (int y = 0; y < spr.Sprite()->height; y++)
 			for (int x = 0; x < spr.Sprite()->width; x++)
 				vBoom[y * spr.Sprite()->width + x] = std::make_pair(
-					vPosition + olc::vf2d(x, y),
+					vPosition + olc::vf2d(float(x), float(y)),
 					olc::vf2d(
 						(float(rand()) / float(RAND_MAX)) * 10.0f - 5.0f,
 						(float(rand()) / float(RAND_MAX)) * 10.0f - 5.0f)
@@ -207,7 +207,7 @@ namespace olc
 					bComplete = true;
 				}
 
-				pge->DrawPartialDecal(vScale * vBoom[y * spr.Sprite()->width + x].first * 2.0f, spr.Decal(), olc::vf2d(x, y), { 1, 1 }, vScale * 2.0f, olc::PixelF(1.0f, 1.0f, 1.0f, std::min(1.0f, std::max(4.0f - fParticleTime, 0.0f))));
+				pge->DrawPartialDecal(vScale * vBoom[y * spr.Sprite()->width + x].first * 2.0f, spr.Decal(), olc::vf2d(float(x), float(y)), { 1, 1 }, vScale * 2.0f, olc::PixelF(1.0f, 1.0f, 1.0f, std::min(1.0f, std::max(4.0f - fParticleTime, 0.0f))));
 			}
 
 		olc::vi2d vSize = pge->GetTextSizeProp("Copyright OneLoneCoder.com 2024");