zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch from hunter_rus

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@650 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-03-21 20:18:45 +00:00
parent 945e1b2357
commit 0e3fbdf05e
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/build/src/polymost.c
View file

@ -4851,6 +4851,7 @@ void polymost_dorotatesprite(int sx, int sy, int z, short a, short picnum,
tspr.shade = dashade;
tspr.pal = dapalnum;
tspr.owner = uniqid+MAXSPRITES;
sprite[tspr.owner].pal=dapalnum;
globalorientation = (dastat&1)+((dastat&32)<<4)+((dastat&4)<<1);
if ((dastat&10) == 2)

2
polymer/eduke32/source/game.c
View file

@ -8895,7 +8895,7 @@ static int parsedefinitions_game(scriptfile *script, const int preload)
return 0;
}
static int loaddefinitions_game(const char *fn, const int preload)
static int loaddefinitions_game(const char *fn, int preload)
{
scriptfile *script;

2
polymer/eduke32/source/savegame.c
View file

@ -412,7 +412,7 @@ int loadplayer(int spot)
i = music_select;
music_select = (ud.volume_number*MAXLEVELS) + ud.level_number;
if (map[(unsigned char)music_select].musicfn != NULL && i != music_select)
if (map[(unsigned char)music_select].musicfn != NULL && (i != music_select || env_music_fn[2][0]))
{
MUSIC_StopSong();
playmusicMAP(&map[(unsigned char)music_select].musicfn[0],music_select);