reverted Black's change to the effectinfo.txt color command

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

diff --git a/cl_particles.c b/cl_particles.c
index d4e1428a5f861d969b228fe02a17b6f720e5f50e..eedceaa508ab1d2338b4d9bde83bc27183054160 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -293,6 +293,10 @@ 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]);
                }
+#if 1
+               else if (!strcmp(argv[0], "color")) {readints(info->color, 2);}
+#else
+               // LordHavoc: Black committed this without consulting with me, it breaks parsing of effectinfo.txt and thus I can't accept it
                else if (!strcmp(argv[0], "color")) 
                {
                        unsigned color[6] = {0};
@@ -302,6 +306,7 @@ void CL_Particles_ParseEffectInfo(const char *textstart, const char *textend)
                        info->color[0] = color[0] + (color[1] << 8) + (color[2] << 16);
                        info->color[1] = color[3] + (color[4] << 8) + (color[5] << 16);
                }
+#endif
                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);}