From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 25 Aug 2004 09:32:06 +0000 (+0000)
Subject: implemented loading of particles/particlefont.tga and particles/nexbeam.tga
X-Git-Tag: xonotic-v0.1.0preview~5698
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=818efa72622675162e7760da0c8423f215031abb;p=xonotic%2Fdarkplaces.git

implemented loading of particles/particlefont.tga and particles/nexbeam.tga


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4379 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_particles.c b/cl_particles.c
index 6f905785..2e0d9684 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -173,6 +173,7 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int
 }
 #else
 #include "cl_collision.h"
+#include "image.h"
 #endif
 
 #define MAX_PARTICLES			32768	// default max # of particles at one time
@@ -1758,11 +1759,13 @@ static void R_InitParticleTexture (void)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 #else
-	particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+	particlefonttexture = loadtextureimage(particletexturepool, "particles/particlefont.tga", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+	if (!particlefonttexture)
+		particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 	for (i = 0;i < MAX_PARTICLETEXTURES;i++)
 		particletexture[i].texture = particlefonttexture;
 
-	// beam
+	// nexbeam
 	fractalnoise(&noise1[0][0], 64, 4);
 	m = 0;
 	for (y = 0;y < 64;y++)
@@ -1779,7 +1782,9 @@ static void R_InitParticleTexture (void)
 		}
 	}
 
-	particletexture[tex_beam].texture = R_LoadTexture2D(particletexturepool, "beam", 16, 64, &data2[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+	particletexture[tex_beam].texture = loadtextureimage(particletexturepool, "particles/nexbeam.tga", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+	if (!particletexture[tex_beam].texture)
+		particletexture[tex_beam].texture = R_LoadTexture2D(particletexturepool, "nexbeam", 16, 64, &data2[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
 	particletexture[tex_beam].s1 = 0;
 	particletexture[tex_beam].t1 = 0;
 	particletexture[tex_beam].s2 = 1;