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

Browse source
This commit is contained in:
Paul 2001-02-12 15:26:00 +00:00
parent 96fb7259d2
commit 7f10a4e47e
5 changed files with 94 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/game/game.cpp
View file

@ -91,6 +91,7 @@ void CGameScene::init()
createPlayer(); createPlayer();
m_player->init(); m_player->init();
m_player->setLayerCollision(Level.getCollisionLayer()); m_player->setLayerCollision(Level.getCollisionLayer());
m_player->setMapSize(Level.getMapSize());
m_pauseMenu=new ("Pause Menu") CPauseMenu(); m_pauseMenu=new ("Pause Menu") CPauseMenu();
m_pauseMenu->init(); m_pauseMenu->init();
@ -115,7 +116,7 @@ void CGameScene::createPlayer()
void CGameScene::shutdown() void CGameScene::shutdown()
{ {
m_pauseMenu->shutdown(); m_pauseMenu->shutdown(); delete m_pauseMenu;
m_player->shutdown(); delete m_player; m_player->shutdown(); delete m_player;
CThing::shutdownAndDeleteAllThings(); CThing::shutdownAndDeleteAllThings();
@ -160,8 +161,8 @@ void CGameScene::think(int _frames)
CThing::thinkAllThings(_frames); CThing::thinkAllThings(_frames);
camPos=m_player->getCameraPos(); camPos=m_player->getCameraPos();
//PKG //PKG
if(camPos.vx<0)camPos.vx=0; // if(camPos.vx<0){camPos.vx=0;PAUL_DBGMSG("cx<0");}
if(camPos.vy<0)camPos.vy=0; // if(camPos.vy<0){camPos.vy=0;PAUL_DBGMSG("cy<0");}
//PKG //PKG
CBubicleFactory::setMapOffset(&camPos); CBubicleFactory::setMapOffset(&camPos);
Level.setCameraCentre(camPos); Level.setCameraCentre(camPos);

30
source/level/level.cpp
View file

@ -148,21 +148,8 @@ sOT *ThisOT=OtPtr+LayerOT;
/*****************************************************************************/ /*****************************************************************************/
/*****************************************************************************/ /*****************************************************************************/
/*****************************************************************************/ /*****************************************************************************/
int MapSpd=4;
void CLevel::think(int _frames) void CLevel::think(int _frames)
{ {
/*
int padh = PadGetHeld( 0 );
if (padh & PAD_LEFT) MapPos.vx-=MapSpd;
if (padh & PAD_RIGHT) MapPos.vx+=MapSpd;
if (padh & PAD_UP) MapPos.vy-=MapSpd;
if (padh & PAD_DOWN) MapPos.vy+=MapSpd;
if (MapPos.vx<0) MapPos.vx=0;
if (MapPos.vy<0) MapPos.vy=0;
*/
for (int i=0; i<CLayerTile::LAYER_TILE_TYPE_MAX; i++) for (int i=0; i<CLayerTile::LAYER_TILE_TYPE_MAX; i++)
{ {
if (TileLayers[i]) TileLayers[i]->think(MapPos); if (TileLayers[i]) TileLayers[i]->think(MapPos);
@ -170,4 +157,21 @@ int padh = PadGetHeld( 0 );
} }
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
DVECTOR CLevel::getMapSize()
{
DVECTOR size;
sLayerHdr *layer;
layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->ActionLayer);
size.vx=layer->Width;
size.vy=layer->Height;
return size;
}
/*****************************************************************************/ /*****************************************************************************/

1
source/level/level.h
View file

@ -26,6 +26,7 @@ public:
void setCameraCentre(DVECTOR _pos) {MapPos=_pos;} void setCameraCentre(DVECTOR _pos) {MapPos=_pos;}
static DVECTOR getCameraPos() {return MapPos;} static DVECTOR getCameraPos() {return MapPos;}
CLayerCollision *getCollisionLayer() {return CollisionLayer;} CLayerCollision *getCollisionLayer() {return CollisionLayer;}
DVECTOR getMapSize();
private: private:
void initLayers(); void initLayers();

106
source/player/player.cpp
View file

@ -79,7 +79,7 @@
#include "player\demoplay.h" #include "player\demoplay.h"
#define MAX_DEMO_SIZE 512 // So max size of a demo is 1k #define MAX_DEMO_SIZE 512 // So max size of a demo is 1k
#define MAX_DEMO_TIME_IN_FRAMES 30*60 // Recorded demo will last 60 seconds #define MAX_DEMO_TIME_IN_FRAMES 30*60 // Recorded demo will last 30 seconds
static CDemoPlayer::demoPlayerControl s_demoControls[MAX_DEMO_SIZE]={{PI_NONE,0}}; static CDemoPlayer::demoPlayerControl s_demoControls[MAX_DEMO_SIZE]={{PI_NONE,0}};
static int s_demoSize=0; static int s_demoSize=0;
@ -140,7 +140,8 @@ FontBank s_debugFont;
int s_health; int s_health;
int s_screenPos; int s_screenPos;
int m_cameraScrollPos=0; int m_cameraScrollPosX=0;
int m_cameraScrollPosY=600;
int m_cameraScrollDir=0; int m_cameraScrollDir=0;
@ -152,17 +153,18 @@ int MAP2D_CENTRE_X=-256;
int MAP2D_CENTRE_Y=-136; int MAP2D_CENTRE_Y=-136;
int MAP2D_BLOCKSTEPSIZE=16; int MAP2D_BLOCKSTEPSIZE=16;
int CAMERA_SCROLLLIMIT=8; int CAMERA_SCROLLLIMIT=8; // SB is this many tiles off centre at most
int CAMERA_SCROLLTHRESHOLD=6; int CAMERA_SCROLLTHRESHOLD=6; // If SB moves when more than this many tiles off-centre, the camera will *always* scroll
int CAMERA_SCROLLSPEED=60; int CAMERA_STARTMOVETHRESHOLD=20; // If SB moves faster than this then the camera starts scrolling
int CAMERA_STARTMOVETHRESHOLD=20; int CAMERA_STOPMOVETHRESHOLD=10; // If SB moves slower than this then the camera stops scrolling
int CAMERA_STOPMOVETHRESHOLD=10; int CAMERA_SCROLLSPEED=60; // Speed of the scroll ( 60=1 tile scrolled every 4 and a bit frames )
int angg=900; int angg=900;
DVECTOR ppos={0,0}; DVECTOR ppos;
DVECTOR ofs={0,0}; DVECTOR ofs;
DVECTOR m_cameraPos;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -204,8 +206,6 @@ m_animFrame=0;
m_cameraOffset.vx=0; m_cameraOffset.vx=0;
m_cameraOffset.vy=0; m_cameraOffset.vy=0;
m_cameraLookYOffset=0;
m_cameraLookTimer=0;
m_lastPadInput=m_padInput=PI_NONE; m_lastPadInput=m_padInput=PI_NONE;
@ -242,7 +242,7 @@ void CPlayer::shutdown()
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int newmode=-1; int newmode=-1;
DVECTOR pos;
void CPlayer::think(int _frames) void CPlayer::think(int _frames)
{ {
int i; int i;
@ -286,7 +286,6 @@ if(newmode!=-1)
updatePadInput(); updatePadInput();
m_currentStateClass->think(this); m_currentStateClass->think(this);
// Horizontal movement // Horizontal movement
if(m_layerCollision->Get((Pos.vx+(m_moveVel.vx>>VELOCITY_SHIFT))>>4,(Pos.vy-1)>>4)) if(m_layerCollision->Get((Pos.vx+(m_moveVel.vx>>VELOCITY_SHIFT))>>4,(Pos.vy-1)>>4))
{ {
@ -401,24 +400,24 @@ if(PadGetDown(0)&PAD_CIRCLE)
// Camera scroll.. // Camera scroll..
if(m_cameraScrollDir==-1) if(m_cameraScrollDir==-1)
{ {
if(m_cameraScrollPos>-CAMERA_SCROLLLIMIT<<8) if(m_cameraScrollPosX>-CAMERA_SCROLLLIMIT<<8)
{ {
m_cameraScrollPos-=CAMERA_SCROLLSPEED; m_cameraScrollPosX-=CAMERA_SCROLLSPEED;
if(m_cameraScrollPos<-CAMERA_SCROLLLIMIT<<8) if(m_cameraScrollPosX<-CAMERA_SCROLLLIMIT<<8)
{ {
m_cameraScrollPos=-CAMERA_SCROLLLIMIT<<8; m_cameraScrollPosX=-CAMERA_SCROLLLIMIT<<8;
m_cameraScrollDir=0; m_cameraScrollDir=0;
} }
} }
} }
else if(m_cameraScrollDir==+1) else if(m_cameraScrollDir==+1)
{ {
if(m_cameraScrollPos<(CAMERA_SCROLLLIMIT<<8)) if(m_cameraScrollPosX<(CAMERA_SCROLLLIMIT<<8))
{ {
m_cameraScrollPos+=CAMERA_SCROLLSPEED; m_cameraScrollPosX+=CAMERA_SCROLLSPEED;
if(m_cameraScrollPos>CAMERA_SCROLLLIMIT<<8) if(m_cameraScrollPosX>CAMERA_SCROLLLIMIT<<8)
{ {
m_cameraScrollPos=CAMERA_SCROLLLIMIT<<8; m_cameraScrollPosX=CAMERA_SCROLLLIMIT<<8;
m_cameraScrollDir=0; m_cameraScrollDir=0;
} }
} }
@ -429,6 +428,7 @@ if(PadGetDown(0)&PAD_CIRCLE)
/* /*
if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_UP)) if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_UP))
{ {
@ -486,17 +486,38 @@ if(PadGetDown(0)&PAD_CIRCLE)
#endif #endif
// Move the camera offset // Move the camera offset
ppos.vx=MAP3D_CENTRE_X+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPos)>>8); ppos.vx=MAP3D_CENTRE_X+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPosX)>>8);
ppos.vy=MAP3D_CENTRE_Y; ppos.vy=MAP3D_CENTRE_Y+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPosY)>>8);;
ofs.vx=MAP2D_CENTRE_X+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos))>>8); m_cameraOffset.vx=MAP2D_CENTRE_X+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPosX))>>8);
ofs.vy=MAP2D_CENTRE_Y; m_cameraOffset.vy=MAP2D_CENTRE_Y+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPosY))>>8);;
ofs=m_cameraOffset;
pos=Pos;
m_cameraPos.vx=Pos.vx+m_cameraOffset.vx;
m_cameraPos.vy=Pos.vy+m_cameraOffset.vy;
// Limit camera scroll to the edges of the map
m_cameraOffset=ofs; if(m_cameraPos.vx<0)
{
if(Pos.vx<0)Pos.vx=0; ppos.vx+=m_cameraPos.vx*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
if(Pos.vy<0)Pos.vy=0; m_cameraPos.vx=0;
}
else if(m_cameraPos.vx>m_mapCameraEdges.vx)
{
ppos.vx-=(m_mapCameraEdges.vx-m_cameraPos.vx)*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
m_cameraPos.vx=m_mapCameraEdges.vx;
}
if(m_cameraPos.vy<0)
{
ppos.vy+=m_cameraPos.vy*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
m_cameraPos.vy=0;
}
else if(m_cameraPos.vy>m_mapCameraEdges.vy)
{
ppos.vy-=(m_mapCameraEdges.vy-m_cameraPos.vy)*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
m_cameraPos.vy=m_mapCameraEdges.vy;
}
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -530,7 +551,7 @@ if(eyes!=-1)
} }
#endif #endif
//int xval=255-(MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos>>8)); //int xval=(255-(MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPosX>>8)));
//DrawLine(xval-7,0,xval-7,255,0,128,255,0); //DrawLine(xval-7,0,xval-7,255,0,128,255,0);
//DrawLine(xval+7,0,xval+7,255,0,128,255,0); //DrawLine(xval+7,0,xval+7,255,0,128,255,0);
@ -564,10 +585,21 @@ if(eyes!=-1)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
DVECTOR CPlayer::getCameraPos() DVECTOR CPlayer::getCameraPos()
{ {
DVECTOR cameraPos; return m_cameraPos;
cameraPos.vx=Pos.vx+m_cameraOffset.vx; }
cameraPos.vy=Pos.vy+m_cameraOffset.vy;
return cameraPos;
/*----------------------------------------------------------------------
Function:
Purpose: Pre-calcs the visible edges of the map ( ie: the hard limits
for the camera pos )
Params:
Returns:
---------------------------------------------------------------------- */
void CPlayer::setMapSize(DVECTOR _mapSize)
{
m_mapCameraEdges.vx=(_mapSize.vx-34)*MAP2D_BLOCKSTEPSIZE; // Made up numbers! :) (pkg)
m_mapCameraEdges.vy=(_mapSize.vy-18)*MAP2D_BLOCKSTEPSIZE;
} }
@ -823,7 +855,7 @@ void CPlayer::moveLeft()
m_moveVel.vx-=metrics->m_metric[PM__RUN_REVERSESLOWDOWN]; m_moveVel.vx-=metrics->m_metric[PM__RUN_REVERSESLOWDOWN];
} }
if(m_moveVel.vx<-CAMERA_STARTMOVETHRESHOLD||m_cameraScrollPos<-CAMERA_SCROLLTHRESHOLD<<8) if(m_moveVel.vx<-CAMERA_STARTMOVETHRESHOLD||m_cameraScrollPosX<-CAMERA_SCROLLTHRESHOLD<<8)
{ {
m_cameraScrollDir=+1; m_cameraScrollDir=+1;
} }
@ -851,7 +883,7 @@ void CPlayer::moveRight()
m_moveVel.vx+=metrics->m_metric[PM__RUN_REVERSESLOWDOWN]; m_moveVel.vx+=metrics->m_metric[PM__RUN_REVERSESLOWDOWN];
} }
if(m_moveVel.vx>CAMERA_STARTMOVETHRESHOLD||m_cameraScrollPos>CAMERA_SCROLLTHRESHOLD<<8) if(m_moveVel.vx>CAMERA_STARTMOVETHRESHOLD||m_cameraScrollPosX>CAMERA_SCROLLTHRESHOLD<<8)
{ {
m_cameraScrollDir=-1; m_cameraScrollDir=-1;
} }

6
source/player/player.h
View file

@ -149,6 +149,7 @@ public:
DVECTOR getCameraPos(); DVECTOR getCameraPos();
void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;} void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;}
void setMapSize(DVECTOR _mapSize);
protected: protected:
enum enum
@ -249,8 +250,6 @@ private:
int m_lives; int m_lives;
DVECTOR m_cameraOffset; DVECTOR m_cameraOffset;
int m_cameraLookYOffset;
int m_cameraLookTimer;
void updatePadInput(); void updatePadInput();
protected: protected:
@ -261,8 +260,9 @@ private:
PLAYERINPUT m_padInputDown; // Controls that were pressed this frame PLAYERINPUT m_padInputDown; // Controls that were pressed this frame
// Pointer to the collision layer for the current map // Various info about the current map
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;
DVECTOR m_mapCameraEdges;
}; };