fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some stuff that got lost when merging historic qs changes.

Browse source
This commit is contained in:
Shpoike 2021-08-31 03:54:22 +01:00
parent 88db885ccc
commit 8b676fcb73
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
quakespasm/Quake/Makefile.w64
View file

@ -105,11 +105,11 @@ $(error Invalid MP3LIB setting)
endif endif
endif endif
ifeq ($(MP3LIB),mad) ifeq ($(MP3LIB),mad)
mp3_obj=snd_mp3 mp3_obj=snd_mp3.o
lib_mp3dec=-lmad lib_mp3dec=-lmad
endif endif
ifeq ($(MP3LIB),mpg123) ifeq ($(MP3LIB),mpg123)
mp3_obj=snd_mpg123 mp3_obj=snd_mpg123.o
lib_mp3dec=-lmpg123 lib_mp3dec=-lmpg123
endif endif
ifeq ($(VORBISLIB),vorbis) ifeq ($(VORBISLIB),vorbis)
@ -202,8 +202,7 @@ MUSIC_OBJS:= bgmusic.o \
snd_wave.o \ snd_wave.o \
snd_vorbis.o \ snd_vorbis.o \
snd_opus.o \ snd_opus.o \
$(mp3_obj).o \ $(mp3_obj) \
snd_mp3tag.o \
snd_mikmod.o \ snd_mikmod.o \
snd_xmp.o \ snd_xmp.o \
snd_umx.o snd_umx.o

16
quakespasm/Quake/r_alias.c
View file

@ -1036,7 +1036,7 @@ void R_DrawAliasModel (entity_t *e)
{ {
aliasglsl_t *glsl; aliasglsl_t *glsl;
aliashdr_t *paliashdr; aliashdr_t *paliashdr;
int i, anim; int i, anim, skinnum;
gltexture_t *tx, *fb; gltexture_t *tx, *fb;
lerpdata_t lerpdata; lerpdata_t lerpdata;
qboolean alphatest = !!(e->model->flags & MF_HOLEY); qboolean alphatest = !!(e->model->flags & MF_HOLEY);
@ -1120,16 +1120,22 @@ void R_DrawAliasModel (entity_t *e)
// //
GL_DisableMultitexture(); GL_DisableMultitexture();
anim = (int)(cl.time*10) & 3; anim = (int)(cl.time*10) & 3;
if ((e->skinnum >= paliashdr->numskins) || (e->skinnum < 0)) skinnum = e->skinnum;
if ((skinnum >= paliashdr->numskins) || (skinnum < 0))
{
Con_DPrintf ("R_DrawAliasModel: no such skin # %d for '%s'\n", skinnum, e->model->name);
// ericw -- display skin 0 for winquake compatibility
skinnum = 0;
}
if (paliashdr->numskins <= 0)
{ {
Con_DPrintf ("R_DrawAliasModel: no such skin # %d for '%s'\n", e->skinnum, e->model->name);
tx = NULL; // NULL will give the checkerboard texture tx = NULL; // NULL will give the checkerboard texture
fb = NULL; fb = NULL;
} }
else else
{ {
tx = paliashdr->gltextures[e->skinnum][anim]; tx = paliashdr->gltextures[skinnum][anim];
fb = paliashdr->fbtextures[e->skinnum][anim]; fb = paliashdr->fbtextures[skinnum][anim];
} }
if (e->netstate.colormap && !gl_nocolors.value) if (e->netstate.colormap && !gl_nocolors.value)
{ {

4
quakespasm/Quake/sys_sdl_unix.c
View file

@ -392,8 +392,6 @@ void Sys_Error (const char *error, ...)
va_list argptr; va_list argptr;
char text[1024]; char text[1024];
Con_Redirect(NULL);
PR_SwitchQCVM(NULL);
host_parms->errstate++; host_parms->errstate++;
va_start (argptr, error); va_start (argptr, error);
@ -401,6 +399,8 @@ void Sys_Error (const char *error, ...)
va_end (argptr); va_end (argptr);
fputs (errortxt1, stderr); fputs (errortxt1, stderr);
Con_Redirect(NULL);
PR_SwitchQCVM(NULL);
Host_Shutdown (); Host_Shutdown ();
fputs (errortxt2, stderr); fputs (errortxt2, stderr);
fputs (text, stderr); fputs (text, stderr);