Core/Spells: Fix two signed / unsigned warnings from f8a13b4

kaelima · kaelima · commit ff2dbfc38196 · 2011-12-22T13:22:18.000+01:00
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
@@ -3485,7 +3485,7 @@ void Spell::update(uint32 difftime)
         {
             if (m_timer)
             {
-                if (difftime >= m_timer)
+                if (difftime >= (uint32)m_timer)
                     m_timer = 0;
                 else
                     m_timer -= difftime;
@@ -3494,7 +3494,8 @@ void Spell::update(uint32 difftime)
             if (m_timer == 0 && !IsNextMeleeSwingSpell() && !IsAutoRepeat())
                 // don't CheckCast for instant spells - done in spell::prepare, skip duplicate checks, needed for range checks for example
                 cast(!m_casttime);
-        } break;
+            break;
+        }
         case SPELL_STATE_CASTING:
         {
             if (m_timer > 0)
@@ -3507,7 +3508,7 @@ void Spell::update(uint32 difftime)
                     finish();
                 }
 
-                if (difftime >= m_timer)
+                if (difftime >= (uint32)m_timer)
                     m_timer = 0;
                 else
                     m_timer -= difftime;
@@ -3552,10 +3553,10 @@ void Spell::update(uint32 difftime)
 
                 finish();
             }
-        } break;
+            break;
+        }
         default:
-        {
-        }break;
+            break;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3485,7 +3485,7 @@ void Spell::update(uint32 difftime)`
`3485`	`3485`	`{`
`3486`	`3486`	`if (m_timer)`
`3487`	`3487`	`{`
`3488`		`- if (difftime >= m_timer)`
	`3488`	`+ if (difftime >= (uint32)m_timer)`
`3489`	`3489`	`m_timer = 0;`
`3490`	`3490`	`else`
`3491`	`3491`	`m_timer -= difftime;`
`@@ -3494,7 +3494,8 @@ void Spell::update(uint32 difftime)`
`3494`	`3494`	`if (m_timer == 0 && !IsNextMeleeSwingSpell() && !IsAutoRepeat())`
`3495`	`3495`	`// don't CheckCast for instant spells - done in spell::prepare, skip duplicate checks, needed for range checks for example`
`3496`	`3496`	`cast(!m_casttime);`
`3497`		`- } break;`
	`3497`	`+ break;`
	`3498`	`+ }`
`3498`	`3499`	`case SPELL_STATE_CASTING:`
`3499`	`3500`	`{`
`3500`	`3501`	`if (m_timer > 0)`
`@@ -3507,7 +3508,7 @@ void Spell::update(uint32 difftime)`
`3507`	`3508`	`finish();`
`3508`	`3509`	`}`
`3509`	`3510`
`3510`		`- if (difftime >= m_timer)`
	`3511`	`+ if (difftime >= (uint32)m_timer)`
`3511`	`3512`	`m_timer = 0;`
`3512`	`3513`	`else`
`3513`	`3514`	`m_timer -= difftime;`
`@@ -3552,10 +3553,10 @@ void Spell::update(uint32 difftime)`
`3552`	`3553`
`3553`	`3554`	`finish();`
`3554`	`3555`	`}`
`3555`		`- } break;`
	`3556`	`+ break;`
	`3557`	`+ }`
`3556`	`3558`	`default:`
`3557`		`- {`
`3558`		`- }break;`
	`3559`	`+ break;`
`3559`	`3560`	`}`
`3560`	`3561`	`}`
`3561`	`3562`