Merge branch 'master' into miami

# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp

src/render/Particle.cpp

@@ -984,6 +984,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		case PARTICLE_WATER_HYDRANT:
 			pParticle->m_vecPosition.z += 20.0f * psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
 			break;
+		default: break;
 	}
 	
 	if ( fSize != 0.0f )
@@ -1214,6 +1215,7 @@ void CParticle::Update()
 									continue;
 								}
 								break;
+							default: break;
 						}
 					}
 				}
@@ -1295,6 +1297,7 @@ void CParticle::Update()
 									continue;
 								}
 								break;
+							default: break;
 						}
 					}
 				}

src/render/WaterLevel.cpp

@@ -49,7 +49,7 @@ const float fBlueMult = 1.4f;
 
 
 void
-CWaterLevel::Initialise(char *pWaterDat)
+CWaterLevel::Initialise(Const char *pWaterDat)
 {
 	ms_nNoOfWaterLevels = 0;
 	

src/render/WaterLevel.h

@@ -81,7 +81,7 @@ class CWaterLevel
 	static int16       nGeomUsed;
 
 public:
-	static void    Initialise(char *pWaterDat);
+	static void    Initialise(Const char *pWaterDat);
 	static void    Shutdown();
 	static void    CreateWavyAtomic();
 	static void    DestroyWavyAtomic();