Merge pull request #340 from erorcun/erorcun

Fixes and cleanup

src/core/FileLoader.cpp

@@ -952,9 +952,9 @@ CFileLoader::Load2dEffect(const char *line)
 		effect->light.lightType = lightType;
 		effect->light.roadReflection = roadReflection;
 		effect->light.flareType = flare;
-		// TODO: check out the flags
-		if(flags & 4)
-			flags &= ~2;
+
+		if(flags & LIGHTFLAG_FOG_ALWAYS)
+			flags &= ~LIGHTFLAG_FOG_NORMAL;
 		effect->light.flags = flags;
 		break;
 

src/core/PlayerInfo.cpp

@@ -387,7 +387,7 @@ CPlayerInfo::Process(void)
 
 	// Because vehicle enter/exit use same key binding.
 	bool enterOrExitVeh;
-	if (m_pPed->m_ped_flagI4 && m_pPed->bInVehicle)
+	if (m_pPed->bVehExitWillBeInstant && m_pPed->bInVehicle)
 		enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();
 	else
 		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();

src/entities/Physical.cpp

@@ -1459,7 +1459,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 				A->m_phy_flagA80 = true;
 			}else if(A->IsPed() && Aped->m_pCollidingEntity == B){
 				skipCollision = true;
-				if(!Aped->m_ped_flagH1)
+				if(!Aped->bKnockedUpIntoAir)
 					A->m_phy_flagA80 = true;
 			}else if(B->IsPed() && Bped->m_pCollidingEntity == A){
 				skipCollision = true;

src/peds/CivilianPed.cpp

@@ -151,7 +151,7 @@ CCivilianPed::CivilianAI(void)
 			SetLookFlag(angleToFace, true);
 			SetLookTimer(500);
 		} else if (eventDistSqr < sq(40.0f)) {
-			if (m_ped_flagD2) {
+			if (bGonnaInvestigateEvent) {
 				if (CharCreatedBy != MISSION_CHAR && !IsGangMember())
 					SetInvestigateEvent(EVENT_EXPLOSION, m_eventOrThreat, 6.0f, 30000, 0.0f);
 

src/peds/EmergencyPed.cpp

@@ -376,7 +376,7 @@ CEmergencyPed::MedicAI(void)
 					m_pRevivedPed->SetMoveState(PEDMOVE_WALK);
 					m_pRevivedPed->RestartNonPartialAnims();
 					m_pRevivedPed->bIsPedDieAnimPlaying = false;
-					m_pRevivedPed->m_ped_flagH1 = false;
+					m_pRevivedPed->bKnockedUpIntoAir = false;
 					m_pRevivedPed->m_pCollidingEntity = nil;
 				}
 				break;