X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9596c437646f369c3924dc78b20872762f3a47b9..3a45cd9275dc9279e133deb0932402ae5f4d0b5f:/projects/stargazer/plugins/other/rscript/rscript.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index a772e507..1c2e97bb 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -29,14 +29,15 @@ #include #include +#include #include +#include "stg/common.h" +#include "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; @@ -81,6 +82,7 @@ return rsc.GetPlugin(); //----------------------------------------------------------------------------- RS_USER::RS_USER() : lastSentTime(0), + user(NULL), shortPacketsCount(0) { } @@ -99,21 +101,6 @@ RS_SETTINGS::RS_SETTINGS() { } //----------------------------------------------------------------------------- -int RS_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) - { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; - } -if (*val < min || *val > max) - { - errorStr = "Value \'" + str + "\' out of range."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- int RS_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p;