]> git.stg.codes - stg.git/blobdiff - projects/stargazer/plugins/other/rscript/rscript.cpp
Merge branch 'master' into full-month-stats
[stg.git] / projects / stargazer / plugins / other / rscript / rscript.cpp
index 1cc7883b3e1a2b26acfed3938d7544f85eda9341..410e7aa8177515242a134b31dae5ff20d234edf8 100644 (file)
 
 #include <csignal>
 #include <cassert>
 
 #include <csignal>
 #include <cassert>
+#include <cstdlib>
 #include <algorithm>
 
 #include <algorithm>
 
+#include "stg/common.h"
+#include "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;
 
@@ -81,6 +82,7 @@ return rsc.GetPlugin();
 //-----------------------------------------------------------------------------
 RS_USER::RS_USER()
     : lastSentTime(0),
 //-----------------------------------------------------------------------------
 RS_USER::RS_USER()
     : lastSentTime(0),
+      user(NULL),
       shortPacketsCount(0)
 {
 }
       shortPacketsCount(0)
 {
 }