Updated some structs and enums.

mangos · Apr 14, 2011 · e104755 · e104755
1 parent aae93a6
commit e104755
Show file tree

Hide file tree

Showing 14 changed files with 785 additions and 697 deletions.
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
@@ -1317,7 +1317,7 @@ void WorldSession::HandleEquipmentSetUseOpcode(WorldPacket &recv_data)
         _player->SwapItem(item->GetPos(), dstpos);
     }
 
-    WorldPacket data(SMSG_EQUIPMENT_SET_USE_RESULT, 1);
+    WorldPacket data(SMSG_USE_EQUIPMENT_SET_RESULT, 1);
     data << uint8(0);                                       // 4 - equipment swap failed - inventory is full
     SendPacket(&data);
 }
diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h
@@ -80,7 +80,7 @@ const char MovieEntryfmt[]="nxx";
 const char OverrideSpellDatafmt[]="niiiiiiiiiix";
 const char QuestFactionRewardfmt[]="niiiiiiiiii";
 const char QuestSortEntryfmt[]="nxxxxxxxxxxxxxxxxx";
-const char QuestXPLevelfmt[]="niiiiiiiiix";
+const char QuestXPLevelfmt[]="niiiiiiiiii";
 const char PvPDifficultyfmt[]="diiiii";
 const char RandomPropertiesPointsfmt[]="niiiiiiiiiiiiiii";
 const char ScalingStatDistributionfmt[]="niiiiiiiiiiiiiiiiiiiii";

diff --git a/src/game/GMTicketHandler.cpp b/src/game/GMTicketHandler.cpp
@@ -47,7 +47,7 @@ void WorldSession::SendGMTicketGetTicket(uint32 status, GMTicket *ticket /*= NUL
 void WorldSession::SendGMResponse(GMTicket *ticket)
 {
     int len = strlen(ticket->GetText())+1+strlen(ticket->GetResponse())+1;
-    WorldPacket data(SMSG_GMRESPONSE_RECEIVED, 4+4+len+1+1+1);
+    WorldPacket data(SMSG_GMTICKET_GET_RESPONSE, 4+4+len+1+1+1);
     data << uint32(123);
     data << uint32(456);
     data << ticket->GetText();                              // issue text
@@ -188,7 +188,7 @@ void WorldSession::HandleGMResponseResolveOpcode(WorldPacket & recv_data)
 
     sTicketMgr.Delete(GetPlayer()->GetObjectGuid());
 
-    WorldPacket data(SMSG_GMRESPONSE_STATUS_UPDATE, 1);
+    WorldPacket data(SMSG_GMTICKET_RESOLVE_RESPONSE, 1);
     data << uint8(0);                                       // ask to fill out gm survey = 1
     SendPacket(&data);
 }
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
@@ -212,7 +212,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
 
                 if (!instance_map)
                 {
-                    WorldPacket data(SMSG_CORPSE_IS_NOT_IN_INSTANCE);
+                    WorldPacket data(SMSG_AREA_TRIGGER_NO_CORPSE);
                     player->GetSession()->SendPacket(&data);
 
                     DEBUG_LOG("MAP: Player '%s' doesn't has a corpse in instance '%s' and can't enter", player->GetName(), mapName);

diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
@@ -1086,7 +1086,7 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recv_data)
     if(!plr)                                                // wrong player
         return;
 
-    WorldPacket data(SMSG_INSPECT_TALENT, 50);
+    WorldPacket data(SMSG_INSPECT_RESULTS, 50);
     data << plr->GetPackGUID();
 
     if(sWorld.getConfig(CONFIG_BOOL_TALENTS_INSPECTING) || _player->isGameMaster())
@@ -1523,12 +1523,12 @@ void WorldSession::HandleQueryInspectAchievementsOpcode( WorldPacket & recv_data
         player->GetAchievementMgr().SendRespondInspectAchievements(_player);
 }
 
-void WorldSession::HandleWorldStateUITimerUpdateOpcode(WorldPacket& /*recv_data*/)
+void WorldSession::HandleUITimeRequestOpcode(WorldPacket& /*recv_data*/)
 {
     // empty opcode
-    DEBUG_LOG("WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE");
+    DEBUG_LOG("WORLD: SMSG_UI_TIME");
 
-    WorldPacket data(SMSG_WORLD_STATE_UI_TIMER_UPDATE, 4);
+    WorldPacket data(SMSG_UI_TIME, 4);
     data << uint32(time(NULL));
     SendPacket(&data);
 }

diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
@@ -1296,7 +1296,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4F3*/ { "UMSG_UNKNOWN_1267",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4F4*/ { "UMSG_UNKNOWN_1268",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4F5*/ { "UMSG_UNKNOWN_1269",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4F6*/ { "CMSG_WORLD_STATE_UI_TIMER_UPDATE",             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleWorldStateUITimerUpdateOpcode},
+    /*0x4F6*/ { "CMSG_WORLD_STATE_UI_TIMER_UPDATE",             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleUITimeRequestOpcode       },
     /*0x4F7*/ { "SMSG_WORLD_STATE_UI_TIMER_UPDATE",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4F8*/ { "CMSG_CHAR_RACE_CHANGE",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4F9*/ { "UMSG_UNKNOWN_1273",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },