From 0e3fbdf05eb248caa3b882844d06d0136f6cef33 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 21 Mar 2008 20:18:45 +0000
Subject: [PATCH] Patch from hunter_rus

git-svn-id: https://svn.eduke32.com/eduke32@650 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/build/src/polymost.c      | 1 +
 polymer/eduke32/source/astub.c    | 2 +-
 polymer/eduke32/source/game.c     | 4 ++--
 polymer/eduke32/source/savegame.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c
index acdddce20..e139be849 100644
--- a/polymer/build/src/polymost.c
+++ b/polymer/build/src/polymost.c
@@ -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)
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 72adf8474..8e68d7b7d 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -5079,7 +5079,7 @@ static void addgroup(const char *buffer)
     CommandGrps = s;
 }
 
-static void checkcommandline(int argc,const char **argv)
+static void checkcommandline(int argc, const char **argv)
 {
     int i = 1;
     char *c;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index ec4c91fca..072162a5d 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -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;
 
@@ -8945,7 +8945,7 @@ static void addgamepath(const char *buffer)
 }
 
 
-static void checkcommandline(int argc,const char **argv)
+static void checkcommandline(int argc, const char **argv)
 {
     short i, j;
     char *c;
diff --git a/polymer/eduke32/source/savegame.c b/polymer/eduke32/source/savegame.c
index 00bea5674..044d11e81 100644
--- a/polymer/eduke32/source/savegame.c
+++ b/polymer/eduke32/source/savegame.c
@@ -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);