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 20:14:31 +00:00
parent 48896226dc
commit e168a71eda
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/player/player.cpp
View file

@ -377,6 +377,11 @@ Pos.vy=((Pos.vy-16)&0xfffffff0)+colHeight;
} }
} }
if(Pos.vx<16)Pos.vx=16;
else if(Pos.vx>m_mapEdge.vx)Pos.vx=m_mapEdge.vx;
if(Pos.vy<16)Pos.vy=16;
else if(Pos.vy>m_mapEdge.vy-16)Pos.vy=m_mapEdge.vy-16;
// Flashing.. // Flashing..
if(m_invincibleFrameCount) if(m_invincibleFrameCount)
{ {
@ -600,6 +605,8 @@ void CPlayer::setMapSize(DVECTOR _mapSize)
{ {
m_mapCameraEdges.vx=(_mapSize.vx-34)*MAP2D_BLOCKSTEPSIZE; // Made up numbers! :) (pkg) m_mapCameraEdges.vx=(_mapSize.vx-34)*MAP2D_BLOCKSTEPSIZE; // Made up numbers! :) (pkg)
m_mapCameraEdges.vy=(_mapSize.vy-18)*MAP2D_BLOCKSTEPSIZE; m_mapCameraEdges.vy=(_mapSize.vy-18)*MAP2D_BLOCKSTEPSIZE;
m_mapEdge.vx=_mapSize.vx*MAP2D_BLOCKSTEPSIZE;
m_mapEdge.vy=_mapSize.vy*MAP2D_BLOCKSTEPSIZE;
} }

1
source/player/player.h
View file

@ -265,6 +265,7 @@ private:
// Various info about the current map // Various info about the current map
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;
DVECTOR m_mapCameraEdges; DVECTOR m_mapCameraEdges;
DVECTOR m_mapEdge;
DVECTOR m_respawnPos; DVECTOR m_respawnPos;
}; };