From 1f6214607a4f2b727484a4ae9e9411044dae8051 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Thu, 7 Apr 2011 18:36:42 +0300
Subject: [PATCH] Fix rscript plugin compilation errors

---
 .../plugins/other/rscript/nrmap_parser.cpp    |  2 +-
 .../plugins/other/rscript/nrmap_parser.h      |  3 ++-
 .../plugins/other/rscript/rscript.cpp         |  6 +++---
 .../stargazer/plugins/other/rscript/rscript.h | 20 +++++++++----------
 .../plugins/other/rscript/send_functor.h      |  2 +-
 .../plugins/other/rscript/ur_functor.h        |  6 +++---
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp b/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
index a0be4f98..254a3da6 100644
--- a/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
+++ b/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include "common.h"
 
+#include "stg/common.h"
 #include "nrmap_parser.h"
 
 NRMapParser::NRMapParser()
diff --git a/projects/stargazer/plugins/other/rscript/nrmap_parser.h b/projects/stargazer/plugins/other/rscript/nrmap_parser.h
index d882c3a2..82c6fe31 100644
--- a/projects/stargazer/plugins/other/rscript/nrmap_parser.h
+++ b/projects/stargazer/plugins/other/rscript/nrmap_parser.h
@@ -29,7 +29,8 @@
 
 #include <string>
 #include <vector>
-#include "os_int.h"
+
+#include "stg/os_int.h"
 
 struct NET_ROUTER
 {
diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index b03235d8..df172364 100644
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -31,12 +31,12 @@
 #include <cassert>
 #include <algorithm>
 
+#include "stg/common.h"
+#include "stg/stg_locker.h"
+#include "stg/user_property.h"
 #include "rscript.h"
-#include "common.h"
 #include "ur_functor.h"
 #include "send_functor.h"
-#include "stg_locker.h"
-#include "user_property.h"
 
 extern volatile const time_t stgTime;
 
diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 4e67a254..81cc1e17 100644
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -37,16 +37,16 @@
 #include <functional>
 #include <utility>
 
-#include "plugin.h"
-#include "store.h"
-#include "module_settings.h"
-#include "os_int.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
-#include "users.h"
-#include "blowfish.h"
-#include "rs_packets.h"
+#include "stg/plugin.h"
+#include "stg/store.h"
+#include "stg/module_settings.h"
+#include "stg/os_int.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"
 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();
diff --git a/projects/stargazer/plugins/other/rscript/send_functor.h b/projects/stargazer/plugins/other/rscript/send_functor.h
index 8e216295..b9b789ea 100644
--- a/projects/stargazer/plugins/other/rscript/send_functor.h
+++ b/projects/stargazer/plugins/other/rscript/send_functor.h
@@ -32,7 +32,7 @@
 
 #include <functional>
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 class PacketSender : public std::unary_function<uint32_t, int> {
     public:
diff --git a/projects/stargazer/plugins/other/rscript/ur_functor.h b/projects/stargazer/plugins/other/rscript/ur_functor.h
index d9706a75..b3a5cdac 100644
--- a/projects/stargazer/plugins/other/rscript/ur_functor.h
+++ b/projects/stargazer/plugins/other/rscript/ur_functor.h
@@ -31,10 +31,10 @@
 #include <algorithm>
 #include <utility>
 
-#include "rscript.h"
-#include "os_int.h"
+#include "stg/os_int.h"
+#include "stg/common.h"
 
-#include "common.h"
+#include "rscript.h"
 
 class UpdateRouter : public std::unary_function<std::pair<const uint32_t, RS_USER>, void>
 {
-- 
2.44.2