From b6061d256d9e282ec64dafea71074f27122a604e Mon Sep 17 00:00:00 2001 From: black Date: Mon, 10 Apr 2006 20:41:57 +0000 Subject: [PATCH] An attempt to fix the particle color bug (it coudlnt read hex values). Also extend it to make it support "R G B" color pairs. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6263 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_particles.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cl_particles.c b/cl_particles.c index 72d4d8ca..d4e1428a 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -293,7 +293,15 @@ void CL_Particles_ParseEffectInfo(const char *textstart, const char *textend) else if (!strcmp(argv[1], "entityparticle")) info->particletype = pt_entityparticle; else Con_Printf("effectinfo.txt:%i: unrecognized particle type %s\n", linenumber, argv[1]); } - else if (!strcmp(argv[0], "color")) {readints(info->color, 2);} + else if (!strcmp(argv[0], "color")) + { + unsigned color[6] = {0}; + checkparms(3); + sscanf( argv[1], "%i %i %i", &color[0], &color[1], &color[2] ); + sscanf( argv[2], "%i %i %i", &color[3], &color[4], &color[5] ); + info->color[0] = color[0] + (color[1] << 8) + (color[2] << 16); + info->color[1] = color[3] + (color[4] << 8) + (color[5] << 16); + } else if (!strcmp(argv[0], "tex")) {readints(info->tex, 2);} else if (!strcmp(argv[0], "size")) {readfloats(info->size, 2);} else if (!strcmp(argv[0], "alpha")) {readfloats(info->alpha, 3);} -- 2.39.2