4 files changed, 20 insertions, 1 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 8f6ef4c3..d7d22174 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -110,6 +110,9 @@ public:
 	static CVehicle *pPlayerVehicle;
 	static CVector StaticCamCoors;
 	static uint32 StaticCamStartTime;
+	
+//TODO(MIAMI)
+	static void RemoveAllPickupsOfACertainWeaponGroupWithNoAmmo(eWeaponType) {}
 };
 
 extern uint16 AmmoForWeapon[20];
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index b99110b0..6898d574 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3772,7 +3772,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 				CPed* pNearPed = ped->m_nearPeds[i];
 				if (pNearPed->m_leader == ped) {
 					pNearPed->Teleport(pos);
-					pNearPed->PositionPedOutOfCollision(); // TODO(MIAMI): this is PositionAnyPedOutOfCollision!!!
+					pNearPed->PositionAnyPedOutOfCollision();
 				}
 			}
 		}
diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp
index 54c97d06..5559b1c4 100644
--- a/src/control/TrafficLights.cpp
+++ b/src/control/TrafficLights.cpp
@@ -18,6 +18,8 @@
 // TODO: figure out the meaning of this
 enum { SOME_FLAG = 0x80 };
 
+bool CTrafficLights::bGreenLightsCheat;
+
 void
 CTrafficLights::DisplayActualLight(CEntity *ent)
 {
@@ -310,6 +312,12 @@ CTrafficLights::LightForPeds(void)
 uint8
 CTrafficLights::LightForCars1(void)
 {
+	if (CWeather::Wind > 1.1f)
+		return CAR_LIGHTS_GREEN;
+
+	if (bGreenLightsCheat)
+		return CAR_LIGHTS_GREEN;
+
 	uint32 period = CTimer::GetTimeInMilliseconds() % 16384;
 
 	if(period < 5000)
@@ -323,6 +331,12 @@ CTrafficLights::LightForCars1(void)
 uint8
 CTrafficLights::LightForCars2(void)
 {
+	if (CWeather::Wind > 1.1f)
+		return CAR_LIGHTS_GREEN;
+
+	if (bGreenLightsCheat)
+		return CAR_LIGHTS_GREEN;
+
 	uint32 period = CTimer::GetTimeInMilliseconds() % 16384;
 
 	if(period < 6000)
diff --git a/src/control/TrafficLights.h b/src/control/TrafficLights.h
index f3df6cd5..6cd5e04a 100644
--- a/src/control/TrafficLights.h
+++ b/src/control/TrafficLights.h
@@ -16,6 +16,8 @@ enum {
 class CTrafficLights
 {
 public:
+	static bool bGreenLightsCheat;
+
 	static void DisplayActualLight(CEntity *ent);
 	static void ScanForLightsOnMap(void);
 	static int FindTrafficLightType(CEntity *light);