Fix rscript plugin compilation errors

diff --git a/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp b/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
index a0be4f98e0ae30b9440808f7f7ecce52d741bbbb..254a3da683b2dfd279a55262b9e49facb543fd00 100644 (file)
--- 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 <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>

-#include "common.h"

 
 

+#include "stg/common.h"

 #include "nrmap_parser.h"
 
 NRMapParser::NRMapParser()
 #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 d882c3a21cccea61bdfb8555efefde2a944e1bdd..82c6fe31be435e75f51dd0355ad2429f0f559024 100644 (file)
--- 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 <string>
 #include <vector>

-#include "os_int.h"
+
+#include "stg/os_int.h"

 
 struct NET_ROUTER
 {
 
 struct NET_ROUTER
 {

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index b03235d8be5f178710a0f90d6b88aecb54aa760a..df172364bc03c6b34b94ee303ae572b46ce1d8f2 100644 (file)
--- 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 <cassert>
 #include <algorithm>
 

+#include "stg/common.h"
+#include "stg/stg_locker.h"
+#include "stg/user_property.h"

 #include "rscript.h"
 #include "rscript.h"

-#include "common.h"

 #include "ur_functor.h"
 #include "send_functor.h"
 #include "ur_functor.h"
 #include "send_functor.h"

-#include "stg_locker.h"
-#include "user_property.h"

 
 extern volatile const time_t stgTime;
 
 
 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 4e67a254bdcce9ad4417a79102c6250decaf8e35..81cc1e17a40f6c4ff86aae064784817d719991fa 100644 (file)
--- 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 <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();
 #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 8e216295ae36fea22cb2e8d1f473752ebb82f2a1..b9b789eaf1556ed034ae350b29b6479d96714b63 100644 (file)
--- 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 <functional>
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 class PacketSender : public std::unary_function<uint32_t, int> {
     public:
 
 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 d9706a75b95448d111673ae64a6e4620578b4ea8..b3a5cdaca3889ca338da3985ff46905b58829b76 100644 (file)
--- 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 <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>
 {
 
 class UpdateRouter : public std::unary_function<std::pair<const uint32_t, RS_USER>, void>
 {