Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

style & cosmetic fixes

Browse Source
This commit is contained in:
Fire-Head 2020-03-29 16:32:11 +03:00
parent 194ddc5f40
commit d53c151ffc
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/Game.cpp
View File

@ -121,29 +121,29 @@ CGame::InitialiseRenderWare(void)
/* Create camera */ /* Create camera */
Scene.camera = CameraCreate(RsGlobal.width, RsGlobal.height, TRUE); Scene.camera = CameraCreate(RsGlobal.width, RsGlobal.height, TRUE);
ASSERT(Scene.camera != NULL); ASSERT(Scene.camera != nil);
if (!Scene.camera) if (!Scene.camera)
{ {
return (false); return (false);
} }
RwCameraSetFarClipPlane(Scene.camera, (RwReal) (2000.0)); RwCameraSetFarClipPlane(Scene.camera, 2000.0f);
RwCameraSetNearClipPlane(Scene.camera, (RwReal) (0.9)); RwCameraSetNearClipPlane(Scene.camera, 0.9f);
CameraSize(Scene.camera, NULL, DEFAULT_VIEWWINDOW, DEFAULT_ASPECT_RATIO); CameraSize(Scene.camera, nil, DEFAULT_VIEWWINDOW, DEFAULT_ASPECT_RATIO);
/* Create a world */ /* Create a world */
RwBBox bbox; RwBBox bbox;
bbox.sup.x = bbox.sup.y = bbox.sup.z = (RwReal)(10000.0); bbox.sup.x = bbox.sup.y = bbox.sup.z = 10000.0f;
bbox.inf.x = bbox.inf.y = bbox.inf.z = (RwReal)(-10000.0); bbox.inf.x = bbox.inf.y = bbox.inf.z = -10000.0f;
Scene.world = RpWorldCreate(&bbox); Scene.world = RpWorldCreate(&bbox);
ASSERT(Scene.world != NULL); ASSERT(Scene.world != nil);
if (!Scene.world) if (!Scene.world)
{ {
CameraDestroy(Scene.camera); CameraDestroy(Scene.camera);
Scene.camera = NULL; Scene.camera = nil;
return (false); return (false);
} }
@ -182,8 +182,8 @@ void CGame::ShutdownRenderWare(void)
/* destroy camera */ /* destroy camera */
CameraDestroy(Scene.camera); CameraDestroy(Scene.camera);
Scene.world = NULL; Scene.world = nil;
Scene.camera = NULL; Scene.camera = nil;
CVisibilityPlugins::Shutdown(); CVisibilityPlugins::Shutdown();
@ -233,7 +233,7 @@ bool CGame::InitialiseOnceAfterRW(void)
DMAudio.SetEffectsFadeVol(127); DMAudio.SetEffectsFadeVol(127);
DMAudio.SetMusicFadeVol(127); DMAudio.SetMusicFadeVol(127);
CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile); CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
return true; return true;
} }
@ -411,7 +411,7 @@ bool CGame::ShutDown(void)
{ {
CWorld::Remove(CWorld::Players[i].m_pPed); CWorld::Remove(CWorld::Players[i].m_pPed);
delete CWorld::Players[i].m_pPed; delete CWorld::Players[i].m_pPed;
CWorld::Players[i].m_pPed = NULL; CWorld::Players[i].m_pPed = nil;
} }
CWorld::Players[i].Clear(); CWorld::Players[i].Clear();
@ -490,7 +490,7 @@ void CGame::ReInitGameObjectVariables(void)
CWaterCannons::Init(); CWaterCannons::Init();
CParticle::ReloadConfig(); CParticle::ReloadConfig();
CCullZones::ResolveVisibilities(); CCullZones::ResolveVisibilities();
if ( !FrontEndMenuManager.m_bLoadingSavedGame ) if ( !FrontEndMenuManager.m_bLoadingSavedGame )
{ {
CCranes::InitCranes(); CCranes::InitCranes();
@ -535,7 +535,7 @@ void CGame::ShutDownForRestart(void)
for (int i = 0; i < NUMPLAYERS; i++) for (int i = 0; i < NUMPLAYERS; i++)
CWorld::Players[i].Clear(); CWorld::Players[i].Clear();
CGarages::SetAllDoorsBackToOriginalHeight(); CGarages::SetAllDoorsBackToOriginalHeight();
CTheScripts::UndoBuildingSwaps(); CTheScripts::UndoBuildingSwaps();
CTheScripts::UndoEntityInvisibilitySettings(); CTheScripts::UndoEntityInvisibilitySettings();

36
src/render/WeaponEffects.cpp
View File

@ -22,24 +22,24 @@ CWeaponEffects::~CWeaponEffects()
void void
CWeaponEffects::Init(void) CWeaponEffects::Init(void)
{ {
gCrossHair.m_bActive = false; gCrossHair.m_bActive = false;
gCrossHair.m_vecPos = CVector(0.0f, 0.0f, 0.0f); gCrossHair.m_vecPos = CVector(0.0f, 0.0f, 0.0f);
gCrossHair.m_nRed = 0; gCrossHair.m_nRed = 0;
gCrossHair.m_nGreen = 0; gCrossHair.m_nGreen = 0;
gCrossHair.m_nBlue = 0; gCrossHair.m_nBlue = 0;
gCrossHair.m_nAlpha = 255; gCrossHair.m_nAlpha = 255;
gCrossHair.m_fSize = 1.0f; gCrossHair.m_fSize = 1.0f;
gCrossHair.m_fRotation = 0.0f; gCrossHair.m_fRotation = 0.0f;
CTxdStore::PushCurrentTxd(); CTxdStore::PushCurrentTxd();
int32 slut = CTxdStore::FindTxdSlot("particle"); int32 slot = CTxdStore::FindTxdSlot("particle");
CTxdStore::SetCurrentTxd(slut); CTxdStore::SetCurrentTxd(slot);
gpCrossHairTex = RwTextureRead("crosshair", NULL); gpCrossHairTex = RwTextureRead("crosshair", NULL);
gpCrossHairRaster = RwTextureGetRaster(gpCrossHairTex); gpCrossHairRaster = RwTextureGetRaster(gpCrossHairTex);
CTxdStore::PopCurrentTxd(); CTxdStore::PopCurrentTxd();
} }
void void
@ -51,13 +51,13 @@ CWeaponEffects::Shutdown(void)
void void
CWeaponEffects::MarkTarget(CVector pos, uint8 red, uint8 green, uint8 blue, uint8 alpha, float size) CWeaponEffects::MarkTarget(CVector pos, uint8 red, uint8 green, uint8 blue, uint8 alpha, float size)
{ {
gCrossHair.m_bActive = true; gCrossHair.m_bActive = true;
gCrossHair.m_vecPos = pos; gCrossHair.m_vecPos = pos;
gCrossHair.m_nRed = red; gCrossHair.m_nRed = red;
gCrossHair.m_nGreen = green; gCrossHair.m_nGreen = green;
gCrossHair.m_nBlue = blue; gCrossHair.m_nBlue = blue;
gCrossHair.m_nAlpha = alpha; gCrossHair.m_nAlpha = alpha;
gCrossHair.m_fSize = size; gCrossHair.m_fSize = size;
} }
void void