From f8d0ec025e192b17c14e9d9820e42bc4a84735a5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 4 Jul 2020 18:38:45 +0800
Subject: [PATCH] remove global

---
 server/masterserver/app.cc       |  2 +-
 server/masterserver/app.h        |  1 +
 server/masterserver/global.cc    |  4 ----
 server/masterserver/global.h     | 13 -------------
 server/masterserver/precompile.h |  1 -
 5 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100755 server/masterserver/global.cc
 delete mode 100755 server/masterserver/global.h

diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc
index c93455a..73601e8 100755
--- a/server/masterserver/app.cc
+++ b/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();
diff --git a/server/masterserver/app.h b/server/masterserver/app.h
index 07da15a..fc84ea7 100644
--- a/server/masterserver/app.h
+++ b/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;
diff --git a/server/masterserver/global.cc b/server/masterserver/global.cc
deleted file mode 100755
index 03524cd..0000000
--- a/server/masterserver/global.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "precompile.h"
-#include "global.h"
-
-int Global::g_nowtime = time(nullptr);
diff --git a/server/masterserver/global.h b/server/masterserver/global.h
deleted file mode 100755
index 83f2c75..0000000
--- a/server/masterserver/global.h
+++ /dev/null
@@ -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;
-};
diff --git a/server/masterserver/precompile.h b/server/masterserver/precompile.h
index 29d7ab0..7846db5 100644
--- a/server/masterserver/precompile.h
+++ b/server/masterserver/precompile.h
@@ -5,7 +5,6 @@
 
 #include "constant.h"
 #include "types.h"
-#include "global.h"
 
 namespace google
 {