This commit is contained in:
parent
ccd7fd952a
commit
8804162061
4 changed files with 15 additions and 11 deletions
|
@ -84,8 +84,8 @@ int Width,Height;
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height);
|
AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height);
|
||||||
AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height);
|
AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height);
|
||||||
AddLayer(LAYER_TYPE_FX,LAYER_SUBTYPE_NONE, Width, Height);
|
// AddLayer(LAYER_TYPE_FX,LAYER_SUBTYPE_NONE, Width, Height);
|
||||||
AddLayer(LAYER_TYPE_ACTOR,LAYER_SUBTYPE_NONE, Width, Height);
|
// AddLayer(LAYER_TYPE_ACTOR,LAYER_SUBTYPE_NONE, Width, Height);
|
||||||
// AddLayer(LAYER_TYPE_ITEM,LAYER_SUBTYPE_NONE, Width, Height);
|
// AddLayer(LAYER_TYPE_ITEM,LAYER_SUBTYPE_NONE, Width, Height);
|
||||||
#endif
|
#endif
|
||||||
for (int i=0; i<Layer.size(); i++)
|
for (int i=0; i<Layer.size(); i++)
|
||||||
|
|
|
@ -647,12 +647,6 @@ vector<sSpriteFrame> Hdrs;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ // Pak
|
{ // Pak
|
||||||
// int XOfs=ThisBmp.Frm.GetX()-(ThisBmp.OrigW/2);
|
|
||||||
// int YOfs=ThisBmp.Frm.GetY()-(ThisBmp.OrigH);
|
|
||||||
int OH=ThisBmp.OrigH;
|
|
||||||
int NH=ThisBmp.Frm.GetHeight();
|
|
||||||
// int XOfs=ThisBmp.Frm.GetX()-(MaxW/2);
|
|
||||||
// int YOfs=ThisBmp.Frm.GetY()-(OH-NH);
|
|
||||||
int XOfs=ThisBmp.CrossHairX;
|
int XOfs=ThisBmp.CrossHairX;
|
||||||
int YOfs=ThisBmp.CrossHairY;
|
int YOfs=ThisBmp.CrossHairY;
|
||||||
|
|
||||||
|
|
|
@ -235,6 +235,7 @@ void CGameScene::think(int _frames)
|
||||||
else if(s_levelFinished)
|
else if(s_levelFinished)
|
||||||
{
|
{
|
||||||
s_globalLevelSelectThing++;
|
s_globalLevelSelectThing++;
|
||||||
|
s_globalLevelSelectThing&=3;
|
||||||
|
|
||||||
shutdownLevel();
|
shutdownLevel();
|
||||||
initLevel();
|
initLevel();
|
||||||
|
|
|
@ -228,8 +228,9 @@ sOT *ThisOT=OtPtr+OTPos;
|
||||||
int i,ThisY=-YOfs;
|
int i,ThisY=-YOfs;
|
||||||
|
|
||||||
// Render Back Sprites
|
// Render Back Sprites
|
||||||
#ifndef __USER_paul__
|
#if 0
|
||||||
sBackSprite *SpritePtr=SpriteList;
|
sBackSprite *SpritePtr=SpriteList;
|
||||||
|
|
||||||
for (i=0; i<SPRITE_MAX; i++)
|
for (i=0; i<SPRITE_MAX; i++)
|
||||||
{
|
{
|
||||||
SpritePtr->Pos.vx+=SpritePtr->PosInc.vx;
|
SpritePtr->Pos.vx+=SpritePtr->PosInc.vx;
|
||||||
|
@ -268,13 +269,21 @@ sBox Box;
|
||||||
AddPrim(ThisOT,Gt4);
|
AddPrim(ThisOT,Gt4);
|
||||||
SpritePtr++;
|
SpritePtr++;
|
||||||
}
|
}
|
||||||
#endif /* __USER_paul__ */
|
#endif
|
||||||
|
|
||||||
// Render Back Shade
|
// Render Back Shade
|
||||||
for (i=0; i<BandCount; i++)
|
for (i=0; i<BandCount; i++)
|
||||||
{
|
{
|
||||||
setXYWH(&Band[i],0,ThisY,512,BandHeight);
|
setXYWH(&Band[i],0,ThisY,512,BandHeight*2);
|
||||||
addPrim(ThisOT,&Band[i]);
|
addPrim(ThisOT,&Band[i]);
|
||||||
ThisY+=BandHeight;
|
ThisY+=BandHeight;
|
||||||
}
|
}
|
||||||
|
if (Band[BandCount-1].y1<0)
|
||||||
|
{
|
||||||
|
Band[BandCount-1].y0=0;
|
||||||
|
Band[BandCount-1].y1=0;
|
||||||
|
Band[BandCount-1].y2=256;
|
||||||
|
Band[BandCount-1].y3=256;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue