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