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-05-03 18:42:56 +00:00
parent 628caff495
commit 48197daae3
3 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/game/game.cpp
View file

@ -306,7 +306,9 @@ void CGameScene::initLevel()
m_player->setRespawnPos(Level.getPlayerSpawnPos()); m_player->setRespawnPos(Level.getPlayerSpawnPos());
m_player->init(); m_player->init();
m_player->setLayerCollision(Level.getCollisionLayer()); m_player->setLayerCollision(Level.getCollisionLayer());
m_player->setMapSize(Level.getMapSize()); DVECTOR mapSize=Level.getMapSize();
CPlayer::CameraBox camBox={0,0,mapSize.vx,mapSize.vy};
m_player->setCameraBox(camBox);
// Init actors (needs moving and tidying // Init actors (needs moving and tidying
int actorNum; int actorNum;

57
source/player/player.cpp
View file

@ -619,12 +619,11 @@ if(newmode!=-1)
m_invincibleFrameCount--; m_invincibleFrameCount--;
} }
// Stop the player vanishing off the edge of the telly..
if(Pos.vx<64)Pos.vx=64; if(Pos.vx<m_playerPosLimitBox.x1) Pos.vx=m_playerPosLimitBox.x1;
else if(Pos.vx>m_mapEdge.vx-64)Pos.vx=m_mapEdge.vx-64; else if(Pos.vx>m_playerPosLimitBox.x2) Pos.vx=m_playerPosLimitBox.x2;
if(Pos.vy<64)Pos.vy=64; if(Pos.vy<m_playerPosLimitBox.y1) Pos.vy=m_playerPosLimitBox.y1;
else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64; else if(Pos.vy>m_playerPosLimitBox.y2) Pos.vy=m_playerPosLimitBox.y2;
// Look around // Look around
int pad=getPadInputHeld(); int pad=getPadInputHeld();
@ -775,24 +774,11 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
m_cameraPos.vx=m_currentCamFocusPoint.vx; m_cameraPos.vx=m_currentCamFocusPoint.vx;
m_cameraPos.vy=m_currentCamFocusPoint.vy+yoff; m_cameraPos.vy=m_currentCamFocusPoint.vy+yoff;
// Limit camera scroll to the edges of the map // Limit camera scroll to the edges of the map
if(m_cameraPos.vx<0) if(m_cameraPos.vx<m_cameraPosLimitBox.x1) m_cameraPos.vx=m_cameraPosLimitBox.x1;
{ else if(m_cameraPos.vx>m_cameraPosLimitBox.x2) m_cameraPos.vx=m_cameraPosLimitBox.x2;
m_cameraPos.vx=0; if(m_cameraPos.vy<m_cameraPosLimitBox.y1) m_cameraPos.vy=m_cameraPosLimitBox.y1;
} else if(m_cameraPos.vy>m_cameraPosLimitBox.y2) m_cameraPos.vy=m_cameraPosLimitBox.y2;
else if(m_cameraPos.vx>m_mapCameraEdges.vx)
{
m_cameraPos.vx=m_mapCameraEdges.vx;
}
if(m_cameraPos.vy<0)
{
m_cameraPos.vy=0;
}
else if(m_cameraPos.vy>m_mapCameraEdges.vy)
{
m_cameraPos.vy=m_mapCameraEdges.vy;
}
CPlayerThing::think(_frames); CPlayerThing::think(_frames);
} }
@ -945,15 +931,28 @@ for(int i=0;i<NUM_LASTPOS;i++)
Function: Function:
Purpose: Pre-calcs the visible edges of the map ( ie: the hard limits Purpose: Pre-calcs the visible edges of the map ( ie: the hard limits
for the camera pos ) for the camera pos )
Params: Params: camera box ( in tiles )
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CPlayer::setMapSize(DVECTOR _mapSize) void CPlayer::setCameraBox(CameraBox _cameraBox)
{ {
m_mapCameraEdges.vx=(_mapSize.vx-34)*MAP2D_BLOCKSTEPSIZE; // Made up numbers! :) (pkg) _cameraBox.x1*=16;
m_mapCameraEdges.vy=(_mapSize.vy-18)*MAP2D_BLOCKSTEPSIZE; _cameraBox.y1*=16;
m_mapEdge.vx=_mapSize.vx*MAP2D_BLOCKSTEPSIZE; _cameraBox.x2*=16;
m_mapEdge.vy=_mapSize.vy*MAP2D_BLOCKSTEPSIZE; _cameraBox.y2*=16;
//PAUL_DBGMSG("setCameraBox %d,%d %d,%d",_cameraBox.x1,_cameraBox.y1,_cameraBox.x2,_cameraBox.y2);
m_cameraPosLimitBox.x1=_cameraBox.x1;
m_cameraPosLimitBox.y1=_cameraBox.y1;
m_cameraPosLimitBox.x2=_cameraBox.x2-(32*MAP2D_BLOCKSTEPSIZE); // Made up numbers! :) (pkg);
m_cameraPosLimitBox.y2=_cameraBox.y2-(16*MAP2D_BLOCKSTEPSIZE);
//PAUL_DBGMSG("m_cameraPosLimitBox %d,%d %d,%d",m_cameraPosLimitBox.x1,m_cameraPosLimitBox.y1,m_cameraPosLimitBox.x2,m_cameraPosLimitBox.y2);
m_playerPosLimitBox.x1=_cameraBox.x1+64;
m_playerPosLimitBox.y1=_cameraBox.y1+64;
m_playerPosLimitBox.x2=_cameraBox.x2-64;
m_playerPosLimitBox.y2=_cameraBox.y2-64;
//PAUL_DBGMSG("m_playerPosLimitBox %d,%d %d,%d",m_playerPosLimitBox.x1,m_playerPosLimitBox.y1,m_playerPosLimitBox.x2,m_playerPosLimitBox.y2);
} }

13
source/player/player.h
View file

@ -157,6 +157,13 @@ public:
MAX_LIVES=99, MAX_LIVES=99,
}; };
typedef struct
{
s16 x1,y1;
s16 x2,y2;
} CameraBox;
virtual void init(); virtual void init();
virtual void shutdown(); virtual void shutdown();
virtual void think(int _frames); virtual void think(int _frames);
@ -172,7 +179,7 @@ public:
DVECTOR getCameraPos() {return m_cameraPos;} DVECTOR getCameraPos() {return m_cameraPos;}
void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;} void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;}
void setMapSize(DVECTOR _mapSize); void setCameraBox(CameraBox _cameraBox);
void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;} void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;}
int getHeightFromGround(int _x,int _y,int _maxHeight=32); int getHeightFromGround(int _x,int _y,int _maxHeight=32);
@ -284,8 +291,8 @@ private:
// Various info about the current map // Various info about the current map
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;
DVECTOR m_mapCameraEdges; CameraBox m_cameraPosLimitBox;
DVECTOR m_mapEdge; CameraBox m_playerPosLimitBox;
DVECTOR m_respawnPos; DVECTOR m_respawnPos;