* In case of a 'for' loop, don't declare the iterator of a type that has a larger value range when the iterator can take a maximum value of a more efficient data type. (int to uint8 in most cases).

* Other minor cleanups, Null pointer checks etc.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 65dc188063c..56c7ce8ef75 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -145,7 +145,7 @@ m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL), m_summo
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
 
-    for(int i =0; i<CREATURE_MAX_SPELLS; ++i)
+    for(uint8 i =0; i<CREATURE_MAX_SPELLS; ++i)
         m_spells[i] = 0;
 
     m_CreatureSpellCooldowns.clear();
@@ -333,7 +333,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
     if(!m_respawnradius && m_defaultMovementType==RANDOM_MOTION_TYPE)
         m_defaultMovementType = IDLE_MOTION_TYPE;
 
-    for(int i=0; i < CREATURE_MAX_SPELLS; ++i)
+    for(uint8 i=0; i < CREATURE_MAX_SPELLS; ++i)
         m_spells[i] = GetCreatureInfo()->spells[i];
 
     return true;