fix a bunch of warnings if compiling darkplaces as C++ in MSVC2008

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index c6ae068d56970378f80d03aa3f93f131f18610c8..dc181b09356ab2d376a42a743ae1fb98b32987a2 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -1941,7 +1941,7 @@ static void R_InitBloodTextures (unsigned char *particletexturedata)
 {
        int i, j, k, m;
        size_t datasize = PARTICLETEXTURESIZE*PARTICLETEXTURESIZE*4;
-       unsigned char *data = Mem_Alloc(tempmempool, datasize);
+       unsigned char *data = (unsigned char *)Mem_Alloc(tempmempool, datasize);
 
        // blood particles
        for (i = 0;i < 8;i++)
@@ -2157,7 +2157,7 @@ static void R_InitParticleTexture (void)
        }
 
 #ifndef DUMPPARTICLEFONT
-       particletexture[tex_beam].texture = loadtextureimage(particletexturepool, "particles/nexbeam.tga", false, TEXF_ALPHA | TEXF_FORCELINEAR, true, r_texture_convertsRGB_particles.integer);
+       particletexture[tex_beam].texture = loadtextureimage(particletexturepool, "particles/nexbeam.tga", false, TEXF_ALPHA | TEXF_FORCELINEAR, true, r_texture_convertsRGB_particles.integer != 0);
        if (!particletexture[tex_beam].texture)
 #endif
        {