Use namespace instead of prefix.

[stg.git] / projects / stargazer / plugins / other / rscript / rscript.h

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index ca52adf8b0831e46edf29da498c637b563dbbd86..6ee10c82c0170eea7fc535356f6bb3eb084ec2c0 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -47,6 +47,7 @@
 #include "stg/users.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
 #include "stg/users.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"

+#include "stg/logger.h"

 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();
 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();


@@ -60,7 +61,8 @@ class SETTINGS;
 //-----------------------------------------------------------------------------
 class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:

-    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
+    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : NOTIFIER_BASE<USER_PTR>(), rs(r) {}

     virtual ~RS_ADD_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 
     virtual ~RS_ADD_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 


@@ -73,7 +75,8 @@ private:
 //-----------------------------------------------------------------------------
 class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:

-    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
+    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : NOTIFIER_BASE<USER_PTR>(), rs(r) {}

     virtual ~RS_DEL_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 
     virtual ~RS_DEL_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 


@@ -87,10 +90,10 @@ private:
 template <typename T>
 class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<T> {
 public:
 template <typename T>
 class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<T> {
 public:

-    RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) : user(u), rs(r) {}
+    RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<T>(), user(u), rs(r) {}

     RS_CHG_AFTER_NOTIFIER(const RS_CHG_AFTER_NOTIFIER<T> & rvalue)
     RS_CHG_AFTER_NOTIFIER(const RS_CHG_AFTER_NOTIFIER<T> & rvalue)

-        : user(rvalue.user), rs(rvalue.rs)
-    {}
+        : PROPERTY_NOTIFIER_BASE<T>(), user(rvalue.user), rs(rvalue.rs) {}

     void Notify(const T & oldValue, const T & newValue);
     USER_PTR GetUser() { return user; }
 
     void Notify(const T & oldValue, const T & newValue);
     USER_PTR GetUser() { return user; }
 


@@ -168,8 +171,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "Remote script v 0.3"; }
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "Remote script v 0.3"; }

-    uint16_t            GetStartPosition() const { return 20; }
-    uint16_t            GetStopPosition() const { return 20; }
+    uint16_t            GetStartPosition() const { return 10; }
+    uint16_t            GetStopPosition() const { return 10; }

 
     void                DelUser(USER_PTR u) { UnSetUserNotifier(u); }
     void                AddUser(USER_PTR u) { SetUserNotifier(u); }
 
     void                DelUser(USER_PTR u) { UnSetUserNotifier(u); }
     void                AddUser(USER_PTR u) { SetUserNotifier(u); }


@@ -225,6 +228,8 @@ private:
     RS_ADD_USER_NONIFIER onAddUserNotifier;
     RS_DEL_USER_NONIFIER onDelUserNotifier;
 
     RS_ADD_USER_NONIFIER onAddUserNotifier;
     RS_DEL_USER_NONIFIER onDelUserNotifier;
 

+    PLUGIN_LOGGER       logger;
+

     friend class UpdateRouter;
     friend class DisconnectUser;
 };
     friend class UpdateRouter;
     friend class DisconnectUser;
 };