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

7
source/pickups/pballoon.cpp
View file

@ -45,6 +45,7 @@
#include "gfx\otpos.h"
#endif
#include "game\game.h"
/* Std Lib
------- */
@ -86,7 +87,7 @@ void CBalloonPickup::init()
CBaseWeaponPickup::init();
m_sin=0;
fh=getSpriteBank()->getFrameHeader(FRM__BALLOON);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__BALLOON);
setCollisionSize(fh->W,fh->H);
}
@ -101,7 +102,7 @@ DVECTOR CBalloonPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__BALLOON);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__BALLOON);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -179,7 +180,7 @@ void CBalloonPickup::renderPickup(DVECTOR *_pos)
int xo1,xo2;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__BALLOON);
xo1=((msin((m_sin+balloon_phase)&4095)*balloon_scale1)>>12);

7
source/pickups/pbubmix.cpp
View file

@ -37,6 +37,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -78,7 +79,7 @@ void CBubbleMixturePickup::init()
CBaseRespawningPickup::init();
m_sin=0;
fh=getSpriteBank()->getFrameHeader(FRM__BUBBLEMIXTURE);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__BUBBLEMIXTURE);
setCollisionSize(fh->W,fh->H);
}
@ -93,7 +94,7 @@ DVECTOR CBubbleMixturePickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__BUBBLEMIXTURE);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__BUBBLEMIXTURE);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -147,7 +148,7 @@ void CBubbleMixturePickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__BUBBLEMIXTURE);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2)+((msin(m_sin)*bubmix_bobscale)>>12);

7
source/pickups/pglasses.cpp
View file

@ -33,6 +33,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -76,7 +77,7 @@ void CGlassesPickup::init()
m_glint=0;
m_glintRot=0;
fh=getSpriteBank()->getFrameHeader(FRM__GLASSES);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__GLASSES);
setCollisionSize(fh->W,fh->H);
GameScene.getPlayer()->registerAddon(PLAYER_ADDON_GLASSES);
@ -93,7 +94,7 @@ DVECTOR CGlassesPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__GLASSES);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__GLASSES);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -144,7 +145,7 @@ void CGlassesPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__GLASSES);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);

7
source/pickups/phealth.cpp
View file

@ -33,6 +33,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -74,7 +75,7 @@ void CBaseHealthPickup::init()
CBasePickup::init();
m_sin=0;
fh=getSpriteBank()->getFrameHeader(getFrameNumber());
fh=CGameScene::getSpriteBank()->getFrameHeader(getFrameNumber());
setCollisionSize(fh->W,fh->H);
}
@ -89,7 +90,7 @@ DVECTOR CBaseHealthPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(getFrameNumber());
fh=CGameScene::getSpriteBank()->getFrameHeader(getFrameNumber());
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -132,7 +133,7 @@ void CBaseHealthPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int angle;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(getFrameNumber());
angle=((msin(m_sin)*health_rotatescale)>>12)&4095;
sprites->printRotatedScaledSprite(fh,_pos->vx,_pos->vy,4096,4096,angle,OTPOS__PICKUP_POS);

7
source/pickups/phelmet.cpp
View file

@ -29,6 +29,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -69,7 +70,7 @@ void CHelmetPickup::init()
CBasePickup::init();
fh=getSpriteBank()->getFrameHeader(FRM__HELMET);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__HELMET);
setCollisionSize(fh->W,fh->H);
}
@ -84,7 +85,7 @@ DVECTOR CHelmetPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__HELMET);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__HELMET);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -115,7 +116,7 @@ void CHelmetPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__HELMET);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);

13
source/pickups/pickup.cpp
View file

@ -79,6 +79,7 @@
#include "pickups\pquest.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -117,8 +118,6 @@ void CBasePickup::init()
{
CPickupThing::init();
m_spriteBank=new ("pickup sprite") SpriteBank();
m_spriteBank->load(SPRITES_SPRITES_SPR);
}
/*----------------------------------------------------------------------
@ -129,7 +128,6 @@ void CBasePickup::init()
---------------------------------------------------------------------- */
void CBasePickup::shutdown()
{
m_spriteBank->dump(); delete m_spriteBank;
CPickupThing::shutdown();
}
@ -320,7 +318,7 @@ void CBaseWeaponSimplePickup::init()
CBaseWeaponPickup::init();
fh=getSpriteBank()->getFrameHeader(FRM__NET);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__NET);
setCollisionSize(fh->W,fh->H);
}
@ -335,7 +333,7 @@ DVECTOR CBaseWeaponSimplePickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(getWeaponSpriteFrame());
fh=CGameScene::getSpriteBank()->getFrameHeader(getWeaponSpriteFrame());
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -353,7 +351,7 @@ void CBaseWeaponSimplePickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(getWeaponSpriteFrame());
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);
@ -374,6 +372,8 @@ CBasePickup *createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
CBasePickup *pickup;
DVECTOR pickupPos;
pickup = (CBasePickup*)CThingManager::GetThing(CThing::TYPE_PICKUP,_type);
if (!pickup)
switch(_type)
{
case PICKUP__BIG_HEALTH:
@ -447,6 +447,7 @@ CBasePickup *createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
return NULL;
}
pickup->setThingSubType(_type);
pickup->init();
pickupPos=pickup->getSizeForPlacement();
pickupPos.vx=_pos->vx+(pickupPos.vx/2);

