fixed build warnings in xcode project; added DerivedData/ to .gitignore

Author: Patrick Meehan

.gitignore

@@ -10,7 +10,8 @@ Thumbs.db
 /src/config
 
 build/
-xcuserdata/
+xcuserdata/
+DerivedData/
 *.pbxuser
 *.perspectivev3
 

src/moaicore/MOAIGrid.cpp

@@ -242,7 +242,7 @@ void MOAIGrid::RegisterLuaFuncs ( MOAILuaState& state ) {
 void MOAIGrid::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer ) {
 	UNUSED ( serializer );
 
-	this->MOAIGridSpace::SerializeIn ( state );
+	this->MOAIGridSpace::SerializeIn ( state, serializer );
 	this->mTiles.Init ( this->MOAIGridSpace::GetTotalCells ());
 
 	state.GetField ( -1, "mData" );
@@ -272,7 +272,7 @@ void MOAIGrid::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer )
 void MOAIGrid::SerializeOut ( MOAILuaState& state, MOAISerializer& serializer ) {
 	UNUSED ( serializer );
 
-	this->MOAIGridSpace::SerializeOut ( state );
+	this->MOAIGridSpace::SerializeOut ( state, serializer );
 
 	USLeanArray < u8 > zip;
 	USZip::Deflate ( this->mTiles, this->mTiles.Size () * sizeof ( u32 ), zip );

src/moaicore/MOAIGridSpace.cpp

@@ -1005,7 +1005,8 @@ void MOAIGridSpace::OnResize () {
 }
 
 //----------------------------------------------------------------//
-void MOAIGridSpace::SerializeIn ( MOAILuaState& state ) {
+void MOAIGridSpace::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer ) {
+	UNUSED ( serializer );
 
 	this->mXOff			= state.GetField ( -1, "mXOff", this->mXOff );
 	this->mYOff			= state.GetField ( -1, "mYOff", this->mYOff );
@@ -1024,7 +1025,8 @@ void MOAIGridSpace::SerializeIn ( MOAILuaState& state ) {
 }
 
 //----------------------------------------------------------------//
-void MOAIGridSpace::SerializeOut ( MOAILuaState& state ) {
+void MOAIGridSpace::SerializeOut ( MOAILuaState& state, MOAISerializer& serializer ) {
+	UNUSED ( serializer );
 
 	state.SetField ( -1, "mXOff", this->mXOff );
 	state.SetField ( -1, "mYOff", this->mYOff );
@@ -1061,11 +1063,11 @@ void MOAIGridSpace::RegisterLuaClass ( MOAILuaState& state ) {
 	state.SetField ( -1, "TILE_BOTTOM_CENTER", ( u32 )MOAIGridSpace::TILE_BOTTOM_CENTER );
 
 	state.SetField ( -1, "TILE_CENTER", ( u32 )MOAIGridSpace::TILE_CENTER );
-	
+	
 	state.SetField ( -1, "RECT_SHAPE", RECT_SHAPE );
 	state.SetField ( -1, "DIAMOND_SHAPE", DIAMOND_SHAPE );
 	state.SetField ( -1, "OBLIQUE_SHAPE", OBLIQUE_SHAPE );
-	state.SetField ( -1, "HEX_SHAPE", HEX_SHAPE );
+	state.SetField ( -1, "HEX_SHAPE", HEX_SHAPE );
 }
 
 //----------------------------------------------------------------//

src/moaicore/MOAIGridSpace.h

@@ -192,8 +192,8 @@ class MOAIGridSpace :
 						~MOAIGridSpace			();
 	void				RegisterLuaClass		( MOAILuaState& state );
 	void				RegisterLuaFuncs		( MOAILuaState& state );
-	void				SerializeIn				( MOAILuaState& state );
-	void				SerializeOut			( MOAILuaState& state );
+	void				SerializeIn				( MOAILuaState& state, MOAIDeserializer& serializer );
+	void				SerializeOut			( MOAILuaState& state, MOAISerializer& serializer );
 	MOAICellCoord		WrapCellCoord			( int xCell, int yCell ) const;
 	USVec2D				WorldToCell				( MOAICellCoord cellCoord, USVec2D loc ) const;
 	USVec2D				WorldToGrid				( USVec2D loc ) const;

src/moaicore/MOAILayer2D.cpp

@@ -481,9 +481,9 @@ void MOAILayer2D::Draw ( int subPrimID, bool reload ) {
 			MOAIPartitionResult* result = buffer.GetResultUnsafe ( i );
 
 			MOAIProp* prop = result->mProp;
-			bool reload = prop != prevProp;
+			bool reloadProp = prop != prevProp;
 
-			prop->Draw ( result->mSubPrimID, reload );
+			prop->Draw ( result->mSubPrimID, reloadProp );
 			prop->DrawDebug ( result->mSubPrimID );
 
 			prevProp = prop;

src/moaicore/MOAIPartitionResultBuffer.cpp

@@ -76,8 +76,8 @@ u32 MOAIPartitionResultBuffer::PrepareResults ( u32 mode, bool expand, float xSc
 
 		case SORT_PRIORITY_ASCENDING:
 			for ( u32 i = 0; i < this->mTotalResults; ++i ) {
-				s32 priority = this->mMainBuffer [ i ].mPriority * intSign;
-				this->mMainBuffer [ i ].mKey = ( u32 )(( priority ^ 0x80000000 ) | ( priority & 0x7fffffff ));
+				s32 p = this->mMainBuffer [ i ].mPriority * intSign;
+				this->mMainBuffer [ i ].mKey = ( u32 )(( p ^ 0x80000000 ) | ( p & 0x7fffffff ));
 			}
 			break;
 

src/moaicore/MOAIProp.h

@@ -49,7 +49,7 @@ class MOAIProp :
 public:
 
 	static const s32 UNKNOWN_PRIORITY	= 0x80000000;
-	static const u32 NO_SUBPRIM_ID		= 0xffffffff;
+	static const int NO_SUBPRIM_ID		= 0xffffffff;
 
 	enum {
 		BOUNDS_EMPTY,

src/moaicore/MOAIStretchPatch2D.cpp

@@ -212,11 +212,11 @@ void MOAIStretchPatch2D::Draw ( const USAffine2D& transform, u32 idx, MOAIDeckRe
 	gfxDevice.SetVertexMtxMode ( MOAIGfxDevice::VTX_STAGE_MODEL, MOAIGfxDevice::VTX_STAGE_PROJ );
 
 	this->UpdateParams ();
-	this->Draw ( idx, remapper, stretch.mX, stretch.mY );
+	this->DrawPatch ( idx, remapper, stretch.mX, stretch.mY );
 }
 
 //----------------------------------------------------------------//
-void MOAIStretchPatch2D::Draw ( u32 idx, MOAIDeckRemapper* remapper, float xStretch, float yStretch ) {
+void MOAIStretchPatch2D::DrawPatch ( u32 idx, MOAIDeckRemapper* remapper, float xStretch, float yStretch ) {
 
 	USRect uvRect;
 	u32 totalUVRects = this->mUVRects.Size ();

src/moaicore/MOAIStretchPatch2D.h

@@ -60,7 +60,7 @@ class MOAIStretchPatch2D :
 	static int			_setUVRect				( lua_State* L );
 
 	//----------------------------------------------------------------//
-	void				Draw					( u32 idx, MOAIDeckRemapper* remapper, float xStretch, float yStretch );
+	void				DrawPatch				( u32 idx, MOAIDeckRemapper* remapper, float xStretch, float yStretch );
 	void				UpdateParams			();
 
 public:

src/moaicore/MOAITileDeck2D.cpp

@@ -184,15 +184,15 @@ void MOAITileDeck2D::RegisterLuaFuncs ( MOAILuaState& state ) {
 //----------------------------------------------------------------//
 void MOAITileDeck2D::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer ) {
 
-	MOAIGridSpace::SerializeIn ( state );
+	MOAIGridSpace::SerializeIn ( state, serializer );
 
 	this->mTexture.Set ( *this, serializer.MemberIDToObject < MOAITexture >( state.GetField < uintptr >( -1, "mTexture", 0 )));
 }
 
 //----------------------------------------------------------------//
 void MOAITileDeck2D::SerializeOut ( MOAILuaState& state, MOAISerializer& serializer ) {
 
-	MOAIGridSpace::SerializeOut ( state );
+	MOAIGridSpace::SerializeOut ( state, serializer );
 
 	state.SetField ( -1, "mTexture", serializer.AffirmMemberID ( this->mTexture ));
 }