gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / r_lightning.c

diff --git a/r_lightning.c b/r_lightning.c
index 639df83f4a18bee36c0806ce2ab89c5044e865d4..9290d7a011a0c9f6dab914118f4d64872cc4b18e 100644 (file)
--- a/r_lightning.c
+++ b/r_lightning.c
@@ -40,7 +40,11 @@ void r_lightningbeams_setuptexture(void)
        float particlex, particley, particlexv, particleyv, dx, dy, s, maxpathstrength;
        qbyte *pixels;
        int *image;
-       struct {float x, y, strength;} path[PATHPOINTS], temppath;
+       struct lightningpathnode_s
+       {
+               float x, y, strength;
+       }
+       path[PATHPOINTS], temppath;
 
        image = Mem_Alloc(tempmempool, BEAMWIDTH * BEAMHEIGHT * sizeof(int));
        pixels = Mem_Alloc(tempmempool, BEAMWIDTH * BEAMHEIGHT * sizeof(qbyte[4]));
@@ -114,9 +118,9 @@ void r_lightningbeams_setuptexture(void)
        int x, y;
        qbyte *data, *noise1, *noise2;
 
-       data = Mem_Alloc(tempmempool, BEAMWIDTH * BEAMHEIGHT * 4);
-       noise1 = Mem_Alloc(tempmempool, BEAMHEIGHT * BEAMHEIGHT);
-       noise2 = Mem_Alloc(tempmempool, BEAMHEIGHT * BEAMHEIGHT);
+       data = (qbyte *)Mem_Alloc(tempmempool, BEAMWIDTH * BEAMHEIGHT * 4);
+       noise1 = (qbyte *)Mem_Alloc(tempmempool, BEAMHEIGHT * BEAMHEIGHT);
+       noise2 = (qbyte *)Mem_Alloc(tempmempool, BEAMHEIGHT * BEAMHEIGHT);
        fractalnoise(noise1, BEAMHEIGHT, BEAMHEIGHT / 8);
        fractalnoise(noise2, BEAMHEIGHT, BEAMHEIGHT / 16);
 
@@ -229,7 +233,7 @@ float beamrepeatscale;
 
 void R_DrawLightningBeamCallback(const void *calldata1, int calldata2)
 {
-       const beam_t *b = calldata1;
+       const beam_t *b = (beam_t *)calldata1;
        rmeshstate_t m;
        vec3_t beamdir, right, up, offset;
        float length, t1, t2;