mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-06-01 17:12:15 +00:00
some build fixes, which I'm not sure are right, and a fix for
fullscreen toggling.
This commit is contained in:
parent
2a027969d5
commit
c6ec43d659
3 changed files with 15 additions and 6 deletions
|
@ -192,6 +192,8 @@ R_RunSpikeEffect (vec3_t pos, particle_effect_t type)
|
||||||
case PE_SUPERSPIKE:
|
case PE_SUPERSPIKE:
|
||||||
R_RunParticleEffect (pos, 0, 20);
|
R_RunParticleEffect (pos, 0, 20);
|
||||||
break;
|
break;
|
||||||
|
default: // FIXME: this right?
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -211,6 +213,8 @@ R_RunPuffEffect (vec3_t pos, particle_effect_t type, byte cnt)
|
||||||
case PE_LIGHTNINGBLOOD:
|
case PE_LIGHTNINGBLOOD:
|
||||||
R_RunParticleEffect (pos, 225, 50);
|
R_RunParticleEffect (pos, 225, 50);
|
||||||
break;
|
break;
|
||||||
|
default: // FIXME: this right?
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -601,6 +605,8 @@ R_DrawParticles (void)
|
||||||
case pt_grav:
|
case pt_grav:
|
||||||
p->vel[2] -= grav;
|
p->vel[2] -= grav;
|
||||||
break;
|
break;
|
||||||
|
default: // FIXME: is this right?
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,7 @@ void
|
||||||
Skin_Set_Translate (int top, int bottom, void *_dest)
|
Skin_Set_Translate (int top, int bottom, void *_dest)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
byte *dest2; // FIXME: bleargh, this needs cleaning up
|
||||||
|
|
||||||
top = bound (0, top, 13) * 16;
|
top = bound (0, top, 13) * 16;
|
||||||
bottom = bound (0, bottom, 13) * 16;
|
bottom = bound (0, bottom, 13) * 16;
|
||||||
|
@ -149,25 +150,25 @@ Skin_Set_Translate (int top, int bottom, void *_dest)
|
||||||
r_pixbytes);
|
r_pixbytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
byte *dest = (byte *) _dest;
|
dest2 = (byte *) _dest;
|
||||||
|
|
||||||
for (j = 0;j < 256;j++)
|
for (j = 0;j < 256;j++)
|
||||||
dest[j] = d_8to24table[j];
|
dest2[j] = d_8to24table[j];
|
||||||
|
|
||||||
if (top < 128) {
|
if (top < 128) {
|
||||||
for (j = 0;j < 16;j++)
|
for (j = 0;j < 16;j++)
|
||||||
dest[TOP_RANGE + j] = d_8to24table[top + j];
|
dest2[TOP_RANGE + j] = d_8to24table[top + j];
|
||||||
} else {
|
} else {
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
dest[TOP_RANGE + j] = d_8to24table[top + 15 - j];
|
dest2[TOP_RANGE + j] = d_8to24table[top + 15 - j];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bottom < 128) {
|
if (bottom < 128) {
|
||||||
for (j = 0;j < 16;j++)
|
for (j = 0;j < 16;j++)
|
||||||
dest[BOTTOM_RANGE + j] = d_8to24table[bottom + j];
|
dest2[BOTTOM_RANGE + j] = d_8to24table[bottom + j];
|
||||||
} else {
|
} else {
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
dest[BOTTOM_RANGE + j] = d_8to24table[bottom + 15 - j];
|
dest2[BOTTOM_RANGE + j] = d_8to24table[bottom + 15 - j];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -185,6 +185,8 @@ VID_Init (unsigned char *palette)
|
||||||
// mainwindow=info.window;
|
// mainwindow=info.window;
|
||||||
mainwindow=GetActiveWindow();
|
mainwindow=GetActiveWindow();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
vid.initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue