From b4229594427ab794ddaafa4628dae3cf3045c0ae Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 3 Jul 2019 09:17:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/CMakeLists.txt | 7 +------
 server/gameserver/human.cc       | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index f0e2247..3ec34f5 100644
--- a/server/gameserver/CMakeLists.txt
+++ b/server/gameserver/CMakeLists.txt
@@ -1,12 +1,7 @@
 project(gameserver)
 cmake_minimum_required(VERSION 2.8)
 
-if (${GAME_ID})
-  message(GAME_ID: ${GAME_ID})
-else()
-  set(GAME_ID 2001)
-  message(GAME_ID: ${GAME_ID})
-endif()
+set(GAME_ID 2002)
 
 set(CMAKE_BUILD_TYPE "Debug")
 set(CMAKE_BUILD_TYPE "Release")
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index a7eb576..505a455 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1194,6 +1194,7 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
             (room->frame_no - room->gas_data.gas_start_frameno);
         gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
      } else {
+        #if 0
         if (room->gas_data.old_area_meta->i->wait_time() <= 0) {
             gas_data->set_duration(0);
         } else {
@@ -1201,6 +1202,7 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
                 (room->frame_no - room->gas_data.gas_start_frameno);
             gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
         }
+        #endif
     }
     TypeConvert::ToPb(room->gas_data.pos_old, gas_data->mutable_pos_old());
     TypeConvert::ToPb(room->gas_data.pos_new, gas_data->mutable_pos_new());