[Gemrb-commits] SF.net SVN: gemrb: [4900] gemrb/trunk/gemrb/plugins/Core

[<ave...@us...>]

Revision: 4900
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4900&view=rev
Author:   avenger_teambg
Date:     2007-12-12 08:29:24 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
fixed some warnings

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp
    gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.cpp
    gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.h
    gemrb/trunk/gemrb/plugins/Core/Spellbook.cpp
    gemrb/trunk/gemrb/plugins/Core/TileMap.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp	2007-12-12 16:13:04 UTC (rev 4899)
+++ gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp	2007-12-12 16:29:24 UTC (rev 4900)
@@ -713,7 +713,7 @@
 		// other things.
 		//this is longer than expected so it won't overflow
 		char NewResRef[12];
-		unsigned char Cycle;
+		unsigned char Cycle = 0;
 		if (part < actorPartCount) {
 			// Character animation parts
 

Modified: gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.cpp	2007-12-12 16:13:04 UTC (rev 4899)
+++ gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.cpp	2007-12-12 16:29:24 UTC (rev 4900)
@@ -450,7 +450,7 @@
 	if (orientation==-1) {
 		return;
 	}
-	Orientation=orientation;
+	Orientation=(ieByte) orientation;
 	if (twin) {
 		twin->Orientation=Orientation;
 	}

Modified: gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.h	2007-12-12 16:13:04 UTC (rev 4899)
+++ gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.h	2007-12-12 16:29:24 UTC (rev 4900)
@@ -70,7 +70,7 @@
 	int XPos, YPos, ZPos;
 	ieDword FrameRate;
 	ieDword FaceTarget;
-	unsigned char Orientation, NewOrientation;
+	ieByte Orientation, NewOrientation;
 	ieDword Duration;
 	bool justCreated;
 	ieResRef ResName;

Modified: gemrb/trunk/gemrb/plugins/Core/Spellbook.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Spellbook.cpp	2007-12-12 16:13:04 UTC (rev 4899)
+++ gemrb/trunk/gemrb/plugins/Core/Spellbook.cpp	2007-12-12 16:29:24 UTC (rev 4900)
@@ -379,7 +379,7 @@
 {
 	CREKnownSpell *spl = new CREKnownSpell();
 	strncpy(spl->SpellResRef, spell->Name, 8);
-	spl->Type = GetSpellType(spell->SpellType);
+	spl->Type = (ieWord) GetSpellType(spell->SpellType);
 	if ( spl->Type == IE_SPELL_TYPE_INNATE) {
 		spl->Level = 0;
 	}

Modified: gemrb/trunk/gemrb/plugins/Core/TileMap.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/TileMap.cpp	2007-12-12 16:13:04 UTC (rev 4899)
+++ gemrb/trunk/gemrb/plugins/Core/TileMap.cpp	2007-12-12 16:29:24 UTC (rev 4900)
@@ -537,5 +537,5 @@
 
 Point TileMap::GetMapSize()
 {
-	return Point(XCellCount*64, YCellCount*64);
+	return Point((short) (XCellCount*64), (short) (YCellCount*64));
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.