remove global

server/masterserver/app.cc

@@ -126,7 +126,7 @@ int App::Run()
     int delta_time = 0;
     while (!terminated) {
         a8::tick_t begin_tick = a8::XGetTickCount();
-        Global::g_nowtime = time(nullptr);
+        nowtime = time(nullptr);
         QuickExecute(delta_time);
         SlowerExecute(delta_time);
         Schedule();

server/masterserver/app.h

@@ -55,6 +55,7 @@ public:
     char** argv = nullptr;
     volatile bool terminated = false;
     a8::uuid::SnowFlake uuid;
+    time_t nowtime = 0;
 
 public:
     int instance_id = 0;

server/masterserver/global.cc

@@ -1,4 +0,0 @@
-#include "precompile.h"
-#include "global.h"
-
-int Global::g_nowtime = time(nullptr);

server/masterserver/global.h

@@ -1,13 +0,0 @@
-#pragma once
-
-extern int g_hint_flags;
-
-class Global : public a8::Singleton<Global>
-{
- private:
-    Global() {};
-    friend class a8::Singleton<Global>;
- public:
-
-    static int g_nowtime;
-};

server/masterserver/precompile.h

@@ -5,7 +5,6 @@
 
 #include "constant.h"
 #include "types.h"
-#include "global.h"
 
 namespace google
 {