Merge branch 'master' of madf.dyndns.org:/var/git/stg

[stg.git] / projects / stargazer / user.h

diff --git a/projects/stargazer/user.h b/projects/stargazer/user.h
index 3631d900be65b46ac89346e10094e1402e093c4c..1c84ba1ca5e8b3c9b00f9baf22a3b1d0d131e7d4 100644 (file)
--- a/projects/stargazer/user.h
+++ b/projects/stargazer/user.h
@@ -202,9 +202,8 @@ private:
     void            Disconnect(bool fakeDisconnect, const std::string & reason);
     int             SaveMonthStat(int month, int year);
 
-    int             SendMessage(const STG_MSG & msg);
-    int             RemoveMessage(uint64_t) { return 0; }
-    int             ScanMessage();
+    int             SendMessage(STG_MSG & msg) const;
+    void            ScanMessage();
     time_t          lastScanMessages;
 
     string          login;
@@ -234,7 +233,7 @@ private:
     const TARIFF *  tariff;
 
     TRAFF_STAT      traffStat;
-    std::list<std::pair<time_t, TRAFF_STAT> > traffStatQueue;
+    std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
     const SETTINGS * settings;
 
@@ -242,13 +241,12 @@ private:
 
     const map<uint32_t, user_iter> * ipIndex;
 
+    list<STG_MSG> messages;
+
     bool            deleted;
 
     time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
     time_t          lastWriteDeatiledStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
-    time_t          lastSwapDeatiledStat;    // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
-
-    bool            writeFreeMbTraffCost;
 
     // Properties
     USER_PROPERTY<double>         & cash;