all my fixes live in exes
This commit is contained in:
parent
3fdd352ca2
commit
14755a4ff4
@ -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);
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -264,7 +264,6 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
|
|||||||
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)
|
||||||
{
|
{
|
||||||
@ -287,6 +286,7 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
|
|||||||
if (shooter == FindPlayerPed())
|
if (shooter == FindPlayerPed())
|
||||||
CStats::RoundsFiredByPlayer++;
|
CStats::RoundsFiredByPlayer++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( m_eWeaponState != WEAPONSTATE_FIRING )
|
if ( m_eWeaponState != WEAPONSTATE_FIRING )
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user