1

server/gameserver/android.cc

@@ -28,12 +28,10 @@ Android::Android():Human()
 
 Android::~Android()
 {
-    #if 0
     if (agent_) {
         f8::BtMgr::Instance()->BtDestory(agent_);
         agent_ = nullptr;
     }
-    #endif
     #if 0
     --PerfMonitor::Instance()->entity_num[ET_Android];
     #endif
@@ -96,7 +94,6 @@ void Android::InternalUpdate(int delta_time)
     }
     if (GetMovement()->GetPathSize() > 0) {
         Global::Instance()->verify_set_pos = 1;
-        Position old_pos = GetPos();
         UpdateMove();
 #ifdef DEBUG1
         a8::XPrintf("updatemove old_pos:%f,%f new_pos:%f,%f\n",
@@ -109,9 +106,7 @@ void Android::InternalUpdate(int delta_time)
 #endif
         Global::Instance()->verify_set_pos = 0;
     }
-    #if 0
     agent_->Exec();
-    #endif
 }
 
 void Android::GiveEquip()

server/gameserver/app.cc

@@ -118,39 +118,6 @@ static void SavePerfLog()
 
 bool App::Init(int argc, char* argv[])
 {
-    #if 0
-    {
-        std::string data = "${master.name} [aa ]${image.id:1000} bb${}cc";
-        std::string pattern = R"(\$\{.*?\})";
-        std::regex re(pattern, std::regex_constants::ECMAScript);
-        std::cmatch m;
-
-        bool matched = true;
-        const char* last_pos = data.c_str();
-        const char* end_pos = data.c_str() + data.length();
-        while (last_pos < end_pos) {
-            matched = std::regex_search(last_pos, m, re);
-            if (matched) {
-                if (m.position() > 0) {
-                    a8::XPrintf("raw_str:%s\n",
-                                {std::string(last_pos, m.position())});
-                }
-
-                a8::XPrintf("str:%s pos:%d len:%d\n",
-                            {m.str(),
-                             m.position(),
-                             m.length()});
-                last_pos += m.position() + m.length();
-            } else {
-                a8::XPrintf("raw_str2:%s\n",
-                            {std::string(last_pos, end_pos - last_pos)});
-                last_pos = end_pos;
-            }
-        }
-
-        exit(1);
-    }
-    #endif
     signal(SIGPIPE, SIG_IGN);
     this->argc = argc;
     this->argv = argv;

server/gameserver/buff/jump.cc

@@ -14,15 +14,16 @@ void JumpBuff::Activate()
 void JumpBuff::Deactivate()
 {
     //跳伞结束
+    CreatureWeakPtr c = owner->GetWeakPtrRef();
     owner->room->xtimer.SetTimeoutEx
         (1,
-         [this] (int event, const a8::Args* args)
+         [c] (int event, const a8::Args* args) mutable
          {
              if (a8::TIMER_EXEC_EVENT == event) {
-                 if (owner->IsHuman()) {
+                 if (c.Get()) {
-                     owner->AsHuman()->OnLand();
+                     c.Get()->OnLand();
                  }
              }
          },
-         &xtimer_attacher);
+         &owner->xtimer_attacher);
 }

server/gameserver/movement.cc

@@ -43,7 +43,7 @@ bool Movement::UpdatePosition()
         curr_point.curr_pos.AddGlmVec3(curr_point.dir * owner_->GetSpeed());
         owner_->SetPos(curr_point.curr_pos);
         if (owner_->room->map_instance->GetPosHeight(owner_->GetPos(), h)) {
-#ifdef DEBUG
+#ifdef DEBUG1
             a8::XPrintf("pos:%f,%f,%f h2:%f\n",
                         {
                          owner_->GetPos().x,
@@ -64,6 +64,7 @@ bool Movement::UpdatePosition()
         owner_->SetPos(curr_point.tar_pos);
         float h = 0.0f;
         if (owner_->room->map_instance->GetPosHeight(owner_->GetPos(), h)) {
+            #if 0
             a8::XPrintf("pos:%f,%f,%f h3:%f\n",
                         {
                          owner_->GetPos().x,
@@ -71,6 +72,7 @@ bool Movement::UpdatePosition()
                          owner_->GetPos().z,
                          h
                         });
+            #endif
             auto new_pos = owner_->GetPos();
             new_pos.y = h;
             owner_->SetPos(new_pos);

server/gameserver/player.cc

@@ -224,7 +224,7 @@ void Player::InternalUpdate(int delta_time)
 
 void Player::UpdateMoving()
 {
-    #ifdef DEBUG
+    #ifdef DEBUG1
     a8::XPrintf("UpdateMoving\n", {});
     #endif
     if (action_type == AT_Relive) {
@@ -760,7 +760,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
     last_cmmove_frameno_ = room->GetFrameNo();
     moving = false;
     if (msg.has_move_dir()) {
-#ifdef DEBUG
+#ifdef DEBUG1
         a8::XPrintf("move_dir %f,%f,%f\n",
                     {
                      msg.move_dir().x(),
@@ -775,11 +775,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
             glm::vec3 old_move_dir;
             glm::vec3 new_move_dir;
             TypeConvert::FromPb(new_move_dir, &msg.move_dir());
-#ifdef DEBUG
+#ifdef DEBUG1
             a8::XPrintf("has_move_dir0\n", {});
 #endif
             if (!HasBuffEffect(kBET_Vertigo)) {
-#ifdef DEBUG
+#ifdef DEBUG1
                 a8::XPrintf("has_move_dir1\n", {});
 #endif
                 if (!(HasBuffEffect(kBET_Jump) && follow_target.Get())) {
@@ -793,7 +793,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
                         }
                         moving = true;
                     }
-#ifdef DEBUG
+#ifdef DEBUG1
                     a8::XPrintf("has_move_dir2\n", {});
 #endif
                 }
@@ -955,7 +955,8 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
         use_skill_id = msg.skill_id();
         skill_target_id = msg.skill_target_id();
         if (std::abs(msg.skill_dir().x()) > FLT_EPSILON ||
-            std::abs(msg.skill_dir().y()) > FLT_EPSILON
+            std::abs(msg.skill_dir().y()) > FLT_EPSILON ||
+            std::abs(msg.skill_dir().z()) > FLT_EPSILON
             ) {
             TypeConvert::FromPb(skill_dir, &msg.skill_dir());
             GlmHelper::Normalize(skill_dir);