archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 17:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded double to float casts

Browse Source
This commit is contained in:
Filip Gawin
2020-02-25 20:54:26 +01:00
parent 8f01eab5ab
commit c88c2115e2
6 changed files with 341 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/control/Bridge.cpp
View File

@ -60,7 +60,7 @@ void CBridge::Update()
if (timeElapsed < 10000)
{
State = STATE_LIFT_PART_MOVING_DOWN;
liftHeight = 25.0 - timeElapsed / 10000.0 * 25.0f;
liftHeight = 25.0f - timeElapsed / 10000.0f * 25.0f;
}
else if (timeElapsed < 40000)
{
@ -75,7 +75,7 @@ void CBridge::Update()
else if (timeElapsed < 60000)
{
State = STATE_LIFT_PART_MOVING_UP;
liftHeight = (timeElapsed - 50000) / 10000.0 * 25.0f;
liftHeight = (timeElapsed - 50000) / 10000.0f * 25.0f;
}
else
{
@ -151,4 +151,4 @@ STARTPATCHES
InjectHook(0x413D10, &CBridge::ShouldLightsBeFlashing, PATCH_JUMP);
InjectHook(0x413D20, &CBridge::FindBridgeEntities, PATCH_JUMP);
InjectHook(0x413DE0, &CBridge::ThisIsABridgeObjectMovingUp, PATCH_JUMP);
ENDPATCHES
ENDPATCHES

6
src/control/Pickups.cpp
View File

@ -704,9 +704,9 @@ CPickups::DoPickUpEffects(CEntity *entity)
aWeaponReds[colorId] * colorModifier, aWeaponGreens[colorId] * colorModifier, aWeaponBlues[colorId] * colorModifier,
4.0f, 1.0f, 40.0f, false, 0.0f);
float radius = (double)(rand() & 0xF) * 0.1 + 3.0f;
float radius = (rand() & 0xF) * 0.1f + 3.0f;
CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f), radius, aWeaponReds[colorId] * modifiedSin / 256.0f, aWeaponGreens[colorId] * modifiedSin / 256.0f, aWeaponBlues[colorId] * modifiedSin / 256.0f, CPointLights::FOG_NONE, true);
float size = (double)(rand() & 0xF) * 0.0005 + 0.6;
float size = (rand() & 0xF) * 0.0005f + 0.6f;
CCoronas::RegisterCorona( (uintptr)entity,
aWeaponReds[colorId] * modifiedSin / 2.0f, aWeaponGreens[colorId] * modifiedSin / 2.0f, aWeaponBlues[colorId] * modifiedSin / 2.0f,
255,
@ -1044,4 +1044,4 @@ STARTPATCHES
InjectHook(0x433E40, CPickups::Save, PATCH_JUMP);
InjectHook(0x433BA0, &CPickup::GiveUsAPickUpObject, PATCH_JUMP);
InjectHook(0x430860, &CPickup::Update, PATCH_JUMP);
ENDPATCHES
ENDPATCHES