diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 1a664966..98966634 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -220,7 +220,11 @@ void Player::UpdateShot()
         series_shot_frames = 0;
         return;
     }
-    if (HasBuffEffect(kBET_Vertigo) && !HasBuffEffect(kBET_AutoShot)) {
+    if (HasBuffEffect(kBET_Vertigo) &&
+        !(
+          HasBuffEffect(kBET_AutoShot) ||
+          HasBuffEffect(kBET_MachineGun)
+          )) {
         shot_start = false;
         shot_hold = false;
         series_shot_frames = 0;
@@ -732,6 +736,9 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
             bool can_set = true;
             if (HasBuffEffect(kBET_Vertigo)) {
                 can_set = HasBuffEffect(kBET_AutoShot);
+                if (!can_set) {
+                    can_set = HasBuffEffect(kBET_MachineGun);
+                }
             } else if (GetCar()) {
                 if (GetCar()->HasOil()) {
                     if (GetCar()->HasBuffEffect(kBET_Vertigo)) {
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index c577a3eb..56b0ad7d 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -302,6 +302,21 @@ void RoomObstacle::Active()
             ActiveKeepRangeBuff();
         }
         break;
+    case kObstacleShield:
+        {
+
+        }
+        break;
+    case kObstacleStrengthenWall:
+        {
+
+        }
+        break;
+    case kObstacleMedicalStation:
+        {
+
+        }
+        break;
     default:
         {
         }