From 9952b7fe922a7e23cbadddf6adf0841311f28689 Mon Sep 17 00:00:00 2001 From: Daveo Date: Mon, 9 Apr 2001 23:29:26 +0000 Subject: [PATCH] --- source/gfx/actor.cpp | 11 +++++++++-- source/gfx/actor.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/source/gfx/actor.cpp b/source/gfx/actor.cpp index 0f13c66f4..fa1a1ce2e 100644 --- a/source/gfx/actor.cpp +++ b/source/gfx/actor.cpp @@ -209,17 +209,20 @@ sActorPool &ThisActor=ActorPool[Idx]; /*****************************************************************************/ #define DYN_PALW 64 #define DYN_PALH 1 -#define DYN_PALX DYN_PALW*(8+4) +#define DYN_PALX 512 #define DYN_PALY 511 u16 CActorPool::LoadPalette(sActorPool &ThisActor,int Idx) { RECT R; +int X=Idx&31; +int Y=Idx%31; R.x=DYN_PALX+(Idx*DYN_PALW); - R.y=DYN_PALY; + R.y=DYN_PALY-Y; R.w=DYN_PALW; R.h=DYN_PALH; +// DrawSync(0); LoadImage( &R, (u32*)ThisActor.SpriteBank->Palette); int Clut=getClut(R.x,R.y); @@ -260,6 +263,7 @@ sActorPool &ThisActor=ActorPool[Idx]; // Dumps all apart from spongeybob void CActorPool::DumpActors() { + printf("DumpActors\n"); for (int i=0; iW/4; Rect.h=FrameGfx->H; + LoadImage( &Rect, (u32*)UnpackBuffer); POLY_FT4 *Ft4=GetPrimFT4(); diff --git a/source/gfx/actor.h b/source/gfx/actor.h index 3d8e758ce..4fd692a5a 100644 --- a/source/gfx/actor.h +++ b/source/gfx/actor.h @@ -60,7 +60,7 @@ class CActorPool public: enum { - MAX_ACTORS =32, + MAX_ACTORS =64, MAX_ACTOR_SIZE= 128*128, };