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

22
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();
@ -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();

4
src/render/WeaponEffects.cpp
View File

@ -33,8 +33,8 @@ CWeaponEffects::Init(void)
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);