From be528e6f019cf6c00d5ed69fbe481f935ffc71c7 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Tue, 27 Feb 2001 18:56:34 +0000
Subject: [PATCH]

---
 build/mkactor.pl   | 19 +++++++------------
 data/DataCache.scr |  5 +++--
 makefile.gfx       | 39 +++++++--------------------------------
 3 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/build/mkactor.pl b/build/mkactor.pl
index f73216925..f0176ca37 100644
--- a/build/mkactor.pl
+++ b/build/mkactor.pl
@@ -1,25 +1,20 @@
 $OutFile=shift(@ARGV);
-$Actor=shift(@ARGV);
+$ActorList=shift(@ARGV);
 
-# printf("I got\n0: $OutFile\n1: $Actor\n");
+# printf("I got\n0: $OutFile\n1: $ActorList\n");
 
 $OutFile=">$OutFile";
 open(OutFile) || die "Can't create makefile $OutFile; $!";
 # print  <<eot
 print OutFile <<eot
-ACTOR_$Actor\:\t\$(ACTOR_$Actor\_OUT)
+$ActorList\:\t\$($ActorList\_OUT)
 
-ACTOR_$Actor\_IN_DIR :=\t\$(ACTOR_IN_DIR)/$Actor
-ACTOR_$Actor\_OUT_DIR :=\t\$(ACTOR_OUT_DIR)
+$ActorList\_IN :=\t\$(foreach ACTOR,\$($ActorList),\$(ACTOR_IN_DIR)/\$(ACTOR)/\$(ACTOR).gin)
+$ActorList\_OUT :=\t\$(foreach ACTOR,\$($ActorList),\$(ACTOR_OUT_DIR)/\$(ACTOR).a3d)
 
-ACTOR_$Actor\_IN :=\t\$(ACTOR_$Actor\_IN_DIR)/$Actor.gin
-ACTOR_$Actor\_OUT :=\t\$(ACTOR_$Actor\_OUT_DIR)/$Actor.a3d
 
-ACTOR_$Actor\_ANIM_LIST :=\t\$(foreach FILE, \$($Actor\_ANIM_LIST),-a:\$(ACTOR_$Actor\_IN_DIR)/\$(FILE).gin)
-ACTOR_$Actor\_TEX_LIST :=\t\$(foreach FILE,	\$($Actor\_EXTRA_TEX),-x:textures/\$(FILE).bmp)
-
-\$(ACTOR_$Actor\_OUT) : \$(ACTOR_$Actor\_IN)
-	\@\$(MKACTOR3D) \$(ACTOR_$Actor\_IN) -o:\$(ACTOR_$Actor\_OUT_DIR) -t:24,1,1 -s:256 -i:\$(INC_DIR) \$(ACTOR_$Actor\_TEX_LIST) \$(ACTOR_$Actor\_ANIM_LIST)
+\$($ActorList\_OUT) : \$($ActorList\_IN)
+	\@\$(MKACTOR3D) \$($ActorList\_IN) -o:\$(ACTOR_OUT_DIR) -t:24,1,1 -s:256 -i:\$(INC_DIR) -g:$ActorList
 
 
 eot
diff --git a/data/DataCache.scr b/data/DataCache.scr
index 546127dde..8cf28989d 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -115,12 +115,13 @@ levels/CHAPTER06_LEVEL0301.Lvl
 
 collision/colltab.dat
 
+actors/actor_spongebob.tex
 actors/spongebob.a3d
-actors/spongebob.tex
 actors/spongebob.abk
 
+actors/actor_enemy.tex
+
 actors/clam.a3d
