diff --git a/Utils/MapEdit/Core.cpp b/Utils/MapEdit/Core.cpp index 72246812c..6897b754e 100644 --- a/Utils/MapEdit/Core.cpp +++ b/Utils/MapEdit/Core.cpp @@ -84,8 +84,8 @@ int Width,Height; #ifdef _DEBUG AddLayer(LAYER_TYPE_TRIGGER,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_ACTOR,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_ITEM,LAYER_SUBTYPE_NONE, Width, Height); #endif for (int i=0; i Hdrs; } else { // 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 YOfs=ThisBmp.CrossHairY; diff --git a/source/game/game.cpp b/source/game/game.cpp index 37d8834d3..04e7169d6 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -235,6 +235,7 @@ void CGameScene::think(int _frames) else if(s_levelFinished) { s_globalLevelSelectThing++; + s_globalLevelSelectThing&=3; shutdownLevel(); initLevel(); diff --git a/source/level/layerback.cpp b/source/level/layerback.cpp index c62c7fdb1..55cf72854 100644 --- a/source/level/layerback.cpp +++ b/source/level/layerback.cpp @@ -228,8 +228,9 @@ sOT *ThisOT=OtPtr+OTPos; int i,ThisY=-YOfs; // Render Back Sprites -#ifndef __USER_paul__ +#if 0 sBackSprite *SpritePtr=SpriteList; + for (i=0; iPos.vx+=SpritePtr->PosInc.vx; @@ -268,13 +269,21 @@ sBox Box; AddPrim(ThisOT,Gt4); SpritePtr++; } -#endif /* __USER_paul__ */ +#endif // Render Back Shade for (i=0; i