From bf9b5391a70601e0747eb618a0a853056a5ea3f9 Mon Sep 17 00:00:00 2001 From: Daveo Date: Fri, 3 Aug 2001 14:42:38 +0000 Subject: [PATCH] --- Utils/MkLevel/Layers/MkLevelLayerRGB.cpp | 1 + build/mklevel.pl | 2 +- makefile.gfx | 11 ++++++++++- tools/Data/bin/MkLevel.ini | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Utils/MkLevel/Layers/MkLevelLayerRGB.cpp b/Utils/MkLevel/Layers/MkLevelLayerRGB.cpp index 7394de2bc..aeb4acce4 100644 --- a/Utils/MkLevel/Layers/MkLevelLayerRGB.cpp +++ b/Utils/MkLevel/Layers/MkLevelLayerRGB.cpp @@ -44,6 +44,7 @@ sRGBCol *RGB=(sRGBCol*)iPtr; } } + printf("RGB Fade Col: %i %i %i\n",ShadeRGB.R,ShadeRGB.G,ShadeRGB.B); } /*****************************************************************************/ diff --git a/build/mklevel.pl b/build/mklevel.pl index b5dea1b04..14eac64f8 100644 --- a/build/mklevel.pl +++ b/build/mklevel.pl @@ -28,7 +28,7 @@ clean$Chapter\_$Level\_LVL :\n\t\$(RM) -f \$($Chapter\_$Level\_OUT) \$($Chapter\ $Chapter\_$Level\_LVL :\t\$($Chapter\_$Level\_IN) \$($Chapter\_$Level\_OUT) : \$($Chapter\_$Level\_IN) -\t\@\$(MKLEVEL) \$($Chapter\_$Level\_IN) -o:\$($Chapter\_$Level\_OUT) -i:\$(INC_DIR) \$(LEVELS_OPTS) +\t\@\$(MKLEVEL) \$($Chapter\_$Level\_IN) -o:\$($Chapter\_$Level\_OUT) -i:\$(INC_DIR) \$(LEVELS_OPTS) \$($Chapter\_$Level\_OPTS) eot ; diff --git a/makefile.gfx b/makefile.gfx index 977b3ef99..dccba96e2 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -38,12 +38,21 @@ TEMP_FILE := $(TEMP_BUILD_DIR)/build.tmp #---------------------------------------------------------------------------- #--- Levels ----------------------------------------------------------------- #---------------------------------------------------------------------------- -LEVELS_OPTS := -t:8,4,1 -s:16 -l -q +LEVELS_OPTS := -t:8,3,1 -s:16 -l -q LEVELS_IN_DIR := $(GRAF_DIR)/levels LEVELS_OUT_DIR := $(DATA_OUT)/levels LEVELS_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/levels LEVELS_DIRS_TO_MAKE := $(LEVELS_MAKEFILE_DIR) $(LEVELS_OUT_DIR) +CHAPTER01_LEVEL04_OPTS := -t:8,4,1 +CHAPTER02_LEVEL03_OPTS := -t:8,2,1 +CHAPTER02_LEVEL04_OPTS := -t:8,2,1 +CHAPTER04_LEVEL03_OPTS := -t:8,2,1 +CHAPTER05_LEVEL01_OPTS := -t:8,2,1 +CHAPTER06_LEVEL03_OPTS := -t:8,2,1 +CHAPTER06_LEVEL04_OPTS := -t:8,2,1 +FMA_SHADYSHOALS_OPTS := -t:8,4,1 + LEVELS_CHAPTERS := CHAPTER01 CHAPTER02 CHAPTER03 CHAPTER04 CHAPTER05 CHAPTER06 FMA LEVELS_CHAPTER01 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini index 95ac674f6..0aab2ed91 100644 --- a/tools/Data/bin/MkLevel.ini +++ b/tools/Data/bin/MkLevel.ini @@ -225,6 +225,7 @@ SmallMasher=7 [ModelExcludeList] Bubble=1 AcridBubble=1 +BubbleGeyserGenerator=1 ################################################ [ModelOtOfs]