diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index d4ce0feeda..06ff2ec076 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -483,7 +483,7 @@ F76C85EE1EC4E88300FA49E2 /* Zip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83991EC4E7CC00FA49E2 /* Zip.cpp */; }; F76C85F91EC4E88300FA49E2 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A51EC4E7CC00FA49E2 /* Image.cpp */; }; F76C85FD1EC4E88300FA49E2 /* NewDrawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A91EC4E7CC00FA49E2 /* NewDrawing.cpp */; }; - F76C85FF1EC4E88300FA49E2 /* Rain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83AB1EC4E7CC00FA49E2 /* Rain.cpp */; }; + F76C85FF1EC4E88300FA49E2 /* Weather.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83AB1EC4E7CC00FA49E2 /* Weather.cpp */; }; F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */; }; F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */; }; F76C86491EC4E88300FA49E2 /* NetworkAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83FA1EC4E7CC00FA49E2 /* NetworkAction.cpp */; }; @@ -1706,8 +1706,8 @@ F76C83A71EC4E7CC00FA49E2 /* lightfx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lightfx.h; sourceTree = ""; }; F76C83A91EC4E7CC00FA49E2 /* NewDrawing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NewDrawing.cpp; sourceTree = ""; }; F76C83AA1EC4E7CC00FA49E2 /* NewDrawing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewDrawing.h; sourceTree = ""; }; - F76C83AB1EC4E7CC00FA49E2 /* Rain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Rain.cpp; sourceTree = ""; }; - F76C83AC1EC4E7CC00FA49E2 /* Rain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rain.h; sourceTree = ""; }; + F76C83AB1EC4E7CC00FA49E2 /* Weather.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Weather.cpp; sourceTree = ""; }; + F76C83AC1EC4E7CC00FA49E2 /* Weather.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Weather.h; sourceTree = ""; }; F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; path = Editor.cpp; sourceTree = ""; }; F76C83B21EC4E7CC00FA49E2 /* Editor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = ""; }; F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileClassifier.cpp; sourceTree = ""; }; @@ -2871,8 +2871,8 @@ 4C7B53CD200029CE00A52E21 /* Line.cpp */, F76C83A91EC4E7CC00FA49E2 /* NewDrawing.cpp */, F76C83AA1EC4E7CC00FA49E2 /* NewDrawing.h */, - F76C83AB1EC4E7CC00FA49E2 /* Rain.cpp */, - F76C83AC1EC4E7CC00FA49E2 /* Rain.h */, + F76C83AB1EC4E7CC00FA49E2 /* Weather.cpp */, + F76C83AC1EC4E7CC00FA49E2 /* Weather.h */, 4C7B53CF200029D900A52E21 /* Rect.cpp */, 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */, 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */, @@ -4254,7 +4254,7 @@ C68878F120289B9B0084B384 /* FlyingRollerCoaster.cpp in Sources */, C688792B20289B9B0084B384 /* MiniatureRailway.cpp in Sources */, F76C85FD1EC4E88300FA49E2 /* NewDrawing.cpp in Sources */, - F76C85FF1EC4E88300FA49E2 /* Rain.cpp in Sources */, + F76C85FF1EC4E88300FA49E2 /* Weather.cpp in Sources */, C688785920289A0A0084B384 /* Banner.cpp in Sources */, C68878EC20289B9B0084B384 /* AirPoweredVerticalCoaster.cpp in Sources */, C688790B20289B9B0084B384 /* WoodenWildMouse.cpp in Sources */, diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index feb0a198c3..2d2961bb0f 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -32,7 +32,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Weather.cpp similarity index 99% rename from src/openrct2/drawing/Rain.cpp rename to src/openrct2/drawing/Weather.cpp index 4bc60d8cd5..1ab5ebac60 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Weather.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Rain.h" +#include "Weather.h" #include "../config/Config.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/drawing/Rain.h b/src/openrct2/drawing/Weather.h similarity index 100% rename from src/openrct2/drawing/Rain.h rename to src/openrct2/drawing/Weather.h diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 5f964636ca..0ba3fcf19b 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -21,7 +21,7 @@ #include "IDrawingContext.h" #include "IDrawingEngine.h" #include "LightFX.h" -#include "Rain.h" +#include "Weather.h" #include #include diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 0fac581d2b..d079a1dc3f 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -189,7 +189,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -770,4 +770,4 @@ - \ No newline at end of file +