sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

gcc needs a float cast for std::min

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2024-03-30 02:36:55 -05:00
parent f47aa88e2e
commit 2a6f121938
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Adventures in Lestoria/Player.cpp
View File

@ -1453,7 +1453,7 @@ const vf2d Player::GetAimingLocation(bool useWalkDir,bool invert){
} }
if(closestPoint!=vf2d{std::numeric_limits<float>::max(),std::numeric_limits<float>::max()}){ if(closestPoint!=vf2d{std::numeric_limits<float>::max(),std::numeric_limits<float>::max()}){
geom2d::line<float>aimingLine=geom2d::line<float>(GetPos(),closestPoint); geom2d::line<float>aimingLine=geom2d::line<float>(GetPos(),closestPoint);
vf2d aimingPoint=aimingLine.rpoint(invert?(-operator""_Pixels("Player.Aiming Cursor Max Distance"_F)):std::min(aimingLine.length()+24.f,operator""_Pixels("Player.Aiming Cursor Max Distance"_F))); vf2d aimingPoint=aimingLine.rpoint(invert?(-operator""_Pixels("Player.Aiming Cursor Max Distance"_F)):std::min(aimingLine.length()+24.f,float(operator""_Pixels("Player.Aiming Cursor Max Distance"_F))));
return game->GetScreenSize()/2+aimingPoint-GetPos(); return game->GetScreenSize()/2+aimingPoint-GetPos();
}else }else
return game->GetScreenSize()/2+vf2d{float(operator""_Pixels("Player.Aiming Cursor Max Distance"_F)),aimingAngle.y}.cart(); return game->GetScreenSize()/2+vf2d{float(operator""_Pixels("Player.Aiming Cursor Max Distance"_F)),aimingAngle.y}.cart();

1
distribute.sh
View File

@ -17,6 +17,7 @@ cp -R "Adventures in Lestoria/assets/gamepack.pak" release/assets
cp -R "Adventures in Lestoria/assets/"*.ttf release/assets cp -R "Adventures in Lestoria/assets/"*.ttf release/assets
cp -R "Adventures in Lestoria/controller_config" release cp -R "Adventures in Lestoria/controller_config" release
cp "Adventures in Lestoria/Adventures in Lestoria/"*.so "release/Adventures in Lestoria" cp "Adventures in Lestoria/Adventures in Lestoria/"*.so "release/Adventures in Lestoria"
cp -R bin release
rm release/*.pdb rm release/*.pdb