* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
@@ -40,14 +40,14 @@ EndScriptData */
#define SPELL_GOUGE 29425
#define SPELL_FRENZY 37023
#define POS_Z 81.73
#define POS_Z 81.73f
float Locations[4][3]=
{
{-10991.0, -1884.33, 0.614315},
{-10989.4, -1885.88, 0.904913},
{-10978.1, -1887.07, 2.035550},
{-10975.9, -1885.81, 2.253890},
{-10991.0f, -1884.33f, 0.614315f},
{-10989.4f, -1885.88f, 0.904913f},
{-10978.1f, -1887.07f, 2.035550f},
{-10975.9f, -1885.81f, 2.253890f},
};
const uint32 Adds[6]=
@@ -40,9 +40,9 @@ EndScriptData */
const float PortalCoord[3][3] =
{
{-11195.353516, -1613.237183, 278.237258}, // Left side
{-11137.846680, -1685.607422, 278.239258}, // Right side
{-11094.493164, -1591.969238, 279.949188} // Back side
{-11195.353516f, -1613.237183f, 278.237258f}, // Left side
{-11137.846680f, -1685.607422f, 278.239258f}, // Right side
{-11094.493164f, -1591.969238f, 279.949188f} // Back side
};
enum Netherspite_Portal{
@@ -48,14 +48,14 @@ EndScriptData */
float IntroWay[8][3] =
{
{-11053.37,-1794.48,149},
{-11141.07,-1841.40,125},
{-11187.28,-1890.23,125},
{-11189.20,-1931.25,125},
{-11153.76,-1948.93,125},
{-11128.73,-1929.75,125},
{-11140 , -1915 ,122},
{-11163 , -1903 ,91.473}
{-11053.37f,-1794.48f,149.00f},
{-11141.07f,-1841.40f,125.00f},
{-11187.28f,-1890.23f,125.00f},
{-11189.20f,-1931.25f,125.00f},
{-11153.76f,-1948.93f,125.00f},
{-11128.73f,-1929.75f,125.00f},
{-11140.00f,-1915.00f,122.00f},
{-11163.00f,-1903.00f,91.473f}
};
class boss_nightbane : public CreatureScript
@@ -45,28 +45,28 @@ struct InfernalPoint
float x,y;
};
#define INFERNAL_Z 275.5
#define INFERNAL_Z 275.5f
static InfernalPoint InfernalPoints[] =
{
{-10922.8, -1985.2},
{-10916.2, -1996.2},
{-10932.2, -2008.1},
{-10948.8, -2022.1},
{-10958.7, -1997.7},
{-10971.5, -1997.5},
{-10990.8, -1995.1},
{-10989.8, -1976.5},
{-10971.6, -1973.0},
{-10955.5, -1974.0},
{-10939.6, -1969.8},
{-10958.0, -1952.2},
{-10941.7, -1954.8},
{-10943.1, -1988.5},
{-10948.8, -2005.1},
{-10984.0, -2019.3},
{-10932.8, -1979.6},
{-10935.7, -1996.0}
{-10922.8f, -1985.2f},
{-10916.2f, -1996.2f},
{-10932.2f, -2008.1f},
{-10948.8f, -2022.1f},
{-10958.7f, -1997.7f},
{-10971.5f, -1997.5f},
{-10990.8f, -1995.1f},
{-10989.8f, -1976.5f},
{-10971.6f, -1973.0f},
{-10955.5f, -1974.0f},
{-10939.6f, -1969.8f},
{-10958.0f, -1952.2f},
{-10941.7f, -1954.8f},
{-10943.1f, -1988.5f},
{-10948.8f, -2005.1f},
{-10984.0f, -2019.3f},
{-10932.8f, -1979.6f},
{-10935.7f, -1996.0f}
};
#define TOTAL_INFERNAL_POINTS 18
@@ -94,7 +94,7 @@ void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature)
if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
{
if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, pCreature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
{
if (pCreature->getVictim())
pCrone->AI()->AttackStart(pCreature->getVictim());
@@ -98,9 +98,9 @@ float Spawns[6][2]=
#define SPELL_SPOTLIGHT 25824
#define SPELL_TUXEDO 32616
#define SPAWN_Z 90.5
#define SPAWN_Z 90.5f
#define SPAWN_Y -1758
#define SPAWN_O 4.738
#define SPAWN_O 4.738f
class npc_barnes : public CreatureScript
{
@@ -460,8 +460,8 @@ public:
#define SPELL_CONFLAGRATION_BLAST 30977
#define SPELL_MANA_SHIELD 31635
static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94};
static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83};
static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f};
static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f};
class npc_image_of_medivh : public CreatureScript
{
@@ -582,7 +582,7 @@ public:
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL);
return 5000;
case 12:
arca->GetMotionMaster()->MovePoint(0, -11010.82,-1761.18, 156.47);
arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f);
arca->setActive(true);
arca->InterruptNonMeleeSpells(true);
arca->SetSpeed(MOVE_FLIGHT, 2.0f);