From c6c3e5cf72a3d06671d87d90773c0995581a8aef Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 18 Jun 2024 15:43:15 -0500 Subject: [PATCH] gcc does not like the promotion from float to double in std::max... --- Adventures in Lestoria/Hawk.cpp | 2 +- Adventures in Lestoria/Version.h | 2 +- x64/Release/Adventures in Lestoria.exe | Bin 3745280 -> 3745280 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Adventures in Lestoria/Hawk.cpp b/Adventures in Lestoria/Hawk.cpp index d595a9db..75b48dc9 100644 --- a/Adventures in Lestoria/Hawk.cpp +++ b/Adventures in Lestoria/Hawk.cpp @@ -60,7 +60,7 @@ void Monster::STRATEGY::HAWK(Monster&m,float fElapsedTime,std::string strategy){ }; #pragma region Flying Hover Effect - m.SetZ(std::max(m.F(A::FLYING_HEIGHT)+ConfigFloat("Flight Oscillation Amount")*sin((PI*m.TimeSpentAlive())/1.5f),0.f)); + m.SetZ(std::max(float(m.F(A::FLYING_HEIGHT)+ConfigFloat("Flight Oscillation Amount")*sin((PI*m.TimeSpentAlive())/1.5f)),0.f)); #pragma endregion switch(m.phase){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 3cd49e73..858299bb 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 9666 +#define VERSION_BUILD 9667 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index a49e0301a04b08a55d2e85e4bc3564320fbda77e..c511e44f10b6e3f4db1c0a5038c66f0f4885c9d4 100644 GIT binary patch delta 343 zcmX}ixlRIM7=_{a2a#2f#RU*SL1Y^ThBe-V2{aUA<0KSTdIuyd)6tIMDyWUifTH_rmok zykPRIN)ugmDrvt3$#Lx1cK@3-Unxo7{wHMB^PPv;T6tgJy)DGAl^&Fv=0;ahLme6# PaQYV7=-3;*+xYwg_#1Uj delta 343 zcmX}iyH3Jz7{=lLt0*T?IVhkgAj+|}lw-UJ6DNndK;pn8cR&Kz&9#K9aH2EaNFdw< z7r?+w{B^)Dd6GBp`wf;GF~F}TWNkatg{cddj3XSwgA<&>3!kkE|64~m=D6!e070A~ zgmYZr5@AFTMGRNCMjQzwaf4f=aEE)OkwF#@$l(!B$fJNFN+_dZkGsnH<3-!{KP67a z7e+l*8X2lvNrx>+j$+5Q``@gexsvo9enM6?*LwYSl$rB9nToxYdN0+@m7zjI6*_8g O`v#h5*(;-6Tl@i$DRh_s