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

all my fixes live in exes

Browse source
This commit is contained in:
eray orçunus 2020-05-24 16:41:29 +03:00
parent 3fdd352ca2
commit 14755a4ff4
5 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/main.cpp
View file

@ -137,9 +137,13 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha); CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha);
CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha); CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
#ifndef ASPECT_RATIO_SCALE
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f / 9.f : 4.f / 3.f));
#else
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO); CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera); CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ); RwCameraClear(Scene.camera, &TopColor.rwRGBA, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera)) if(!RsCameraBeginUpdate(Scene.camera))
return false; return false;
@ -155,7 +159,11 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
bool bool
DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha) DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
{ {
#ifndef ASPECT_RATIO_SCALE
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f/9.f : 4.f/3.f));
#else
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO); CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera); CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ); RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);

2
src/peds/PlayerPed.cpp
View file

@ -227,7 +227,7 @@ CPlayerPed::SetInitialState(void)
{ {
m_bAdrenalineActive = false; m_bAdrenalineActive = false;
m_nAdrenalineTime = 0; m_nAdrenalineTime = 0;
CTimer::SetTimeStep(1.0f); CTimer::SetTimeScale(1.0f);
m_pSeekTarget = nil; m_pSeekTarget = nil;
m_vecSeekPos = { 0.0f, 0.0f, 0.0f }; m_vecSeekPos = { 0.0f, 0.0f, 0.0f };
m_fleeFromPosX = 0.0f; m_fleeFromPosX = 0.0f;

26
src/weapons/Weapon.cpp
View file

@ -241,42 +241,41 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
} }
} }
if ( fired ) if (fired)
{ {
bool isPlayer = false; bool isPlayer = false;
if ( shooter->IsPed() ) if (shooter->IsPed())
{ {
CPed *shooterPed = (CPed*)shooter; CPed* shooterPed = (CPed*)shooter;
shooterPed->bIsShooting = true; shooterPed->bIsShooting = true;
if ( shooterPed->IsPlayer() ) if (shooterPed->IsPlayer())
isPlayer = true; isPlayer = true;
DMAudio.PlayOneShot(shooterPed->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f); DMAudio.PlayOneShot(shooterPed->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
} }
if ( m_nAmmoInClip > 0 ) m_nAmmoInClip--; if (m_nAmmoInClip > 0) m_nAmmoInClip--;
if ( m_nAmmoTotal > 0 && (m_nAmmoTotal < 25000 || isPlayer) ) m_nAmmoTotal--; if (m_nAmmoTotal > 0 && (m_nAmmoTotal < 25000 || isPlayer)) m_nAmmoTotal--;
if ( m_eWeaponState == WEAPONSTATE_READY && m_eWeaponType == WEAPONTYPE_FLAMETHROWER ) if (m_eWeaponState == WEAPONSTATE_READY && m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
DMAudio.PlayOneShot(((CPhysical*)shooter)->m_audioEntityId, SOUND_WEAPON_FLAMETHROWER_FIRE, 0.0f); DMAudio.PlayOneShot(((CPhysical*)shooter)->m_audioEntityId, SOUND_WEAPON_FLAMETHROWER_FIRE, 0.0f);
m_eWeaponState = WEAPONSTATE_FIRING; m_eWeaponState = WEAPONSTATE_FIRING;
}
if ( m_nAmmoInClip == 0 ) if (m_nAmmoInClip == 0)
{ {
if ( m_nAmmoTotal == 0 ) if (m_nAmmoTotal == 0)
return true; return true;
m_eWeaponState = WEAPONSTATE_RELOADING; m_eWeaponState = WEAPONSTATE_RELOADING;
m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload; m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload;
if ( shooter == FindPlayerPed() ) if (shooter == FindPlayerPed())
{ {
if ( CWorld::Players[CWorld::PlayerInFocus].m_bFastReload ) if (CWorld::Players[CWorld::PlayerInFocus].m_bFastReload)
m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload / 4; m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload / 4;
} }
@ -284,9 +283,10 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
} }
m_nTimer = CTimer::GetTimeInMilliseconds() + 1000; m_nTimer = CTimer::GetTimeInMilliseconds() + 1000;
if ( shooter == FindPlayerPed() ) if (shooter == FindPlayerPed())
CStats::RoundsFiredByPlayer++; CStats::RoundsFiredByPlayer++;
} }
}
else else
{ {
if ( m_eWeaponState != WEAPONSTATE_FIRING ) if ( m_eWeaponState != WEAPONSTATE_FIRING )

4
src/weapons/Weapon.h
View file

@ -16,8 +16,8 @@ class CWeapon
public: public:
eWeaponType m_eWeaponType; eWeaponType m_eWeaponType;
eWeaponState m_eWeaponState; eWeaponState m_eWeaponState;
uint32 m_nAmmoInClip; int32 m_nAmmoInClip;
uint32 m_nAmmoTotal; int32 m_nAmmoTotal;
uint32 m_nTimer; uint32 m_nTimer;
bool m_bAddRotOffset; bool m_bAddRotOffset;

4
src/weapons/WeaponInfo.h
View file

@ -5,13 +5,13 @@
class CWeaponInfo { class CWeaponInfo {
// static CWeaponInfo(&ms_apWeaponInfos)[14]; // static CWeaponInfo(&ms_apWeaponInfos)[14];
static CWeaponInfo ms_apWeaponInfos[14]; static CWeaponInfo ms_apWeaponInfos[WEAPONTYPE_LAST_WEAPONTYPE];
public: public:
eWeaponFire m_eWeaponFire; eWeaponFire m_eWeaponFire;
float m_fRange; float m_fRange;
uint32 m_nFiringRate; uint32 m_nFiringRate;
uint32 m_nReload; uint32 m_nReload;
uint32 m_nAmountofAmmunition; int32 m_nAmountofAmmunition;
uint32 m_nDamage; uint32 m_nDamage;
float m_fSpeed; float m_fSpeed;
float m_fRadius; float m_fRadius;