Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)

Revert one of the warning fixes (non standard C++)
This commit is contained in:
Nay
2012-05-20 18:22:34 +01:00
parent e56b2cdd59
commit 23be8c4fd7
5 changed files with 13 additions and 12 deletions
+1 -1
View File
@@ -351,7 +351,7 @@ bool SpellEffectInfo::IsEffect() const
bool SpellEffectInfo::IsEffect(SpellEffects effectName) const
{
return Effect == effectName;
return Effect == uint32(effectName);
}
bool SpellEffectInfo::IsAura() const
@@ -690,7 +690,8 @@ public:
{
AddWave();
bActive = false;
uiActivationTimer = 5000;
// 1 minute waiting time after each boss fight
uiActivationTimer = (uiWaveCount == 6 || uiWaveCount == 12) ? 60000 : 5000;
} else uiActivationTimer -= diff;
}
+6 -6
View File
@@ -53,7 +53,7 @@ bool ADT_file::prepareLoadedData()
bool adt_MHDR::prepareLoadedData()
{
if (fcc != "MHDR")
if (fcc != 'MHDR')
return false;
if (size!=sizeof(adt_MHDR)-8)
@@ -72,7 +72,7 @@ bool adt_MHDR::prepareLoadedData()
bool adt_MCIN::prepareLoadedData()
{
if (fcc != "MCIN")
if (fcc != 'MCIN')
return false;
// Check cells data
@@ -86,7 +86,7 @@ bool adt_MCIN::prepareLoadedData()
bool adt_MH2O::prepareLoadedData()
{
if (fcc != "MH2O")
if (fcc != 'MH2O')
return false;
// Check liquid data
@@ -98,7 +98,7 @@ bool adt_MH2O::prepareLoadedData()
bool adt_MCNK::prepareLoadedData()
{
if (fcc != "MCNK")
if (fcc != 'MCNK')
return false;
// Check height map
@@ -113,7 +113,7 @@ bool adt_MCNK::prepareLoadedData()
bool adt_MCVT::prepareLoadedData()
{
if (fcc != "MCVT")
if (fcc != 'MCVT')
return false;
if (size != sizeof(adt_MCVT)-8)
@@ -124,7 +124,7 @@ bool adt_MCVT::prepareLoadedData()
bool adt_MCLQ::prepareLoadedData()
{
if (fcc != "MCLQ")
if (fcc != 'MCLQ')
return false;
return true;
+1 -1
View File
@@ -49,7 +49,7 @@ bool FileLoader::prepareLoadedData()
{
// Check version
version = (file_MVER *) data;
if (version->fcc != "MVER")
if (version->fcc != 'MVER')
return false;
if (version->ver != FILE_FORMAT_VERSION)
return false;
+3 -3
View File
@@ -4,21 +4,21 @@
bool wdt_MWMO::prepareLoadedData()
{
if (fcc != "MWMO")
if (fcc != 'MWMO')
return false;
return true;
}
bool wdt_MPHD::prepareLoadedData()
{
if (fcc != "MPHD")
if (fcc != 'MPHD')
return false;
return true;
}
bool wdt_MAIN::prepareLoadedData()
{
if (fcc != "MAIN")
if (fcc != 'MAIN')
return false;
return true;
}