stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse source
This commit is contained in:
James R 2019-12-30 22:37:24 -08:00
commit 939814d479
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_defs.h
View file

@ -729,9 +729,11 @@ typedef struct
{ {
patch_t *patch[8][ROTANGLES]; patch_t *patch[8][ROTANGLES];
boolean cached[8]; boolean cached[8];
#ifdef HWRENDER
aatree_t *hardware_patch[8]; aatree_t *hardware_patch[8];
#endif/*HWRENDER*/
} rotsprite_t; } rotsprite_t;
#endif #endif/*ROTSPRITE*/
typedef enum typedef enum
{ {

4
src/r_things.c
View file

@ -125,9 +125,11 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
sprtemp[frame].rotsprite.cached[r] = false; sprtemp[frame].rotsprite.cached[r] = false;
for (ang = 0; ang < ROTANGLES; ang++) for (ang = 0; ang < ROTANGLES; ang++)
sprtemp[frame].rotsprite.patch[r][ang] = NULL; sprtemp[frame].rotsprite.patch[r][ang] = NULL;
#ifdef HWRENDER
sprtemp[frame].rotsprite.hardware_patch[r] = M_AATreeAlloc(AATREE_ZUSER); sprtemp[frame].rotsprite.hardware_patch[r] = M_AATreeAlloc(AATREE_ZUSER);
#endif/*HWRENDER*/
} }
#endif #endif/*ROTSPRITE*/
if (rotation == 0) if (rotation == 0)
{ {

2
src/s_sound.c
View file

@ -61,7 +61,9 @@ static void GameMIDIMusic_OnChange(void);
static void GameSounds_OnChange(void); static void GameSounds_OnChange(void);
static void GameDigiMusic_OnChange(void); static void GameDigiMusic_OnChange(void);
#ifdef HAVE_OPENMPT
static void ModFilter_OnChange(void); static void ModFilter_OnChange(void);
#endif
static lumpnum_t S_GetMusicLumpNum(const char *mname); static lumpnum_t S_GetMusicLumpNum(const char *mname);

4
src/sdl/sdl_sound.c
View file

@ -1432,6 +1432,8 @@ static void I_ResumeGME(void)
boolean I_LoadSong(char *data, size_t len) boolean I_LoadSong(char *data, size_t len)
{ {
(void)data;
(void)len;
return false; return false;
} }
@ -1493,6 +1495,7 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
(void)ms; (void)ms;
(void)callback;
return false; return false;
} }
@ -1500,6 +1503,7 @@ boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void))
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
(void)callback;
return false; return false;
} }