mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 05:20:01 +00:00
added NO_MOVIES
This commit is contained in:
parent
aa1163ccb2
commit
0c495cb188
|
@ -125,7 +125,7 @@ inline float sq(float x) { return x*x; }
|
||||||
#define DEGTORAD(x) ((x) * PI / 180.0f)
|
#define DEGTORAD(x) ((x) * PI / 180.0f)
|
||||||
#define RADTODEG(x) ((x) * 180.0f / PI)
|
#define RADTODEG(x) ((x) * 180.0f / PI)
|
||||||
|
|
||||||
#if USE_PS2_RAND == TRUE
|
#ifdef USE_PS2_RAND
|
||||||
#define MYRAND_MAX 65535
|
#define MYRAND_MAX 65535
|
||||||
#else
|
#else
|
||||||
#define MYRAND_MAX 32767
|
#define MYRAND_MAX 32767
|
||||||
|
|
|
@ -57,7 +57,10 @@ enum Config {
|
||||||
NUMPOINTLIGHTS = 32
|
NUMPOINTLIGHTS = 32
|
||||||
};
|
};
|
||||||
|
|
||||||
#define GTA3_1_1_PATCH FALSE
|
#define GTA3_1_1_PATCH
|
||||||
#define USE_PS2_RAND FALSE
|
#define USE_PS2_RAND
|
||||||
#define RANDOMSPLASH
|
#define RANDOMSPLASH
|
||||||
#define CHATTYSPLASH
|
#define CHATTYSPLASH
|
||||||
|
//#define FIX_BUGS
|
||||||
|
//#define NO_CDCHECK
|
||||||
|
#define NO_MOVIES
|
||||||
|
|
|
@ -21,7 +21,7 @@ WRAPPER void gtadelete(void *p) { EAXJMP(0x5A07E0); }
|
||||||
void *operator new(size_t sz) { return gtanew(sz); }
|
void *operator new(size_t sz) { return gtanew(sz); }
|
||||||
void operator delete(void *ptr) noexcept { gtadelete(ptr); }
|
void operator delete(void *ptr) noexcept { gtadelete(ptr); }
|
||||||
|
|
||||||
#if USE_PS2_RAND == TRUE
|
#ifdef USE_PS2_RAND
|
||||||
unsigned __int64 myrand_seed = 1;
|
unsigned __int64 myrand_seed = 1;
|
||||||
#else
|
#else
|
||||||
unsigned long int myrand_seed = 1;
|
unsigned long int myrand_seed = 1;
|
||||||
|
@ -30,7 +30,7 @@ unsigned long int myrand_seed = 1;
|
||||||
int
|
int
|
||||||
myrand(void)
|
myrand(void)
|
||||||
{
|
{
|
||||||
#if USE_PS2_RAND == TRUE
|
#ifdef USE_PS2_RAND
|
||||||
// Use our own implementation of rand, stolen from PS2
|
// Use our own implementation of rand, stolen from PS2
|
||||||
myrand_seed = 0x5851F42D4C957F2D * myrand_seed + 1;
|
myrand_seed = 0x5851F42D4C957F2D * myrand_seed + 1;
|
||||||
return ((myrand_seed >> 32) & 0x7FFFFFFF);
|
return ((myrand_seed >> 32) & 0x7FFFFFFF);
|
||||||
|
|
|
@ -587,7 +587,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_SMOKE_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_SMOKE_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpSmokeTex[i]);
|
RwTextureDestroy(gpSmokeTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpSmokeTex[i] = NULL;
|
gpSmokeTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -595,7 +595,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpSmoke2Tex[i]);
|
RwTextureDestroy(gpSmoke2Tex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpSmoke2Tex[i] = NULL;
|
gpSmoke2Tex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -603,7 +603,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_RUBBER_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_RUBBER_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpRubberTex[i]);
|
RwTextureDestroy(gpRubberTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpRubberTex[i] = NULL;
|
gpRubberTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -611,7 +611,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_RAINSPLASH_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_RAINSPLASH_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpRainSplashTex[i]);
|
RwTextureDestroy(gpRainSplashTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpRainSplashTex[i] = NULL;
|
gpRainSplashTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -619,7 +619,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_WATERSPRAY_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_WATERSPRAY_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpWatersprayTex[i]);
|
RwTextureDestroy(gpWatersprayTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpWatersprayTex[i] = NULL;
|
gpWatersprayTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -627,7 +627,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_EXPLOSIONMEDIUM_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_EXPLOSIONMEDIUM_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpExplosionMediumTex[i]);
|
RwTextureDestroy(gpExplosionMediumTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpExplosionMediumTex[i] = NULL;
|
gpExplosionMediumTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -635,7 +635,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpGunFlashTex[i]);
|
RwTextureDestroy(gpGunFlashTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpGunFlashTex[i] = NULL;
|
gpGunFlashTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -643,7 +643,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpRainDropTex[i]);
|
RwTextureDestroy(gpRainDropTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpRainDropTex[i] = NULL;
|
gpRainDropTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -651,7 +651,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpRainSplashupTex[i]);
|
RwTextureDestroy(gpRainSplashupTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpRainSplashupTex[i] = NULL;
|
gpRainSplashupTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -659,7 +659,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpBirdfrontTex[i]);
|
RwTextureDestroy(gpBirdfrontTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpBirdfrontTex[i] = NULL;
|
gpBirdfrontTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -667,7 +667,7 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpCarDebrisTex[i]);
|
RwTextureDestroy(gpCarDebrisTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpCarDebrisTex[i] = NULL;
|
gpCarDebrisTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -675,78 +675,78 @@ void CParticle::Shutdown()
|
||||||
for ( Int32 i = 0; i < MAX_CARSPLASH_FILES; i++ )
|
for ( Int32 i = 0; i < MAX_CARSPLASH_FILES; i++ )
|
||||||
{
|
{
|
||||||
RwTextureDestroy(gpCarSplashTex[i]);
|
RwTextureDestroy(gpCarSplashTex[i]);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpCarSplashTex[i] = NULL;
|
gpCarSplashTex[i] = NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
RwTextureDestroy(gpFlame1Tex);
|
RwTextureDestroy(gpFlame1Tex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpFlame1Tex = NULL;
|
gpFlame1Tex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpFlame5Tex);
|
RwTextureDestroy(gpFlame5Tex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpFlame5Tex = NULL;
|
gpFlame5Tex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpRainDropSmallTex);
|
RwTextureDestroy(gpRainDropSmallTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpRainDropSmallTex = NULL;
|
gpRainDropSmallTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpBloodTex);
|
RwTextureDestroy(gpBloodTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpBloodTex = NULL;
|
gpBloodTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpLeafTex);
|
RwTextureDestroy(gpLeafTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpLeafTex = NULL;
|
gpLeafTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpCloudTex1);
|
RwTextureDestroy(gpCloudTex1);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpCloudTex1 = NULL;
|
gpCloudTex1 = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpCloudTex4);
|
RwTextureDestroy(gpCloudTex4);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpCloudTex4 = NULL;
|
gpCloudTex4 = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpBloodSmallTex);
|
RwTextureDestroy(gpBloodSmallTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpBloodSmallTex = NULL;
|
gpBloodSmallTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpGungeTex);
|
RwTextureDestroy(gpGungeTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpGungeTex = NULL;
|
gpGungeTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpCollisionSmokeTex);
|
RwTextureDestroy(gpCollisionSmokeTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpCollisionSmokeTex = NULL;
|
gpCollisionSmokeTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpBulletHitTex);
|
RwTextureDestroy(gpBulletHitTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpBulletHitTex = NULL;
|
gpBulletHitTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpGunShellTex);
|
RwTextureDestroy(gpGunShellTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpGunShellTex = NULL;
|
gpGunShellTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpWakeOldTex);
|
RwTextureDestroy(gpWakeOldTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpWakeOldTex = NULL;
|
gpWakeOldTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RwTextureDestroy(gpPointlightTex);
|
RwTextureDestroy(gpPointlightTex);
|
||||||
#if GTA3_1_1_PATCH == TRUE
|
#ifdef GTA3_1_1_PATCH
|
||||||
gpPointlightTex = NULL;
|
gpPointlightTex = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1906,6 +1906,17 @@ _WinMain(HINSTANCE instance,
|
||||||
|
|
||||||
SetErrorMode(SEM_FAILCRITICALERRORS);
|
SetErrorMode(SEM_FAILCRITICALERRORS);
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef NO_MOVIES
|
||||||
|
gGameState = GS_INIT_FRONTEND;
|
||||||
|
TRACE("gGameState = GS_INIT_FRONTEND");
|
||||||
|
|
||||||
|
LoadingScreen(NULL, NULL, "loadsc0");
|
||||||
|
if ( !CGame::InitialiseOnceAfterRW() )
|
||||||
|
RsGlobal.quit = TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
while ( TRUE )
|
while ( TRUE )
|
||||||
{
|
{
|
||||||
RwInitialised = TRUE;
|
RwInitialised = TRUE;
|
||||||
|
|
Loading…
Reference in a new issue