fix mailbox particle

This commit is contained in:
Fire-Head 2021-02-15 21:29:11 +03:00
parent 08f0f275af
commit 78f4e8fdca
1 changed files with 16 additions and 17 deletions

View File

@ -50,6 +50,8 @@
#define MAX_RAINDRIP_FILES (2) #define MAX_RAINDRIP_FILES (2)
#define MAX_LEAF_FILES (2)
const char SmokeFiles[][6+1] = const char SmokeFiles[][6+1] =
{ {
@ -166,7 +168,7 @@ RwTexture *gpFlame1Tex;
RwTexture *gpFlame5Tex; RwTexture *gpFlame5Tex;
RwTexture *gpRainDropSmallTex; RwTexture *gpRainDropSmallTex;
RwTexture *gpBloodTex; RwTexture *gpBloodTex;
RwTexture *gpLeafTex; RwTexture *gpLeafTex[MAX_LEAF_FILES];
RwTexture *gpCloudTex1; RwTexture *gpCloudTex1;
RwTexture *gpCloudTex4; RwTexture *gpCloudTex4;
RwTexture *gpBloodSmallTex; RwTexture *gpBloodSmallTex;
@ -194,7 +196,7 @@ RwRaster *gpFlame1Raster;
RwRaster *gpFlame5Raster; RwRaster *gpFlame5Raster;
RwRaster *gpRainDropSmallRaster; RwRaster *gpRainDropSmallRaster;
RwRaster *gpBloodRaster; RwRaster *gpBloodRaster;
RwRaster *gpLeafRaster; RwRaster *gpLeafRaster[MAX_LEAF_FILES];
RwRaster *gpCloudRaster1; RwRaster *gpCloudRaster1;
RwRaster *gpCloudRaster4; RwRaster *gpCloudRaster4;
RwRaster *gpBloodSmallRaster; RwRaster *gpBloodSmallRaster;
@ -207,9 +209,6 @@ RwRaster *gpPointlightRaster;
RwTexture *gpRainDropTex; RwTexture *gpRainDropTex;
RwRaster *gpRainDropRaster; RwRaster *gpRainDropRaster;
RwTexture *gpLetterTex;
RwRaster *gpLetterRaster;
RwTexture *gpSparkTex; RwTexture *gpSparkTex;
RwTexture *gpNewspaperTex; RwTexture *gpNewspaperTex;
RwTexture *gpGunSmokeTex; RwTexture *gpGunSmokeTex;
@ -430,13 +429,13 @@ void CParticle::Initialise()
ASSERT(gpBloodTex != nil); ASSERT(gpBloodTex != nil);
gpBloodRaster = RwTextureGetRaster(gpBloodTex); gpBloodRaster = RwTextureGetRaster(gpBloodTex);
gpLeafTex = RwTextureRead("gameleaf01_64", nil); gpLeafTex[0] = RwTextureRead("gameleaf01_64", nil);
ASSERT(gpLeafTex != nil); ASSERT(gpLeafTex[0] != nil);
gpLeafRaster = RwTextureGetRaster(gpLeafTex); gpLeafRaster[0] = RwTextureGetRaster(gpLeafTex[0]);
gpLetterTex = RwTextureRead("letter", nil); gpLeafTex[1] = RwTextureRead("letter", nil);
ASSERT(gpLetterTex != nil); ASSERT(gpLeafTex[1] != nil);
gpLetterRaster = RwTextureGetRaster(gpLetterTex); gpLeafRaster[1] = RwTextureGetRaster(gpLeafTex[1]);
gpCloudTex1 = RwTextureRead("cloud3", nil); gpCloudTex1 = RwTextureRead("cloud3", nil);
ASSERT(gpCloudTex1 != nil); ASSERT(gpCloudTex1 != nil);
@ -555,7 +554,7 @@ void CParticle::Initialise()
break; break;
case PARTICLE_DEBRIS: case PARTICLE_DEBRIS:
entry->m_ppRaster = &gpLeafRaster; entry->m_ppRaster = gpLeafRaster;
break; break;
case PARTICLE_DEBRIS2: case PARTICLE_DEBRIS2:
@ -750,7 +749,7 @@ void CParticle::Initialise()
break; break;
case PARTICLE_TREE_LEAVES: case PARTICLE_TREE_LEAVES:
entry->m_ppRaster = &gpLeafRaster; entry->m_ppRaster = gpLeafRaster;
break; break;
case PARTICLE_CARCOLLISION_DUST: case PARTICLE_CARCOLLISION_DUST:
@ -929,11 +928,11 @@ void CParticle::Shutdown()
RwTextureDestroy(gpBloodTex); RwTextureDestroy(gpBloodTex);
gpBloodTex = nil; gpBloodTex = nil;
RwTextureDestroy(gpLeafTex); RwTextureDestroy(gpLeafTex[0]);
gpLeafTex = nil; gpLeafTex[0] = nil;
RwTextureDestroy(gpLetterTex); RwTextureDestroy(gpLeafTex[1]);
gpLetterTex = nil; gpLeafTex[1] = nil;
RwTextureDestroy(gpCloudTex1); RwTextureDestroy(gpCloudTex1);
gpCloudTex1 = nil; gpCloudTex1 = nil;