From 8e4bc53c2176203e822b67c301ad7c49b353e954 Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Sat, 9 Jun 2012 11:06:47 +0000
Subject: [PATCH] -moved some things because of possible graphical problems

---
 source/loader/utils.h    | 2 --
 source/plugin/plugin.cpp | 4 ----
 source/plugin/plugin.hpp | 8 +++++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/loader/utils.h b/source/loader/utils.h
index 4c01b8be..467da303 100644
--- a/source/loader/utils.h
+++ b/source/loader/utils.h
@@ -20,8 +20,6 @@
 #define TITLE_UPPER(x)		((u32)((x) >> 32))
 #define TITLE_LOWER(x)		((u32)(x) & 0xFFFFFFFF)
 
-#define SWAP32(x)			((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) >> 24) & 0xff))
-
 #define Write8(addr, val)	*(u8 *)addr = val; DCFlushRange((void *)addr, sizeof(u8));
 #define Write16(addr, val)	*(u16 *)addr = val; DCFlushRange((void *)addr, sizeof(u16));
 #define Write32(addr, val)	*(u32 *)addr = val; DCFlushRange((void *)addr, sizeof(u32));
diff --git a/source/plugin/plugin.cpp b/source/plugin/plugin.cpp
index 1e68118f..a8b8cdcb 100644
--- a/source/plugin/plugin.cpp
+++ b/source/plugin/plugin.cpp
@@ -22,10 +22,6 @@ static const string emptyString2("/");
 static char* emptyChar = (char*)" ";
 u32 ScummVM_magic;
 
-#define TAG_GAME_ID		"{gameid}"
-#define TAG_LOC			"{loc}"
-#define TAG_CONSOLE		"{console}"
-
 void Plugin::init(string m_pluginsDir)
 {
 	ScummVM_magic = 0;
diff --git a/source/plugin/plugin.hpp b/source/plugin/plugin.hpp
index 4b0a04a3..f4fac414 100644
--- a/source/plugin/plugin.hpp
+++ b/source/plugin/plugin.hpp
@@ -12,10 +12,16 @@
 #include <string>
 #include <vector>
 
+using namespace std;
+
 #include "config/config.hpp"
 #include "loader/disc.h"
 
-using namespace std;
+#define SWAP32(x)		((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) >> 24) & 0xff))
+
+#define TAG_GAME_ID		"{gameid}"
+#define TAG_LOC			"{loc}"
+#define TAG_CONSOLE		"{console}"
 
 struct PluginOptions
 {