7
source/pickups/pickup.h
View file

@ -49,6 +49,7 @@ typedef enum
PICKUP__QUEST_ITEM,
PICKUP__BALLOON_AND_SPATULA,
PICKUP__JELLY_LAUNCHER,
PICKUP__MAX
}
PICKUP_TYPE;
@ -60,6 +61,10 @@ PICKUP_TYPE;
class CBasePickup : public CPickupThing
{
public:
enum
{ // For Dynamic ThingCache
MAX_SUBTYPE =PICKUP__MAX,
};
virtual void init();
virtual void shutdown();
virtual void think(int _frames);
@ -75,7 +80,6 @@ protected:
DEFAULT_VISIBILITY_RADIUS=32,
};
class SpriteBank *getSpriteBank() {return m_spriteBank;}
virtual int getVisibilityRadius() {return DEFAULT_VISIBILITY_RADIUS;}
virtual void thinkPickup(int _Frames) {;}
@ -84,7 +88,6 @@ protected:
virtual void collidedWith(CThing *_thisThing);
private:
class SpriteBank *m_spriteBank;
};

7
source/pickups/pjlammo.cpp
View file

@ -37,6 +37,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -78,7 +79,7 @@ void CJellyLauncherAmmoPickup::init()
CBasePickup::init();
m_rattle=0;
fh=getSpriteBank()->getFrameHeader(FRM__JELLYAMMO);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__JELLYAMMO);
setCollisionSize(fh->W,fh->H);
}
@ -93,7 +94,7 @@ DVECTOR CJellyLauncherAmmoPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__JELLYAMMO);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__JELLYAMMO);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -139,7 +140,7 @@ void CJellyLauncherAmmoPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int angle;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__JELLYAMMO);
if(m_rattle<=jlammo_rattlecount*4095)
{

7
source/pickups/plife.cpp
View file

@ -33,6 +33,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -74,7 +75,7 @@ void CLifePickup::init()
CBasePickup::init();
m_sin=0;
fh=getSpriteBank()->getFrameHeader(FRM__PANTS);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__PANTS);
setCollisionSize(fh->W,fh->H);
}
@ -89,7 +90,7 @@ DVECTOR CLifePickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__PANTS);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__PANTS);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -133,7 +134,7 @@ void CLifePickup::renderPickup(DVECTOR *_pos)
int x,y;
int size;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__PANTS);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);

7
source/pickups/pquest.cpp
View file

@ -37,6 +37,7 @@
#include "game\game.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -130,7 +131,7 @@ void CQuestItemPickup::init()
}
ASSERT(m_gfxFrame!=-1);
fh=getSpriteBank()->getFrameHeader(m_gfxFrame);
fh=CGameScene::getSpriteBank()->getFrameHeader(m_gfxFrame);
setCollisionSize(fh->W,fh->H);
}
@ -145,7 +146,7 @@ DVECTOR CQuestItemPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(m_gfxFrame);
fh=CGameScene::getSpriteBank()->getFrameHeader(m_gfxFrame);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -209,7 +210,7 @@ void CQuestItemPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(m_gfxFrame);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);

7
source/pickups/pshoes.cpp
View file

@ -33,6 +33,7 @@
#include "gfx\otpos.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -74,7 +75,7 @@ void CShoesPickup::init()
CBaseRespawningPickup::init();
m_sin=0;
fh=getSpriteBank()->getFrameHeader(FRM__SHOE);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__SHOE);
setCollisionSize(fh->W,fh->H);
}
@ -89,7 +90,7 @@ DVECTOR CShoesPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__SHOE);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__SHOE);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -144,7 +145,7 @@ void CShoesPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y,yoff;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__SHOE);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);

9
source/pickups/pspatula.cpp
View file

@ -37,6 +37,7 @@
#include "game\game.h"
#endif
#include "game/game.h"
/* Std Lib
------- */
@ -79,7 +80,7 @@ void CSpatulaPickup::init()
m_glint=0;
m_glintRot=0;
fh=getSpriteBank()->getFrameHeader(FRM__SPATULA);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__SPATULA);
setCollisionSize(fh->W,fh->H);
}
@ -94,7 +95,7 @@ DVECTOR CSpatulaPickup::getSizeForPlacement()
DVECTOR size;
sFrameHdr *fh;
fh=getSpriteBank()->getFrameHeader(FRM__SPATULA);
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__SPATULA);
size.vx=fh->W;
size.vy=fh->H;
return size;
@ -143,7 +144,7 @@ void CSpatulaPickup::renderPickup(DVECTOR *_pos)
sFrameHdr *fh;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__SPATULA);
x=_pos->vx-(fh->W/2);
y=_pos->vy-(fh->H/2);
@ -213,7 +214,7 @@ void CBalloonAndSpatulaPickup::renderPickup(DVECTOR *_pos)
int xo1,xo2;
int x,y;
sprites=getSpriteBank();
sprites=CGameScene::getSpriteBank();
fh=sprites->getFrameHeader(FRM__BALLOON);
fhspat=sprites->getFrameHeader(FRM__SPATULA);