From 1ef4a705f32ff0774585ee1e0209a74e8332b782 Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Mon, 23 May 2016 20:28:37 +0300 Subject: [PATCH] Plugins: moved standard library header includes out of plugin namespace --- Plugins/AGSflashlight/agsflashlight.cpp | 14 +++++++------- Plugins/ags_parallax/ags_parallax.cpp | 12 ++++++------ Plugins/ags_snowrain/ags_snowrain.cpp | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Plugins/AGSflashlight/agsflashlight.cpp b/Plugins/AGSflashlight/agsflashlight.cpp index 30aa54f..687cb54 100644 --- a/Plugins/AGSflashlight/agsflashlight.cpp +++ b/Plugins/AGSflashlight/agsflashlight.cpp @@ -16,12 +16,6 @@ but a workalike plugin created by JJS for the AGS engine PSP port. #define THIS_IS_THE_PLUGIN #endif -#include "plugin/agsplugin.h" - -#if defined(BUILTIN_PLUGINS) -namespace agsflashlight { -#endif - #include #include #include @@ -34,6 +28,12 @@ namespace agsflashlight { #define sin(x) vfpu_sinf(x) #endif +#include "plugin/agsplugin.h" + +#if defined(BUILTIN_PLUGINS) +namespace agsflashlight { +#endif + #if defined(__GNUC__) inline unsigned long _blender_alpha16_bgr(unsigned long y) __attribute__((always_inline)); inline void calc_x_n(unsigned long bla) __attribute__((always_inline)); @@ -946,5 +946,5 @@ void AGS_EditorLoadGame(char* buffer, int bufsize) #if defined(BUILTIN_PLUGINS) -} +} // namespace agsflashlight #endif diff --git a/Plugins/ags_parallax/ags_parallax.cpp b/Plugins/ags_parallax/ags_parallax.cpp index c9203d5..60fac06 100644 --- a/Plugins/ags_parallax/ags_parallax.cpp +++ b/Plugins/ags_parallax/ags_parallax.cpp @@ -16,17 +16,17 @@ but a workalike plugin created by JJS for the AGS engine ports. #define THIS_IS_THE_PLUGIN #endif +#include +#include +#include +#include + #include "plugin/agsplugin.h" #if defined(BUILTIN_PLUGINS) namespace ags_parallax { #endif -#include -#include -#include -#include - //#define DEBUG //#define ENABLE_SAVING // The original plugin does not save any data! @@ -343,5 +343,5 @@ void AGS_EditorLoadGame(char* buffer, int bufsize) #if defined(BUILTIN_PLUGINS) -} +} // namespace ags_parallax #endif diff --git a/Plugins/ags_snowrain/ags_snowrain.cpp b/Plugins/ags_snowrain/ags_snowrain.cpp index 39102d6..14e858a 100644 --- a/Plugins/ags_snowrain/ags_snowrain.cpp +++ b/Plugins/ags_snowrain/ags_snowrain.cpp @@ -16,12 +16,6 @@ but a workalike plugin created by JJS for the AGS engine PSP port. #define THIS_IS_THE_PLUGIN #endif -#include "plugin/agsplugin.h" - -#if defined(BUILTIN_PLUGINS) -namespace ags_snowrain { -#endif - #include #include #include @@ -33,6 +27,12 @@ namespace ags_snowrain { #define sin(x) vfpu_sinf(x) #endif +#include "plugin/agsplugin.h" + +#if defined(BUILTIN_PLUGINS) +namespace ags_snowrain { +#endif + //#define DEBUG //#define AGS_SNOWRAIN_DLL_SAVEGAME_COMPATIBILITY @@ -960,5 +960,5 @@ void AGS_EditorLoadGame(char* buffer, int bufsize) #if defined(BUILTIN_PLUGINS) -} +} // namespace ags_snowrain #endif