From 39afdbe2c7b4ab19ec268bcbbabbb526df967d4e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 6 May 2021 13:20:11 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc | 8 +++-----
 server/gameserver/creature.h  | 1 +
 server/gameserver/metamgr.cc  | 2 --
 server/gameserver/metamgr.h   | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 79b7f7c..83c375c 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -57,11 +57,9 @@ void InternalShot(Creature* c,
             }
         }
         bullet_dir.Rotate(bullet_angle / 180.0f);
-#if 0
-        if (hum->GetCar()) {
-            bullet_born_pos.x += MetaMgr::Instance()->horse_shoot_x;
-            bullet_born_pos.y += MetaMgr::Instance()->horse_shoot_y;
-        }
+#if 1
+        bullet_born_pos.x += c->shoot_offset.x;
+        bullet_born_pos.y += c->shoot_offset.y;
 #endif
         c->room->frame_event.AddBullet(c,
                                        weapon_meta,
diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h
index abb785b..ef634d5 100644
--- a/server/gameserver/creature.h
+++ b/server/gameserver/creature.h
@@ -40,6 +40,7 @@ class Creature : public MoveableEntity
     int team_id = 0;
     bool aiming = false;
     a8::Vec2 attack_dir;
+    a8::Vec2 shoot_offset;
     HumanAbility ability;
     a8::Vec2 target_pos;
     std::function<bool ()> on_move_collision;
diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index d6b61b0..c88dd38 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -195,8 +195,6 @@ public:
             MetaMgr::Instance()->tank_damage_interval = MetaMgr::Instance()->GetSysParamAsFloat("tank_damage_interval", 1);
             MetaMgr::Instance()->average_oil = MetaMgr::Instance()->GetSysParamAsInt("average_oil");
             MetaMgr::Instance()->max_oil = MetaMgr::Instance()->GetSysParamAsInt("max_oil");
-            MetaMgr::Instance()->horse_shoot_x = MetaMgr::Instance()->GetSysParamAsInt("horse_shoot_x");
-            MetaMgr::Instance()->horse_shoot_y = MetaMgr::Instance()->GetSysParamAsInt("horse_shoot_y");
             MetaMgr::Instance()->max_mount_horse_distance = MetaMgr::Instance()->GetSysParamAsFloat("max_mount_horse_distance", 100);
             MetaMgr::Instance()->newbie_game_times = MetaMgr::Instance()->GetSysParamAsInt("newbie_game_times", 5);
             MetaMgr::Instance()->niube_win_times = MetaMgr::Instance()->GetSysParamAsInt("niube_win_times", 1);
diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h
index d4af9fb..5b19f29 100755
--- a/server/gameserver/metamgr.h
+++ b/server/gameserver/metamgr.h
@@ -75,8 +75,6 @@ class MetaMgr : public a8::Singleton<MetaMgr>
     float tank_damage_interval = 0.0f;
     float average_oil = 0.0f;
     float max_oil = 0.0f;
-    float horse_shoot_x = 0.0f;
-    float horse_shoot_y = 0.0f;
     float max_mount_horse_distance = 100.0f;
     int newbie_game_times = 0;
     int niube_win_times = 0;