This commit is contained in:
parent
d0d29a1513
commit
7f2acb6802
6 changed files with 11 additions and 5 deletions
|
@ -142,6 +142,9 @@ LEVELS/FMA_SHADYEXTERIOR.Lvl
|
||||||
LEVELS/FMA_SHADYEXTERIOR.Tex
|
LEVELS/FMA_SHADYEXTERIOR.Tex
|
||||||
|
|
||||||
actors/SPONGEBOB.SBK
|
actors/SPONGEBOB.SBK
|
||||||
|
actors/SPONGEBOB_CORALBLOWER.SBK
|
||||||
|
actors/SPONGEBOB_JELLYLAUNCHER.SBK
|
||||||
|
actors/SPONGEBOB_NET.SBK
|
||||||
|
|
||||||
actors/SQUIDWARD.SBK
|
actors/SQUIDWARD.SBK
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,8 @@ TEMP_FILE := $(TEMP_BUILD_DIR)/build.tmp
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
#--- Levels -----------------------------------------------------------------
|
#--- 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_IN_DIR := $(GRAF_DIR)/levels
|
||||||
LEVELS_OUT_DIR := $(DATA_OUT)/levels
|
LEVELS_OUT_DIR := $(DATA_OUT)/levels
|
||||||
LEVELS_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/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_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor
|
||||||
ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
|
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
|
ACTOR_NPC := Squidward
|
||||||
# BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward
|
# BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward
|
||||||
|
|
||||||
|
|
|
@ -644,8 +644,10 @@ int DX=1;
|
||||||
int DY=1;
|
int DY=1;
|
||||||
int PXOfs=-16;
|
int PXOfs=-16;
|
||||||
int PYOfs=-6;
|
int PYOfs=-6;
|
||||||
|
int blah=0;
|
||||||
void CModelGfx::Render(DVECTOR &Pos)
|
void CModelGfx::Render(DVECTOR &Pos)
|
||||||
{
|
{
|
||||||
|
Model=&CModelGfx::ModelTable[blah];
|
||||||
#define BLOCK_MULT 16
|
#define BLOCK_MULT 16
|
||||||
u8 *PrimPtr=GetPrimPtr();
|
u8 *PrimPtr=GetPrimPtr();
|
||||||
POLY_FT3 *TPrimPtr=(POLY_FT3*)PrimPtr;
|
POLY_FT3 *TPrimPtr=(POLY_FT3*)PrimPtr;
|
||||||
|
|
|
@ -133,7 +133,7 @@ sLvlTab *lvlTab=&LvlTable[LevelNo];
|
||||||
LevelHdr->TriList=(sTri*) MakePtr(LevelHdr,(int)LevelHdr->TriList);
|
LevelHdr->TriList=(sTri*) MakePtr(LevelHdr,(int)LevelHdr->TriList);
|
||||||
LevelHdr->QuadList=(sQuad*) MakePtr(LevelHdr,(int)LevelHdr->QuadList);
|
LevelHdr->QuadList=(sQuad*) MakePtr(LevelHdr,(int)LevelHdr->QuadList);
|
||||||
LevelHdr->VtxList=(sVtx*) MakePtr(LevelHdr,(int)LevelHdr->VtxList);
|
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("ActorList %i\n",(int)LevelHdr->ActorList);
|
||||||
printf("ItemList %i\n",(int)LevelHdr->ItemList);
|
printf("ItemList %i\n",(int)LevelHdr->ItemList);
|
||||||
|
@ -141,7 +141,7 @@ sLvlTab *lvlTab=&LvlTable[LevelNo];
|
||||||
printf("TriggerList %i\n",(int)LevelHdr->TriggerList);
|
printf("TriggerList %i\n",(int)LevelHdr->TriggerList);
|
||||||
printf("FXList %i\n",(int)LevelHdr->FXList);
|
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);
|
m_levelTPage=TPLoadTex(lvlTab->TexFilename);
|
||||||
|
|
||||||
s_playerSpawnPos.vx=LevelHdr->PlayerStartX*16;
|
s_playerSpawnPos.vx=LevelHdr->PlayerStartX*16;
|
||||||
|
|
Binary file not shown.
|
@ -209,7 +209,7 @@ struct sLevelHdr
|
||||||
sTri *TriList;
|
sTri *TriList;
|
||||||
sQuad *QuadList;
|
sQuad *QuadList;
|
||||||
sVtx *VtxList;
|
sVtx *VtxList;
|
||||||
sModel *PlatformGfx;
|
sModel *ModelList;
|
||||||
};
|
};
|
||||||
|
|
||||||
//***************************************************************************
|
//***************************************************************************
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue