Utils/MapEdit/LayerHazard.cpp

@@ -133,6 +133,7 @@ void	CLayerHazard::GUIThingUpdate(bool OnlySel)
 			GUIHazard.SetVal(GUIHazard.m_TurnRate,ThisThing.Data.Hazard.HazardTurnRate);
 			GUIHazard.SetVal(GUIHazard.m_Health,ThisThing.Data.Hazard.HazardHealth);
 			GUIHazard.SetVal(GUIHazard.m_Attack,ThisThing.Data.Hazard.HazardAttackStrength);
+			GUIHazard.SetVal(GUIHazard.m_Respawn,ThisThing.Data.Hazard.HazardRespawn);
 			GUIHazard.m_Collision.SetCheck(ThisThing.Data.Hazard.HazardCollisionFlag);
 		}
 		else
@@ -141,6 +142,7 @@ void	CLayerHazard::GUIThingUpdate(bool OnlySel)
 			GUIHazard.m_TurnRate.SetWindowText("");
 			GUIHazard.m_Health.SetWindowText("");
 			GUIHazard.m_Attack.SetWindowText("");
+			GUIHazard.m_Respawn.SetWindowText("");
 			GUIHazard.m_Collision.SetCheck(false);
 		}
 		GUIHazard.DisableCallback(false);
@@ -162,6 +164,7 @@ void	CLayerHazard::GUIChanged(CCore *Core)
 			ThisThing.Data.Hazard.HazardTurnRate=GUIHazard.GetVal(GUIHazard.m_TurnRate);
 			ThisThing.Data.Hazard.HazardHealth=GUIHazard.GetVal(GUIHazard.m_Health);
 			ThisThing.Data.Hazard.HazardAttackStrength=GUIHazard.GetVal(GUIHazard.m_Attack);
+			ThisThing.Data.Hazard.HazardRespawn=GUIHazard.GetVal(GUIHazard.m_Respawn);
 			ThisThing.Data.Hazard.HazardCollisionFlag=GUIHazard.m_Collision.GetCheck()!=0;
 		}
 

Utils/MkLevel/MkLevel.cpp

@@ -200,7 +200,7 @@ int				Idx;
 			CFace	F;
 
 			ExpTri2Face(ThisTri,F);
-			ModelFaceList.SetTPageFlag(F,ThisTri.Flags*0);
+			ModelFaceList.SetTPageFlag(F,ThisTri.Flags);
 			ModelFaceList.AddFace(F,false);
 		}
 

source/frontend/fmvintro.cpp

@@ -79,7 +79,7 @@ static bool fmvPerFrameFunc()
   ---------------------------------------------------------------------- */
 void CFrontEndFMVIntro::select()
 {
-	FMV_play(FMV_INTRO,&fmvPerFrameFunc);
+//	FMV_play(FMV_INTRO,&fmvPerFrameFunc);
 }
 
 /*----------------------------------------------------------------------

source/game/convo.cpp

@@ -530,7 +530,7 @@ void CConversation::thinkQuestion()
 
 		if(s_currentQuestion==QUESTION_YES_NO)
 		{
-			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_FIRE))
+			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_JUMP))
 			{
 				s_currentAnswer=s_currentSelectedAnswer==0?ANSWER_YES:ANSWER_NO;
 				s_currentQuestion=QUESTION_NONE;
@@ -542,7 +542,7 @@ void CConversation::thinkQuestion()
 		}
 		else if(s_currentQuestion==QUESTION_OK)
 		{
-			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_FIRE))
+			if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_JUMP))
 			{
 				s_currentAnswer=ANSWER_OK;
 				s_currentQuestion=QUESTION_NONE;

source/gfx/actor.cpp

@@ -567,13 +567,12 @@ u16				ThisFrame=ThisAnim->Anim[Frame];
 }
 
 /*****************************************************************************/
-sActorPool		*DbgPool;
+const int		BBOX_ADJ=4;
 POLY_FT4	*CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip)
 {
 sPoolNode		*ThisNode,*FindNode;
 POLY_FT4		*Ft4;
 
-			DbgPool=PoolEntry;
 			CurrentFrame=GetFrame(Anim,Frame);
 			ThisNode=0;
 
@@ -667,10 +666,10 @@ POLY_FT4		*Ft4;
 // Set BBox
 int			HalfW=CurrentFrame->W>>1;
 
-			BBox.XMin=-HalfW;
-			BBox.XMax=+HalfW;
-			BBox.YMin=-CurrentFrame->H;
-			BBox.YMax=0;
+			BBox.XMin=-HalfW+BBOX_ADJ;
+			BBox.XMax=+HalfW-BBOX_ADJ;
+			BBox.YMin=-CurrentFrame->H+BBOX_ADJ;
+			BBox.YMax=0-BBOX_ADJ;
 
 			return(Ft4);
 }
@@ -729,10 +728,10 @@ int		YMin,YMax;
 		if (YMax<y2) YMax=y2;
 		if (YMax<y3) YMax=y3;
 
-		BBox.XMin=XMin;
-		BBox.XMax=XMax;
-		BBox.YMin=YMin;
-		BBox.YMax=YMax;
+		BBox.XMin=XMin+BBOX_ADJ;
+		BBox.XMax=XMax-BBOX_ADJ;
+		BBox.YMin=YMin+BBOX_ADJ;
+		BBox.YMax=YMax-BBOX_ADJ;
 
 		Ft4->x0=Pos.vx+x0; Ft4->y0=Pos.vy+y0;
 		Ft4->x1=Pos.vx+x1; Ft4->y1=Pos.vy+y1;

source/hazard/hfalling.cpp

@@ -133,3 +133,9 @@ void CNpcFallingHazard::processTimer( int _frames )
 		m_bounceFinish = false;
 	}
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void CNpcFallingHazard::collidedWith( CThing *_thisThing )
+{
+	if (!m_bounceFinish && m_movementTimer<=0) CNpcHazard::collidedWith(_thisThing);
+}

source/hazard/hfalling.h

@@ -25,6 +25,7 @@ public:
 protected:
 	void				processMovement( int _frames );
 	void				processTimer( int _frames );
+	virtual void		collidedWith(CThing *_thisThing);
 
 	s32					m_movementTimer;
 	u8					m_bounceFinish;

source/level/layercollision.h

@@ -8,9 +8,9 @@
 #include	<dstructs.h>
 
 
-//#if	!defined(__USER_CDBUILD__)
+#if	!defined(__USER_CDBUILD__)
 #define __SHOW_COLLISION__
-//#endif
+#endif
 
 
 /*****************************************************************************/

source/level/level.cpp

@@ -165,7 +165,9 @@ bool	Finished=false;
 			if (Lvl>=LvlTableSize) Lvl=0;
 		}
 // End TMP
-		Lvl&=3;	// Ch1 only Bodge
+/*** E3 Bodge ***/
+		if (Lvl>2) Lvl=0;
+/****************/
 		return(Finished);
 }
 

source/pad/pads.cpp

@@ -398,9 +398,9 @@ CPadConfig::sPadConfigTable	CPadConfig::s_padConfigs[NUM_PAD_CONFIGS]=
 		PAD_UP,				// PAD_CFG_UP
 		PAD_DOWN,			// PAD_CFG_DOWN
 
-		PAD_CROSS,			// PAD_CFG_FIRE
+		PAD_SQUARE,			// PAD_CFG_FIRE
 		PAD_TRIANGLE,		// PAD_CFG_CATCH
-		PAD_SQUARE,			// PAD_CFG_JUMP
+		PAD_CROSS,			// PAD_CFG_JUMP
 	}},
 	// Config B
 	{{

source/player/player.h

@@ -294,7 +294,7 @@ private:
 	enum
 	{
 		INVINCIBLE_FRAMES__START=200,	// Invincible for this many frames at start of life
-		INVINCIBLE_FRAMES__HIT=30,		// Invincible for this many frames after taking damage
+		INVINCIBLE_FRAMES__HIT=60,		// Invincible for this many frames after taking damage
 	};
 	int				m_invincibleFrameCount;		// Initial invincibility and also invincibility after taking damage
 

source/player/pmodes.h

@@ -75,7 +75,7 @@ enum
 	DEFAULT_PLAYER_TERMINAL_VELOCITY=8,
 	DEFAULT_BUTT_FALL_VELOCITY=14,
 	DEFAULT_HITREACT_XVELOCITY=5,
-	DEFAULT_HITREACT_YVELOCITY=3,
+	DEFAULT_HITREACT_YVELOCITY=3-1,
 	DEFAULT_HITREACT_FRAMES=15,
 };
 

source/system/main.cpp

@@ -71,7 +71,7 @@ CPaulScene s_paulScene;
 #if	__FILE_SYSTEM__==PC
 	#if	!defined(__USER_CDBUILD__)
 		#if defined(__VERSION_DEBUG__)
-			#define	SCREEN_GRAB
+			#define	USE_SCREEN_UTILS
 		#endif
 	#endif
 #endif
@@ -188,13 +188,12 @@ void	MainLoop()
 		dumpDebugMem();
 	#endif
 
-	#if		defined(SCREEN_GRAB)
+	#if		defined(USE_SCREEN_UTILS)
 		if (PadGetHeld(0) & PAD_L2)
 			if (PadGetDown(0) & PAD_START) SaveScreen(VidGetScreen()->Draw.clip);
-	#endif
-
 		if (PadGetDown(0) & PAD_SELECT) VRamViewer();
 	#endif
+#endif
 	}
 }
 
@@ -224,7 +223,7 @@ int 	main()
 }
 
 /*****************************************************************************/
-#if	defined(SCREEN_GRAB)
+#if	defined(USE_SCREEN_UTILS)
 #if defined(__VERSION_DEBUG__)
 struct	sTgaHdr
 {