-actors/clam.tex
 actors/clam.abk
 
 { SYSTEM_CACHE 4
diff --git a/makefile.gfx b/makefile.gfx
index 5efaffe5f..173883b6c 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -38,6 +38,7 @@ TEMP_FILE :=			$(TEMP_BUILD_DIR)/build.tmp
 #----------------------------------------------------------------------------
 #--- Levels -----------------------------------------------------------------
 #----------------------------------------------------------------------------
+# TEMP!!
 LEVELS_OPTS :=				-t:8,4,1 -s:256
 LEVELS_IN_DIR :=			$(GRAF_DIR)/levels
 LEVELS_OUT_DIR :=			$(DATA_OUT)/levels
@@ -131,45 +132,19 @@ GFX_DATA_OUT		+=	$(COLLISION_OUT)
 # Actors
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
-# Player List
-SPONGEBOB_ANIM_LIST :=	buttbounceend buttbouncestart deathbackwards deathdry  deathforwards deathspin deathtar electricshock electricshockend electricshockstart faceback facefront \
-						fall getup getuprun hitground hover hoverend hoverstart idlebreathe idlehoola idlelook idlewigglearm jumpend karate run \
-						runstart runstop soakup talk01 teeterback teeterfront \
-						idlewind
-
-SPONGEBOB_EXTRA_TEX :=	SBBackNormal \
-						SBEyesAngry SBEyesBlink SBEyesDown SBEyesfiece SBEyesLeft SBEyesNormal SBEyesRight SBEyesSheepish SBEyesUp SBEyesWorried \
-						SBHandNormal \
-						SBMouthGasp SBMouthNormal SBMouthSheepish SBMouthSmile SBMouthTerror SBMouthWhistle \
-						SBPantsideNormal \
-						SBPantsNormal \
-						SBSideNormal \
-						SBSocksNormal \
-						SBSoleNormal \
-						SBTopNormal
-
-#----------------------------------------------------------------------------
-# NPC List
-
-#----------------------------------------------------------------------------
-# Enemy List
-CLAM_ANIM_LIST :=		 clamsidesnap
-
-#----------------------------------------------------------------------------
+# Anims and extra textures are held within script files in the character dirs
 ACTOR_IN_DIR :=			$(GRAF_DIR)/Characters
 ACTOR_OUT_DIR :=		$(DATA_OUT)/Actors
 ACTOR_MAKEFILE_DIR :=	$(TEMP_BUILD_DIR)/Actors
 ACTORS_DIRS_TO_MAKE :=	$(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
 
-ACTORS_PLAYER_LIST :=	SPONGEBOB
+ACTOR_SPONGEBOB :=		SPONGEBOB
 
-ACTORS_NPC_LIST :=		
+ACTOR_NPC :=		
 
-ACTORS_ENEMY_LIST :=	CLAM
+ACTOR_ENEMY :=			CLAM
 
-ACTORS_LIST :=			$(foreach ACTOR,$(ACTORS_PLAYER_LIST),$(ACTOR)) \
-						$(foreach ACTOR,$(ACTORS_NPC_LIST),$(ACTOR)) \
-						$(foreach ACTOR,$(ACTORS_ENEMY_LIST),$(ACTOR))
+ACTORS_LIST :=			ACTOR_SPONGEBOB ACTOR_NPC ACTOR_ENEMY
 
 ACTORS_MAKEFILES :=		$(foreach ACTOR,$(ACTORS_LIST),$(ACTOR_MAKEFILE_DIR)/$(ACTOR).mak)
 
@@ -178,7 +153,7 @@ $(ACTORS_MAKEFILES):	$(ACTORS_DIRS_TO_MAKE) makefile.gfx $(BUILD_DIR)/mkactor.pl
 
 include $(ACTORS_MAKEFILES)
 
-ACTORS_ALL_OUT :=		$(foreach ACTOR,$(ACTORS_LIST),$(ACTOR_$(ACTOR)_OUT))
+ACTORS_ALL_OUT :=		$(foreach ACTOR,$(ACTORS_LIST),$($(ACTOR)_OUT))
 
 GFX_DATA_OUT +=    		$(ACTORS_ALL_OUT)