diff --git a/data/DataCache.scr b/data/DataCache.scr index bedb6a7b2..d64678ef9 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -142,6 +142,9 @@ LEVELS/FMA_SHADYEXTERIOR.Lvl LEVELS/FMA_SHADYEXTERIOR.Tex actors/SPONGEBOB.SBK +actors/SPONGEBOB_CORALBLOWER.SBK +actors/SPONGEBOB_JELLYLAUNCHER.SBK +actors/SPONGEBOB_NET.SBK actors/SQUIDWARD.SBK diff --git a/makefile.gfx b/makefile.gfx index 440836c20..5be6ec6c1 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -38,7 +38,8 @@ TEMP_FILE := $(TEMP_BUILD_DIR)/build.tmp #---------------------------------------------------------------------------- #--- Levels ----------------------------------------------------------------- #---------------------------------------------------------------------------- -LEVELS_OPTS := -t:8,4,1 -s:16 +LEVELS_MODEL_TO_ADD := -m:$(GRAF_DIR)/Platforms/Bubble/Bubble.gin +LEVELS_OPTS := -t:8,4,1 -s:16 $(LEVELS_MODEL_TO_ADD) LEVELS_IN_DIR := $(GRAF_DIR)/levels LEVELS_OUT_DIR := $(DATA_OUT)/levels LEVELS_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/levels @@ -106,7 +107,7 @@ ACTOR_OUT_DIR := $(DATA_OUT)/Actors ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) -ACTOR_SPONGEBOB := SPONGEBOB +ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net ACTOR_NPC := Squidward # BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward diff --git a/source/gfx/actor.cpp b/source/gfx/actor.cpp index d38b8021c..6514d2217 100644 --- a/source/gfx/actor.cpp +++ b/source/gfx/actor.cpp @@ -644,8 +644,10 @@ int DX=1; int DY=1; int PXOfs=-16; int PYOfs=-6; +int blah=0; void CModelGfx::Render(DVECTOR &Pos) { + Model=&CModelGfx::ModelTable[blah]; #define BLOCK_MULT 16 u8 *PrimPtr=GetPrimPtr(); POLY_FT3 *TPrimPtr=(POLY_FT3*)PrimPtr; diff --git a/source/level/level.cpp b/source/level/level.cpp index 32c0cc25c..81de91deb 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -133,7 +133,7 @@ sLvlTab *lvlTab=&LvlTable[LevelNo]; LevelHdr->TriList=(sTri*) MakePtr(LevelHdr,(int)LevelHdr->TriList); LevelHdr->QuadList=(sQuad*) MakePtr(LevelHdr,(int)LevelHdr->QuadList); LevelHdr->VtxList=(sVtx*) MakePtr(LevelHdr,(int)LevelHdr->VtxList); - LevelHdr->PlatformGfx=(sModel*) MakePtr(LevelHdr,(int)LevelHdr->PlatformGfx); + LevelHdr->ModelList=(sModel*) MakePtr(LevelHdr,(int)LevelHdr->ModelList); printf("ActorList %i\n",(int)LevelHdr->ActorList); printf("ItemList %i\n",(int)LevelHdr->ItemList); @@ -141,7 +141,7 @@ sLvlTab *lvlTab=&LvlTable[LevelNo]; printf("TriggerList %i\n",(int)LevelHdr->TriggerList); printf("FXList %i\n",(int)LevelHdr->FXList); - CModelGfx::SetData(LevelHdr->PlatformGfx,LevelHdr->TriList,LevelHdr->QuadList,LevelHdr->VtxList); + CModelGfx::SetData(LevelHdr->ModelList,LevelHdr->TriList,LevelHdr->QuadList,LevelHdr->VtxList); m_levelTPage=TPLoadTex(lvlTab->TexFilename); s_playerSpawnPos.vx=LevelHdr->PlayerStartX*16; diff --git a/tools/Data/bin/MkLevel.exe b/tools/Data/bin/MkLevel.exe index 001b4752d..205718edd 100644 Binary files a/tools/Data/bin/MkLevel.exe and b/tools/Data/bin/MkLevel.exe differ diff --git a/tools/Data/include/dstructs.h b/tools/Data/include/dstructs.h index bc5d77daa..79f7ac9b0 100644 --- a/tools/Data/include/dstructs.h +++ b/tools/Data/include/dstructs.h @@ -209,7 +209,7 @@ struct sLevelHdr sTri *TriList; sQuad *QuadList; sVtx *VtxList; - sModel *PlatformGfx; + sModel *ModelList; }; //***************************************************************************