1

server/gameserver/constant.h

@@ -8,12 +8,7 @@ enum SocketFrom_e
 enum InnerMesssage_e
 {
     IM_ClientSocketDisconnect  = 100,
-    IM_PlayerOffline,
     IM_ExecGM,
-    IM_DBSConnDisconnect,
-    IM_BSConnDisconnect,
-    IM_LoadConfig,
-    IM_HttpResponse,
     IM_GGListenerError
 };
 
@@ -29,11 +24,6 @@ enum NetHandler_e
     HID_GGListener,
 };
 
-enum PlayerState_e
-{
-    PS_None
-};
-
 enum VirtualItemId_e
 {
     VID_Item_Gold = 50001,
@@ -42,36 +32,31 @@ enum VirtualItemId_e
     VID_Pickaxe = 50019
 };
 
-enum SyncData_e
-{
-    SYNC_Data_Exp = 0,
-};
-
 enum DoorState_e
-{
+    {
-    DoorStateClose = 0,
+     DoorStateClose = 0,
-    DoorStateOpen = 1
+     DoorStateOpen = 1
-};
+    };
 
 enum GasMode_e
-{
+    {
-    GasInactive = 0,
+     GasInactive = 0,
-    GasWaiting = 1,
+     GasWaiting = 1,
-    GasMoving = 2,
+     GasMoving = 2,
-    GasJump = 3
+     GasJump = 3
-};
+    };
 
 enum ActionType_e
-{
+    {
-    AT_None = 0,
+     AT_None = 0,
-    AT_Reload = 1,
+     AT_Reload = 1,
-    AT_UseItem = 2,
+     AT_UseItem = 2,
-    AT_Relive = 3,
+     AT_Relive = 3,
-    AT_Rescue = 4
+     AT_Rescue = 4
-};
+    };
 
 enum RoomType_e
-{
+    {
    RT_NewBrid = 0,
    RT_MidBrid = 1,
    RT_OldBrid1 = 2,
@@ -304,13 +289,6 @@ enum PropertyType_e
     kPropCritDmg = 37,
 };
 
-enum MapObjectType_e
-{
-    kMOT_Object = 1,
-    kMOT_SpawnPoint = 2,
-    kMOT_MonsterSpawnPoint = 3
-};
-
 enum SkinSlot_e
 {
     kSkinSlot_CLOTH = 1,
@@ -331,11 +309,6 @@ enum RoomMode_e
     kRoomModeEnd
 };
 
-enum RaceType_e
-{
-    kHumanRace = 1,
-};
-
 enum AIMode_e
 {
     kChiJiAiMode = 0,
@@ -353,32 +326,26 @@ enum ColliderTag_e
     kColliderSpecTag_End = 5,
 };
 
-enum GameChannel_e
-{
-    kWxChannelId = 6001,
-    kTouTiaoChannelId = 6006
-};
-
 enum PostBuffAction_e
-{
+    {
-    kRemoveBuffByIdAction = 1,
+     kRemoveBuffByIdAction = 1,
-    kRemoveBuffByEffectAction = 2,
+     kRemoveBuffByEffectAction = 2,
-    kAddBuffAction = 3
+     kAddBuffAction = 3
-};
+    };
 
 enum ObstacleType_e
-{
+    {
-    kObstacleSelfExplosion = 1,
+     kObstacleSelfExplosion = 1,
-    kObstacleMine = 2,
+     kObstacleMine = 2,
-    kObstacleTrap = 3,
+     kObstacleTrap = 3,
-    kObstaclePosionGas = 4,
+     kObstaclePosionGas = 4,
-    kObstacleSpring = 5,
+     kObstacleSpring = 5,
-    kObstacleHideHouse = 6,
+     kObstacleHideHouse = 6,
-    kObstacleGully = 7,
+     kObstacleGully = 7,
-    kObstacleAirDropBox = 8,
+     kObstacleAirDropBox = 8,
-    kObstacleOilBucket = 9,
+     kObstacleOilBucket = 9,
-    kObstacleKeepRangeBuff = 10,
+     kObstacleKeepRangeBuff = 10,
-    kObstacleShield = 11,
+     kObstacleShield = 11,
     kObstacleStrengthenWall = 12,
     kObstacleMedicalStation = 13,
     kObstaclePortal = 14,
@@ -545,8 +512,6 @@ const int MAX_SYS_HTTP_NUM = 2;
 const int MAX_USER_HTTP_NUM = 8;
 const int MAX_ALL_HTTP_NUM = MAX_SYS_HTTP_NUM + MAX_USER_HTTP_NUM;
 
-const int ADPLAY_BUFFID = 1006;
-
 const int FIXED_OBJECT_MAXID = 20140;
 
 const int MAX_ROOM_IDX = 1000;
@@ -565,8 +530,6 @@ const long long SPEC_MAP_OBJECT_FLAGS =
      kColliderSpecTag_End
      );
 
-const int MAP_BLOCK_START_ID = 1000000000;
-
 const int ANDROID_AI_ID_START = 10001;
 
 const int MAX_SKILL_LV = 15;

server/gameserver/constant_export.h

@@ -41,7 +41,7 @@ enum BuffEffectType_e
     kBET_JumpTo = 10, //跳跃
     kBET_OnceChgAttr = 11, //一次性buff
     kBET_Pull = 12, //拉人(主动方)
-    kBET_Terminator = 13, //终结者模式
+    kBET_Reserve13 = 13,
     kBET_PlayShotAni = 14, //播放射击动画
     kBET_Vertigo = 15, //眩晕
     kBET_DecHp = 16, //扣血

server/gameserver/creature.cc

@@ -1315,10 +1315,6 @@ void Creature::ProcBuffEffect(Creature* caster, Buff* buff)
             int i = 0;
         }
         break;
-    case kBET_Terminator:
-        {
-        }
-        break;
     case kBET_PlayShotAni:
         {
 

server/gameserver/creature.h

@@ -11,9 +11,7 @@
 
 enum CreatureStatus
 {
-    CS_AlreadyLordMode = 1,
     CS_Disable,
-    CS_Collisioning,
     CS_DisableAttack,
     CS_ForceTeam,
     CS_PreDieSuspended,
@@ -323,7 +321,6 @@ private:
     void CheckLoadingBullet();
 
 protected:
-    RaceType_e race_ = kHumanRace;
     bool need_sync_active_player_ = false;
 
     ActionType_e action_type = AT_None;

server/gameserver/human.cc

@@ -2395,9 +2395,7 @@ void Human::DeadDrop()
     if (a8::HasBitFlag(status, CS_DeadNoDrop)) {
         return;
     }
-    if (GetRace() == kHumanRace &&
+    if (!(HasBuffEffect(kBET_Become) && GetBuffByEffectId(kBET_Become)->FreezeOperate())) {
-        !HasBuffEffect(kBET_Terminator) &&
-        !(HasBuffEffect(kBET_Become) && GetBuffByEffectId(kBET_Become)->FreezeOperate())) {
         for (auto& weapon : weapons) {
             if (weapon.weapon_id != 0 &&
                 weapon.weapon_id != default_weapon.weapon_id

server/gameserver/obstacle.cc

@@ -793,7 +793,6 @@ bool Obstacle::ProcSpecEvent(Creature* c, ColliderComponent* collider)
             if (c->IsHuman()) {
                 if (!c->AsHuman()->GetCar()) {
                     AddObstacleBuff(c);
-                    a8::SetBitFlag(c->status, CS_Collisioning);
                     return true;
                 }
             }