From 008121cffd88541d1a973f4edc824fe4ba1580e3 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 1 May 2012 12:41:35 +0000
Subject: [PATCH] Some leftover stuff from the Wii patch.

- in actors.c, make a static array const (the original patch removed the
  staticness)
- remove one comment and change some compiled-out code
- remove commented out pre-Makefile.common stuff

Some changes were not adopted from tueidj's patch:
- whitespace cleanup
- ud.config.UseJoystick = 1 in config.c
- Makefile.common, as mentioned before
- proper read-in of g_numRealPalettes, because it was done with r2503

git-svn-id: https://svn.eduke32.com/eduke32@2632 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile                      | 8 ++------
 polymer/eduke32/source/actors.c               | 2 +-
 polymer/eduke32/source/game.c                 | 4 ----
 polymer/eduke32/source/jaudiolib/src/fx_man.c | 8 ++++----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 3c9bf5281..43055661e 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -346,10 +346,6 @@ ifeq ($(PRETTY_OUTPUT),1)
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)/$(EROOT)\033[0;35m \033[0m\n"
 endif
 	$(MAKE) -C $(EROOT)/ "OBJ=../$(EOBJ)" $@ LUNATIC=$(LUNATIC)
-#\
-		DEBUGANYWAY=$(DEBUGANYWAY) KRANDDEBUG=$(KRANDDEBUG)\
-		USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) PROFILER=$(PROFILER)\
-		NOASM=$(NOASM) NEDMALLOC=$(NEDMALLOC) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) $@
 ifeq ($(PRETTY_OUTPUT),1)
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)\033[0;35m \033[0m\n"
 endif	
@@ -360,7 +356,7 @@ $(JAUDIOLIBDIR)/$(JAUDIOLIB):
 ifeq ($(PRETTY_OUTPUT),1)	
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)/$(JAUDIOLIBDIR)\033[0;35m \033[0m\n"
 endif	
-	$(MAKE) -C $(JAUDIOLIBDIR) #PRETTY_OUTPUT=$(PRETTY_OUTPUT) EROOT=$(EROOT) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) DEBUGANYWAY=$(DEBUGANYWAY)
+	$(MAKE) -C $(JAUDIOLIBDIR)
 ifeq ($(PRETTY_OUTPUT),1)		
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)\033[0;35m \033[0m\n"
 endif	
@@ -369,7 +365,7 @@ $(ENETDIR)/$(ENETLIB):
 ifeq ($(PRETTY_OUTPUT),1)	
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)/$(ENETDIR)\033[0;35m \033[0m\n"
 endif	
-	$(MAKE) -C $(ENETDIR) #PRETTY_OUTPUT=$(PRETTY_OUTPUT) EROOT=$(EROOT) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) 
+	$(MAKE) -C $(ENETDIR)
 ifeq ($(PRETTY_OUTPUT),1)		
 	printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)\033[0;35m \033[0m\n"
 endif	
diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index a9b05f978..2035bdade 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -4150,7 +4150,7 @@ ACTOR_STATIC void G_MoveActors(void)
 
                 if (t[3]>0)
                 {
-                    static char frames[] = {5,5,6,6,7,7,6,5};
+                    static const char frames[] = {5,5,6,6,7,7,6,5};
 
                     s->picnum = GREENSLIME+frames[t[3]];
 
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index be31c47e2..447ff6887 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9504,10 +9504,6 @@ static void G_LoadExtraPalettes(void)
         G_GameExit("\nERROR: File 'lookup.dat' not found.");
 
     g_numRealPalettes = tmpbyte;
-#if defined(__APPLE__) && B_BIG_ENDIAN != 0
-    // this is almost as bad as just setting the value to 25 :P
-//    g_numRealPalettes = ((g_numRealPalettes * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
-#endif
 
     for (j=g_numRealPalettes+1; j<MAXPALOOKUPS; j++)
         makepalookup(j, NULL ,0,0,0, 1);
diff --git a/polymer/eduke32/source/jaudiolib/src/fx_man.c b/polymer/eduke32/source/jaudiolib/src/fx_man.c
index 02529ac58..4e84c3f29 100644
--- a/polymer/eduke32/source/jaudiolib/src/fx_man.c
+++ b/polymer/eduke32/source/jaudiolib/src/fx_man.c
@@ -981,10 +981,10 @@ int32_t FX_PlayLoopedAuto(char *ptr, uint32_t length, int32_t loopstart, int32_t
     int32_t handle = -1;
 #if 0
     {
-        int32_t fmtstr[2];
-        fmtstr[0] = *(int32_t *)ptr;
-        ((char *)fmtstr)[4] = 0;
-        printf("FX_PlayLoopedAuto %s\n",(char *)fmtstr);
+        char fmtstr[5];
+        Bmemcpy(fmtstr, ptr, 4);
+        fmtstr[4] = 0;
+        printf("FX_PlayLoopedAuto %s\n", fmtstr);
     }
 #endif
     switch (LITTLE32(*(int32_t *)ptr))