josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Script/Ulduar:

Browse Source 
- Fix instance data loading from DB
- Return correct guid for GetData(TYPE_HODIR)

Thanks to Socolin for reporting the errors

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-12-21 15:47:09 +01:00
parent 30c55a4a97
commit c08d04365d
1 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+7 -8
View File
@@ -240,15 +240,11 @@ public:
{
case TYPE_LEVIATHAN:
if (state == IN_PROGRESS)
{
for (uint8 uiI = 0; uiI < 7; ++uiI)
HandleGameObject(uiLeviathanDoor[uiI],false);
}
else
{
for (uint8 uiI = 0; uiI < 7; ++uiI)
HandleGameObject(uiLeviathanDoor[uiI],true);
}
break;
case TYPE_IGNIS:
case TYPE_RAZORSCALE:
@@ -279,6 +275,9 @@ public:
if (GameObject* go = instance->GetGameObject(uiFreyaChestGUID))
go->SetRespawnTime(go->GetRespawnDelay());
break;
case TYPE_COLOSSUS:
SetData(type, state);
break;
}
return true;
@@ -315,7 +314,7 @@ public:
case TYPE_KOLOGARN: return uiKologarnGUID;
case TYPE_AURIAYA: return uiAuriayaGUID;
case TYPE_MIMIRON: return uiMimironGUID;
case TYPE_HODIR: return uiMimironGUID;
case TYPE_HODIR: return uiHodirGUID;
case TYPE_THORIM: return uiThorimGUID;
case TYPE_FREYA: return uiFreyaGUID;
case TYPE_VEZAX: return uiVezaxGUID;
@@ -363,7 +362,7 @@ public:
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "U U " << GetBossSaveData() << " " << uiEncounter[14];
saveStream << "U U " << GetBossSaveData() << " " << GetData[TYPE_COLOSSUS];
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
@@ -383,7 +382,7 @@ public:
uint32 data14;
std::istringstream loadStream(strIn);
loadStream >> dataHead1 >> dataHead2 >> data14;
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'U' && dataHead2 == 'U')
{
@@ -391,12 +390,12 @@ public:
{
uint32 tmpState;
loadStream >> tmpState;
loadStream >> uiEncounter[data14]; //colossus pre leviathan
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
OUT_LOAD_INST_DATA_COMPLETE;
}
};