Scripts: Step 4 - Fixed all warnings inside scripts

issue #121

Next step: enabling -DWITH_WARNINGS and fix
This commit is contained in:
Yehonal
2017-09-17 04:07:32 +02:00
parent 82be574cda
commit cf627d8327
47 changed files with 173 additions and 146 deletions

View File

@@ -436,11 +436,11 @@ public:
SetRun(false);
Creature* cr = NULL;
if (cr = me->SummonCreature(NPC_CITY_MAN3, EventPos[EVENT_SRC_HALL_CITYMAN1]))
if ((cr = me->SummonCreature(NPC_CITY_MAN3, EventPos[EVENT_SRC_HALL_CITYMAN1])))
cr->AI()->DoAction(ACTION_FORCE_CHANGE_LOCK);
if (cr = me->SummonCreature(NPC_CITY_MAN4, EventPos[EVENT_SRC_HALL_CITYMAN2]))
if ((cr = me->SummonCreature(NPC_CITY_MAN4, EventPos[EVENT_SRC_HALL_CITYMAN2])))
cr->AI()->DoAction(ACTION_FORCE_CHANGE_LOCK);
if (cr = me->SummonCreature(NPC_CITY_MAN, EventPos[EVENT_SRC_HALL_CITYMAN3]))
if ((cr = me->SummonCreature(NPC_CITY_MAN, EventPos[EVENT_SRC_HALL_CITYMAN3])))
cr->AI()->DoAction(ACTION_FORCE_CHANGE_LOCK);
}
else if (param == ACTION_START_SECRET_PASSAGE)

View File

@@ -189,14 +189,14 @@ class npc_cork_gizelton : public CreatureScript
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
Creature* cr = NULL;
if (cr = me->SummonCreature(NPC_RIGGER_GIZELTON, *me))
if ((cr = me->SummonCreature(NPC_RIGGER_GIZELTON, *me)))
{
cr->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
summons[0] = cr->GetGUID();
}
if (cr = me->SummonCreature(NPC_CARAVAN_KODO, *me))
if ((cr = me->SummonCreature(NPC_CARAVAN_KODO, *me)))
summons[1] = cr->GetGUID();
if (cr = me->SummonCreature(NPC_CARAVAN_KODO, *me))
if ((cr = me->SummonCreature(NPC_CARAVAN_KODO, *me)))
summons[2] = cr->GetGUID();
SummonsFollow();
@@ -334,8 +334,8 @@ class npc_cork_gizelton : public CreatureScript
float o = (i*M_PI/2)+(M_PI/4);
float x = me->GetPositionX()+cos(o)*15.0f;
float y = me->GetPositionY()+sin(o)*15.0f;
if (cr = me->SummonCreature((i%2 == 0 ? NPC_KOLKAR_WAYLAYER : NPC_KOLKAR_AMBUSHER),
x, y, me->GetMap()->GetHeight(x, y, MAX_HEIGHT), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
if ((cr = me->SummonCreature((i%2 == 0 ? NPC_KOLKAR_WAYLAYER : NPC_KOLKAR_AMBUSHER),
x, y, me->GetMap()->GetHeight(x, y, MAX_HEIGHT), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)))
cr->AI()->AttackStart(me);
}
if (cr)
@@ -363,7 +363,7 @@ class npc_cork_gizelton : public CreatureScript
if (i)
entry = i == 1 ? NPC_DOOMWARDER : NPC_NETHER;
if (cr = me->SummonCreature(entry, x, y, me->GetMap()->GetHeight(x, y, MAX_HEIGHT), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
if ((cr = me->SummonCreature(entry, x, y, me->GetMap()->GetHeight(x, y, MAX_HEIGHT), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)))
cr->AI()->AttackStart(me);
}
if (cr)