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-22 17:01:34 +00:00
parent 153cafc7e2
commit 2c5fa6ec54
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/level/layercollision.cpp
View file

@ -151,7 +151,7 @@ void CLayerCollision::render(DVECTOR &MapPos)
xoff=MapPos.vx&15; xoff=MapPos.vx&15;
yoff=MapPos.vy&15; yoff=MapPos.vy&15;
mapx=MapPos.vx/16; mapx=MapPos.vx/16;
mapy=MapPos.vy/16+4; // (pkg) mapy=MapPos.vy/16;
for(y=-yoff;y<(20*16)-yoff;y+=16) for(y=-yoff;y<(20*16)-yoff;y+=16)
{ {
coll=&Map[mapx+(mapy*MapWidth)]; coll=&Map[mapx+(mapy*MapWidth)];

3
source/level/layertile.cpp
View file

@ -66,8 +66,11 @@ int YPos=MapPos.vy>>MapXYShift;
MapXY.vx=XPos>>4; MapXY.vx=XPos>>4;
MapXY.vy=YPos>>4; MapXY.vy=YPos>>4;
if (LayerHdr->SubType==1) // BODGE AND A HALF
{
/**/ MapXY.vx+=TileMapOfs.vx; /**/ MapXY.vx+=TileMapOfs.vx;
/**/ MapXY.vy+=TileMapOfs.vy; /**/ MapXY.vy+=TileMapOfs.vy;
}
ShiftX=XPos & 15; ShiftX=XPos & 15;
ShiftY=YPos & 15; ShiftY=YPos & 15;

6
source/player/player.cpp
View file

@ -149,7 +149,7 @@ int MAP3D_CENTRE_Y=500;
int MAP3D_BLOCKSTEPSIZE=315; int MAP3D_BLOCKSTEPSIZE=315;
int MAP2D_CENTRE_X=-256; int MAP2D_CENTRE_X=-256;
int MAP2D_CENTRE_Y=-136-(4*16); int MAP2D_CENTRE_Y=-136;
int MAP2D_BLOCKSTEPSIZE=16; int MAP2D_BLOCKSTEPSIZE=16;
int CAMERA_SCROLLLIMIT=8; // SB is this many tiles off centre at most int CAMERA_SCROLLLIMIT=8; // SB is this many tiles off centre at most
@ -322,9 +322,9 @@ if(PadGetDown(0)&PAD_CIRCLE)
// Move the camera offset // Move the camera offset
m_playerScreenPos.vx=MAP3D_CENTRE_X+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPos.vx)>>8); m_playerScreenPos.vx=MAP3D_CENTRE_X+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPos.vx)>>8);
m_playerScreenPos.vy=MAP3D_CENTRE_Y+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPos.vy)>>8);; m_playerScreenPos.vy=MAP3D_CENTRE_Y+((MAP3D_BLOCKSTEPSIZE*m_cameraScrollPos.vy)>>8);
m_cameraOffset.vx=MAP2D_CENTRE_X+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vx))>>8); m_cameraOffset.vx=MAP2D_CENTRE_X+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vx))>>8);
m_cameraOffset.vy=MAP2D_CENTRE_Y+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vy))>>8);; m_cameraOffset.vy=MAP2D_CENTRE_Y+((MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vy))>>8);
m_cameraPos.vx=Pos.vx+m_cameraOffset.vx; m_cameraPos.vx=Pos.vx+m_cameraOffset.vx;
m_cameraPos.vy=Pos.vy+m_cameraOffset.vy; m_cameraPos.vy=Pos.vy+m_cameraOffset.vy;