zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-05-25 18:43:47 +00:00
parent 5b785068c2
commit fa5105d783
96 changed files with 550 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/gfx/actor.cpp
View file

@ -61,12 +61,12 @@ int SlotW=+32000,SlotH=+32000;
if (SlotList[Slot].Width<W)
{
// printf("Adjusted Slot Width from %i to %i\n",SlotList[Slot].Width,W);
// DAVE_DBGMSG("Adjusted Slot Width from %i to %i\n",SlotList[Slot].Width,W);
SlotList[Slot].Width=W;
}
if (SlotList[Slot].Height<H)
{
// printf("Adjusted Slot Height from %i to %i\n",SlotList[Slot].Height,H);
// DAVE_DBGMSG("Adjusted Slot Height from %i to %i\n",SlotList[Slot].Height,H);
SlotList[Slot].Height=H;
}
@ -511,7 +511,7 @@ sActorPool *Actor=ActorList;
sPoolSlot &Slot=CActorPool::Cache.GetSlot(i);
int Count=CountSlots(Slot.NodeList.Head);
printf("SC %i: %i %i\n",i,Slot.SlotCount,Count);
DAVE_DBGMSG("SC %i: %i %i\n",i,Slot.SlotCount,Count);
ASSERT(Slot.SlotCount==Count);
}
*/

14
source/gfx/bubicles.cpp
View file

@ -38,7 +38,7 @@
#include "system\gstate.h"
#endif
#include "game\game.h"
/* Std Lib
------- */
@ -70,8 +70,6 @@ int CBubicleFactory::s_initialised=false;
CBubicleEmitter *CBubicleFactory::s_emitters;
CBubicle *CBubicleFactory::s_bubicles;
SpriteBank *CBubicleFactory::s_sprites;
int CBubicleFactory::s_frameTypeCounter=0;
const int CBubicleFactory::s_frameTabSize=8;
const int CBubicleFactory::s_frameTabSizeMask=0x07;
@ -365,7 +363,7 @@ void CBubicle::render()
x+=(msin(m_data.m_theta)*(m_data.m_wobbleWidth>>ACCURACY_SHIFT))>>12;
ft4=CBubicleFactory::getSprites()->printFT4(m_fhBub,0,0,0,0,m_data.m_ot);
ft4=CGameScene::getSpriteBank()->printFT4(m_fhBub,0,0,0,0,m_data.m_ot);
setXYWH(ft4,x,y,w,h);
setSemiTrans(ft4,1);
setRGB0(ft4,m_data.m_colour.m_r,m_data.m_colour.m_g,m_data.m_colour.m_b);
@ -386,13 +384,10 @@ void CBubicleFactory::init()
int i;
CBubicleEmitter *emt;
CBubicle *bub;
s_sprites=new ("Bubble Sprites") SpriteBank();
s_sprites->load(SPRITES_SPRITES_SPR);
SpriteBank *SprBank=CGameScene::getSpriteBank();
for(i=0;i<s_frameTabSize;i++)
{
s_frameTab[i]=s_sprites->getFrameHeader(s_frameTabSrc[i]);
s_frameTab[i]=SprBank->getFrameHeader(s_frameTabSrc[i]);
}
emt=s_emitters=(CBubicleEmitter*)MemAlloc(sizeof(CBubicleEmitter)*NUM_EMITTERS,"BubicleEmitters");
@ -421,7 +416,6 @@ void CBubicleFactory::shutdown()
MemFree(s_emitters);
MemFree(s_bubicles);
s_sprites->dump(); delete s_sprites;
s_initialised=false;
}

2
source/gfx/bubicles.h
View file

@ -162,7 +162,6 @@ public:
static CBubicleEmitter *spawnEmitter(BubicleEmitterData *_init);
static CBubicle *spawnParticle(BubicleEmitterData *_init);
static sFrameHdr *getBubbleFrameHeader();
static SpriteBank *getSprites() {return s_sprites;}
static void setMapOffset(DVECTOR *_offset);
static const DVECTOR *getMapOffset();
@ -180,7 +179,6 @@ private:
static int s_initialised;
static CBubicleEmitter *s_emitters;
static CBubicle *s_bubicles;
static SpriteBank *s_sprites;
static int s_frameTypeCounter;
static const int s_frameTabSize;

1
source/gfx/prim.cpp
View file

@ -70,7 +70,6 @@ void PrimDisplay()
/*****************************************************************************/
void FlushPrimPool()
{
printf("%x %x\n",(int)CurrPrim,(int)PrimBuffer[PrimFlipFlag]);
BaseOtPtr=(sOT*)OtList[PrimFlipFlag];
GUIOtPtr=BaseOtPtr;
OtPtr=GUIOtPtr+MAX_OT_GUI;

1
source/gfx/sprbank.cpp
View file

@ -181,6 +181,7 @@ void SpriteBank::load( FileEquate _file )
}
else
{
// ASSERT(!"Sprite Bank Already Loaded");
SpriteBankInstance *sbiPtr=s_bankList;
do
{