a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 20:20:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into garages_dev

Browse source
This commit is contained in:
Nikolay Korolev 2020-04-08 20:32:56 +03:00
parent b3571706d1 5a034097c9
commit 3e1062392e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/control/Script.cpp
View file

@ -9141,7 +9141,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
assert(pVehicle); assert(pVehicle);
assert(pVehicle->m_vehType == VEHICLE_TYPE_CAR); assert(pVehicle->m_vehType == VEHICLE_TYPE_CAR);
CAutomobile* pCar = (CAutomobile*)pVehicle; CAutomobile* pCar = (CAutomobile*)pVehicle;
pCar->bTakeLessDamage = ScriptParams[1]; pCar->bMoreResistantToDamage = ScriptParams[1];
return 0; return 0;
} }
case COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER: case COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER:

2
src/render/WeaponEffects.cpp
View file

@ -83,7 +83,7 @@ CWeaponEffects::Render(void)
{ {
float recipz = 1.0f / pos.z; float recipz = 1.0f / pos.z;
CSprite::RenderOneXLUSprite(pos.x, pos.y, pos.z, CSprite::RenderOneXLUSprite(pos.x, pos.y, pos.z,
gCrossHair.m_fSize * w, gCrossHair.m_fSize * h, gCrossHair.m_fSize * w, gCrossHair.m_fSize * SCREEN_SCALE_AR2(h),
gCrossHair.m_nRed, gCrossHair.m_nGreen, gCrossHair.m_nBlue, 255, gCrossHair.m_nRed, gCrossHair.m_nGreen, gCrossHair.m_nBlue, 255,
recipz, 255); recipz, 255);
} }