From 718bc1b13715e9c1bbc5251ded8266173756c54e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 1 Jan 2023 16:08:45 +0800
Subject: [PATCH] 1

---
 server/gameserver/roomobstacle.cc | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index 8cdf9301..f45379f5 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -159,12 +159,8 @@ void RoomObstacle::SpecExplosion(int delay_time)
             bomb_born_offset = bomb_born_offset * a8::RandEx(1, std::max(2, meta->explosion_float()));
             #endif
         }
-        // 999
-        #if 1
         Position bomb_pos = GetPos();
-        #else
-        a8::Vec2 bomb_pos = GetPos() + bomb_born_offset;
-        #endif
+        bomb_pos.AddGlmVec3(bomb_born_offset.ToGlmVec3());
         if (room->grid_service->CanAdd(bomb_pos.x, bomb_pos.y)) {
             std::shared_ptr<Explosion> explosion = EntityFactory::Instance()->MakeExplosion();
             explosion->exclude_uniid = GetUniId();
@@ -271,24 +267,22 @@ void RoomObstacle::Active()
         break;
     case kObstacleShield:
         {
+            #if 0
             if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
-                // 888
-                #if 0
                 SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
-                #endif
             }
             CalcTempPassObjects();
+            #endif
         }
         break;
     case kObstacleStrengthenWall:
         {
+            #if 0
             if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
-                // 888
-                #if 0
                 SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
-                #endif
             }
             ActiveStrengthenWall();
+            #endif
         }
         break;
     case kObstacleMedicalStation: