From 7c44abbcc7c20e747ad2c1baaa5e3053b7b8c193 Mon Sep 17 00:00:00 2001 From: Daveo Date: Mon, 5 Mar 2001 20:16:35 +0000 Subject: [PATCH] --- data/DataCache.scr | 4 ---- makefile.gaz | 2 +- source/enemy/npc.cpp | 15 ++++++--------- source/enemy/npc.h | 2 +- source/enemy/npcdata.cpp | 41 ---------------------------------------- source/system/main.cpp | 7 ++++--- 6 files changed, 12 insertions(+), 59 deletions(-) diff --git a/data/DataCache.scr b/data/DataCache.scr index c93fbaba8..41c8e4981 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -402,15 +402,11 @@ collision/colltab.dat actors/actor_spongebob.tex actors/spongebob.a3d -actors/spongebob.abk actors/actor_enemy.tex actors/clam.a3d -actors/clam.abk - actors/SHARKSUB.A3d -actors/SHARKSUB.Abk { SYSTEM_CACHE 4 } diff --git a/makefile.gaz b/makefile.gaz index d975f0fea..677caeafb 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -104,7 +104,7 @@ gfx_src := prim \ bubicles \ skel \ skelspng \ - anim + actorpool # camera \ # basemod \ diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 917fa5f12..c7ae58fb5 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -46,7 +46,6 @@ #endif #include "Gfx\Skel.h" -#include "gfx\anim.h" #ifndef __VID_HEADER_ #include "system\vid.h" @@ -64,10 +63,10 @@ void CNpcFriend::init() { CNpcThing::init(); - sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D); - m_skel.Init(Hdr); +// sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D); +// m_skel.Init(Hdr); + m_skel.Init(ACTORS_SPONGEBOB_A3D); m_actorTPage = TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX); - m_skel.setAnimDatabase(CAnimDB::Load(ACTORS_SPONGEBOB_ABK)); Pos.vx = 100; Pos.vy = 100; @@ -212,10 +211,10 @@ void CNpcEnemy::init() m_type = NPC_CLAM_STATIC; - sActorHdr *Hdr = m_skel.Load( m_data[m_type].skelType ); - m_skel.Init( Hdr ); +// sActorHdr *Hdr = m_skel.Load( m_data[m_type].skelType ); +// m_skel.Init( Hdr ); + m_skel.Init(m_data[m_type].skelType); m_actorTPage = TPLoadTex( ACTORS_ACTOR_ENEMY_TEX ); - m_skel.setAnimDatabase( CAnimDB::Load( m_data[m_type].animData ) ); m_skel.setAng(1024); @@ -441,8 +440,6 @@ void CNpcEnemy::shutdown() // temporary TPFree( m_actorTPage ); - CAnimDB::Dump( m_data[m_type].animData ); - CEnemyThing::shutdown(); } diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 33066d0c0..b1d628c29 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -325,7 +325,7 @@ protected: typedef struct NPC_DATA_TYPE { FileEquate skelType; - FileEquate animData; +// FileEquate animData; u16 initAnim; NPC_INIT_FUNC initFunc; NPC_SENSOR_FUNC sensorFunc; diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 72bc09c97..34e20a394 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -63,7 +63,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { { // NPC_FALLING_ITEM ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_FALLING_ITEM_USER_CLOSE, @@ -80,7 +79,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_FISH_HOOK ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FISH_HOOK, NPC_SENSOR_FISH_HOOK_USER_CLOSE, @@ -97,7 +95,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_DUST_DEVIL ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_RETURNING_HAZARD, NPC_SENSOR_NONE, @@ -114,7 +111,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_PENDULUM ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_PENDULUM, NPC_SENSOR_NONE, @@ -131,7 +127,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_FIREBALL ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FIREBALL, NPC_SENSOR_NONE, @@ -148,7 +143,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SAW_BLADE ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_RETURNING_HAZARD, NPC_SENSOR_NONE, @@ -165,7 +159,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_LINEAR_PLATFORM ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -182,7 +175,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_CIRCULAR_PLATFORM ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_CIRCULAR_PLATFORM, NPC_SENSOR_NONE, @@ -199,7 +191,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SMALL_JELLYFISH_1 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_JELLYFISH_USER_CLOSE, @@ -216,7 +207,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SMALL_JELLYFISH_2 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_JELLYFISH_USER_CLOSE, @@ -233,7 +223,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_ANEMONE_1 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_ANEMONE_USER_CLOSE, @@ -250,7 +239,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_ANEMONE_2 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_ANEMONE_USER_CLOSE, @@ -267,7 +255,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_ANEMONE_3 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_ANEMONE_USER_CLOSE, @@ -284,7 +271,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SKELETAL_FISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_GENERIC_USER_VISIBLE, @@ -301,7 +287,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_CLAM_JUMP ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSNAPUP, NPC_INIT_DEFAULT, NPC_SENSOR_CLAM_USER_CLOSE, @@ -318,7 +303,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_CLAM_STATIC ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSIDESNAP, NPC_INIT_DEFAULT, NPC_SENSOR_CLAM_USER_CLOSE, @@ -335,7 +319,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SQUID_DART ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -352,7 +335,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_FISH_FOLK ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FISH_FOLK, NPC_SENSOR_NONE, @@ -369,7 +351,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_PRICKLY_BUG ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -386,7 +367,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SEA_SNAKE_1 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -403,7 +383,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SEA_SNAKE_2 ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -420,7 +399,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_PUFFA_FISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -437,7 +415,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_ANGLER_FISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -454,7 +431,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_HERMIT_CRAB ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -471,7 +447,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_MINE ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -488,7 +463,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_BOOGER_MONSTER ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE, @@ -505,7 +479,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SPIDER_CRAB ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_SPIDER_CRAB_USER_CLOSE, @@ -522,7 +495,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_EYEBALL ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_EYEBALL_USER_CLOSE, @@ -539,7 +511,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_BABY_OCTOPUS ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -556,7 +527,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_ZOMBIE_FISH_FOLK ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FISH_FOLK, NPC_SENSOR_NONE, @@ -573,7 +543,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_NINJA_STARFISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NINJA_STARFISH_USER_CLOSE, @@ -590,7 +559,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_GHOST ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_NONE, @@ -607,7 +575,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_GHOST_PIRATE ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_GHOST_PIRATE, NPC_SENSOR_GHOST_PIRATE_USER_CLOSE, @@ -624,7 +591,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_FLAMING_SKULL ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FLAMING_SKULL, NPC_SENSOR_FLAMING_SKULL_USER_CLOSE, @@ -641,7 +607,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SHARK_MAN ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_GENERIC_USER_VISIBLE, @@ -658,7 +623,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_OIL_BLOB ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_DEFAULT, NPC_SENSOR_OIL_BLOB_USER_CLOSE, @@ -675,7 +639,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SKULL_STOMPER ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_SKULL_STOMPER, NPC_SENSOR_SKULL_STOMPER_USER_CLOSE, @@ -692,7 +655,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_MOTHER_JELLYFISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_MOTHER_JELLYFISH, NPC_SENSOR_NONE, @@ -709,7 +671,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_SUB_SHARK ACTORS_SHARKSUB_A3D, - ACTORS_SHARKSUB_ABK, ANIM_SHARKSUB_SHARKSUBSWIM, NPC_INIT_SUB_SHARK, NPC_SENSOR_NONE, @@ -726,7 +687,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_FLYING_DUTCHMAN ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_FLYING_DUTCHMAN, NPC_SENSOR_NONE, @@ -743,7 +703,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = { // NPC_IRON_DOGFISH ACTORS_CLAM_A3D, - ACTORS_CLAM_ABK, ANIM_CLAM_CLAMSHUT, NPC_INIT_IRON_DOGFISH, NPC_SENSOR_IRON_DOGFISH_USER_CLOSE, diff --git a/source/system/main.cpp b/source/system/main.cpp index aa401a46d..b131a9689 100644 --- a/source/system/main.cpp +++ b/source/system/main.cpp @@ -11,9 +11,9 @@ #include "gfx\prim.h" #include "gfx\tpage.h" #include "utils\utils.h" +#include "gfx\actorpool.h" #include "system\gp.h" -#include "gfx\anim.h" // scenes #include "game\game.h" @@ -117,8 +117,9 @@ void InitSystem() // reordered to reduce black screen (hope all is well CBubicleFactory::init(); - CAnimDB::Init(); - CAnimDB::Load(ACTORS_SPONGEBOB_ABK); + CActorPool::AddActor(ACTORS_SPONGEBOB_A3D); +// CAnimDB::Init(); +// CAnimDB::Load(ACTORS_SPONGEBOB_ABK); #if defined(__DEBUG_MEM__) DebugMemFontInit();