summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-08 19:32:56 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-08 19:32:56 +0200
commit3e1062392e4a2408140523c63a9ee31f73adc9ca (patch)
treeb5874b74a32694de31d98791f17610d84796ef5f /src
parentfix (diff)
parentFix target sprite size (diff)
downloadre3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar.gz
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar.bz2
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar.lz
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar.xz
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.tar.zst
re3-3e1062392e4a2408140523c63a9ee31f73adc9ca.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/render/WeaponEffects.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index db36d766..18572573 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -9141,7 +9141,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
assert(pVehicle);
assert(pVehicle->m_vehType == VEHICLE_TYPE_CAR);
CAutomobile* pCar = (CAutomobile*)pVehicle;
- pCar->bTakeLessDamage = ScriptParams[1];
+ pCar->bMoreResistantToDamage = ScriptParams[1];
return 0;
}
case COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER:
diff --git a/src/render/WeaponEffects.cpp b/src/render/WeaponEffects.cpp
index 2ed9e662..3101def9 100644
--- a/src/render/WeaponEffects.cpp
+++ b/src/render/WeaponEffects.cpp
@@ -83,7 +83,7 @@ CWeaponEffects::Render(void)
{
float recipz = 1.0f / 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,
recipz, 255);
}