Merge pull request #159 from lilligreen/xcode

Fixed compile errors and warnings resulting from the Xcode 5.1 update

engine/source/2d/assets/AnimationAsset.cc

@@ -296,7 +296,7 @@ void AnimationAsset::setRandomStart( const bool randomStart )
 void AnimationAsset::setNamedCellsMode( const bool namedCellsMode )
 {
     // Ignore no change.
-    if ( mNamedCellsMode == mNamedCellsMode)
+    if ( namedCellsMode == mNamedCellsMode)
         return;
 
     // Update.

engine/source/2d/assets/ParticleAssetEmitter.cc

@@ -562,7 +562,7 @@ bool ParticleAssetEmitter::setAnimation( const char* pAnimationAssetId )
 
 //------------------------------------------------------------------------------
 
-inline void ParticleAssetEmitter::refreshAsset( void )
+void ParticleAssetEmitter::refreshAsset( void )
 {
     // Finish if no owner.
     if ( mOwner == NULL )

engine/source/2d/assets/ParticleAssetEmitter.h

@@ -258,7 +258,7 @@ public:
 
 private:
     void setOwner( ParticleAsset* pParticleAsset );
-    inline void refreshAsset( void );
+    void refreshAsset( void );
 
 protected:
     virtual void onAssetRefreshed( AssetPtrBase* pAssetPtrBase );

engine/source/2d/core/SpriteBase_ScriptBinding.h

@@ -153,7 +153,7 @@ ConsoleMethodWithDocs(SpriteBase, getImageFrameName, ConsoleString, 2, 2, ())
     {
         // No, so warn.
         Con::warnf( "SpriteBase::getImageFrameName() - Method invalid, not in static mode." );
-        return false;
+        return NULL;
     }
     
     // Get image Frame.

engine/source/2d/gui/SceneWindow_ScriptBinding.h

@@ -1412,7 +1412,7 @@ ConsoleMethodWithDocs(SceneWindow, getWorldPoint, ConsoleString, 3, 4, (X / Y))
    else
    {
       Con::warnf("SceneWindow::getWorldPoint() - Invalid number of parameters!");
-      return false;
+      return NULL;
    }
    
    // Destination Point.

engine/source/2d/sceneobject/SceneObject_ScriptBinding.h

@@ -739,8 +739,8 @@ ConsoleMethodWithDocs(SceneObject, getWorldPoint, ConsoleString, 3, 4, (float lo
    // Invalid
    else
    {
-      Con::warnf("SceneObject::getWorldPoint() - Invalid number of parameters!");
-      return false;
+        Con::warnf("SceneObject::getWorldPoint() - Invalid number of parameters!");
+        return NULL;
    }
 
     // Calculate world coordinate.
@@ -812,7 +812,7 @@ ConsoleMethodWithDocs(SceneObject, getWorldVector, ConsoleString, 3, 4, (float l
    else
    {
       Con::warnf("SceneObject::getWorldVector() - Invalid number of parameters!");
-      return false;
+      return NULL;
    }
 
     // Calculate world vector.
@@ -1177,13 +1177,13 @@ ConsoleMethodWithDocs(SceneObject, getContact, ConsoleString, 3, 3, (contactInde
             normalImpulse1,
             tangentImpulse1 );
     }
-	else
-	{
+    else
+    {
         dSprintf(pReturnBuffer, 64,
             "%d %d %d",
             pSceneObjectCollider->getId(),
             shapeIndexThis, shapeIndexCollider );
-	}
+    }
 
     return pReturnBuffer;
 }
@@ -2028,7 +2028,7 @@ ConsoleMethodWithDocs(SceneObject, applyForce, ConsoleVoid, 4, 6, (worldForce X/
     {
         // Apply force.
         object->applyForce( worldForce );
-		return;
+        return;
     }
 
     // World point.
@@ -2048,7 +2048,7 @@ ConsoleMethodWithDocs(SceneObject, applyForce, ConsoleVoid, 4, 6, (worldForce X/
     // Invalid
     else
     {
-		Con::warnf("Scene::applyForce() - Invalid number of parameters!");
+        Con::warnf("Scene::applyForce() - Invalid number of parameters!");
         return;
     }
 
@@ -2108,7 +2108,7 @@ ConsoleMethodWithDocs(SceneObject, applyLinearImpulse, ConsoleVoid, 4, 6, (world
     {
         // Apply force.
         object->applyForce( worldImpulse );
-		return;
+        return;
     }
 
     // World point.
@@ -3059,14 +3059,14 @@ ConsoleMethodWithDocs( SceneObject, getChainCollisionShapeAdjacentStart, Console
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getChainCollisionShapeAdjacentStart() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_chain )
     {
         Con::warnf("SceneObject::getChainCollisionShapeAdjacentStart() - Not a chain shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getChainCollisionShapeAdjacentStart( shapeIndex ).scriptThis();
@@ -3090,14 +3090,14 @@ ConsoleMethodWithDocs( SceneObject, getChainCollisionShapeAdjacentEnd, ConsoleSt
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getChainCollisionShapeAdjacentEnd() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_chain )
     {
         Con::warnf("SceneObject::getChainCollisionShapeAdjacentEnd() - Not a chain shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getChainCollisionShapeAdjacentEnd( shapeIndex ).scriptThis();
@@ -3227,14 +3227,14 @@ ConsoleMethodWithDocs( SceneObject, getEdgeCollisionShapeLocalPositionStart, Con
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeLocalPositionStart() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_edge )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeLocalPositionStart() - Not an edge shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getEdgeCollisionShapeLocalPositionStart( shapeIndex ).scriptThis();
@@ -3258,14 +3258,14 @@ ConsoleMethodWithDocs( SceneObject, getEdgeCollisionShapeLocalPositionEnd, Conso
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeLocalPositionEnd() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_edge )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeLocalPositionEnd() - Not an edge shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getEdgeCollisionShapeLocalPositionEnd( shapeIndex ).scriptThis();
@@ -3351,14 +3351,14 @@ ConsoleMethodWithDocs( SceneObject, getEdgeCollisionShapeAdjacentStart, ConsoleS
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeAdjacentStart() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_edge )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeAdjacentStart() - Not an edge shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getEdgeCollisionShapeAdjacentStart( shapeIndex ).scriptThis();
@@ -3382,14 +3382,14 @@ ConsoleMethodWithDocs( SceneObject, getEdgeCollisionShapeAdjacentEnd, ConsoleStr
     if ( shapeIndex >= shapeCount )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeAdjacentEnd() - Invalid shape index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     // Sanity!
     if ( object->getCollisionShapeType( shapeIndex ) != b2Shape::e_edge )
     {
         Con::warnf("SceneObject::getEdgeCollisionShapeAdjacentEnd() - Not an edge shape at index of %d.", shapeIndex);
-        return false;
+        return NULL;
     }
 
     return object->getEdgeCollisionShapeAdjacentEnd( shapeIndex ).scriptThis();

engine/source/algorithm/hashFunction.cc

@@ -109,7 +109,7 @@ U32 hash(register U8 *k, register U32 length, register U32 initval)
     // Debug Profiling.
     PROFILE_SCOPE(HashFunction);
 
-   register U32 a, b, c, len;
+   U32 a, b, c, len;
 
    /* Set up the internal state */
    len = length;

engine/source/assets/assetManager.cc

@@ -2222,7 +2222,7 @@ S32 AssetManager::findAssetLooseFile( AssetQuery* pAssetQuery, const char* pLoos
 
     // Expand loose file.
     char looseFileBuffer[1024];
-    Con::expandPath(looseFileBuffer, sizeof(looseFileBuffer), pLooseFile, false );
+    Con::expandPath(looseFileBuffer, sizeof(looseFileBuffer), pLooseFile, NULL, false );
 
     // Fetch asset loose file.
     StringTableEntry looseFile = StringTable->insert( looseFileBuffer );

engine/source/collection/nameTags_ScriptBinding.h

@@ -275,7 +275,7 @@ ConsoleMethodWithDocs(NameTags, queryTags, ConsoleString, 3, 4, (tagIds, [exclud
     if ( tagId == 0 )
     {
         Con::warnf("Invalid tag Id.\n");
-        return false;
+        return NULL;
     }
 
     // Query tags.

engine/source/component/behaviors/behaviorComponent_ScriptBinding.h

@@ -340,7 +340,7 @@ ConsoleMethodWithDocs( BehaviorComponent, getBehaviorConnection, ConsoleString,
     {
         // No, so warn.
         Con::warnf("BehaviorComponent::getBehaviorConnections() - Could not find output behavior '%s'.", argv[2] );
-        return false;
+        return NULL;
     }
 
     // Fetch output name.

engine/source/console/CMDscan.cc

@@ -771,9 +771,9 @@ YY_MALLOC_DECL
 
 YY_DECL
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
 
 #line 79 "CMDscan.l"
 
@@ -820,7 +820,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				yy_last_accepting_state = yy_current_state;
@@ -1045,7 +1045,7 @@ case 37:
 YY_RULE_SETUP
 #line 117 "CMDscan.l"
 {
-         register int c = 0, l;
+         int c = 0, l;
          for ( ; ; )
          {
             l = c;
@@ -1407,9 +1407,9 @@ case YY_STATE_EOF(INITIAL):
 
 static int yy_get_next_buffer()
 	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
+	char *dest = yy_current_buffer->yy_ch_buf;
+	char *source = yytext_ptr;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -1537,14 +1537,14 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
 
 	yy_current_state = yy_start;
 
 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			yy_last_accepting_state = yy_current_state;
@@ -1576,10 +1576,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
 yy_state_type yy_current_state;
 #endif
 	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+	int yy_is_jam;
+	char *yy_cp = yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yy_last_accepting_state = yy_current_state;
@@ -1604,10 +1604,10 @@ static void yyunput( int c, register char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+char *yy_bp;
 #endif
 	{
-	register char *yy_cp = yy_c_buf_p;
+	char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yy_hold_char;
@@ -1615,10 +1615,10 @@ register char *yy_bp;
 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
+		int number_to_move = yy_n_chars + 2;
+		char *dest = &yy_current_buffer->yy_ch_buf[
 					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&yy_current_buffer->yy_ch_buf[number_to_move];
 
 		while ( source > yy_current_buffer->yy_ch_buf )
@@ -2072,7 +2072,7 @@ yyconst char *s2;
 int n;
 #endif
 	{
-	register int i;
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 	}

engine/source/console/CMDscan.l

@@ -115,7 +115,7 @@ HEXDIGIT [a-fA-F0-9]
 "SPC"       {CMDlval.i = ' '; return '@'; }
 "@"         {CMDlval.i = 0; return '@'; }
 "/*" {
-         register int c = 0, l;
+         int c = 0, l;
          for ( ; ; )
          {
             l = c;

engine/source/console/bison.simple

@@ -166,9 +166,9 @@ __yy_memcpy (from, to, count)
      char *to;
      int count;
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *f = from;
+  char *t = to;
+  int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -181,9 +181,9 @@ __yy_memcpy (from, to, count)
 static void
 __yy_memcpy (char *from, char *to, int count)
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *f = from;
+  char *t = to;
+  int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -211,10 +211,10 @@ int
 yyparse(YYPARSE_PARAM)
      YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
+  int yystate;
+  int yyn;
+  short *yyssp;
+  YYSTYPE *yyvsp;
   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
   int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
 

engine/source/console/cmdgram.cc

@@ -1148,9 +1148,9 @@ __yy_memcpy (from, to, count)
      char *to;
      int count;
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *f = from;
+  char *t = to;
+  int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -1163,9 +1163,9 @@ __yy_memcpy (from, to, count)
 static void
 __yy_memcpy (char *from, char *to, int count)
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *f = from;
+  char *t = to;
+  int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -1193,10 +1193,10 @@ int
 yyparse(YYPARSE_PARAM)
      YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
+  int yystate;
+  int yyn;
+  short *yyssp;
+  YYSTYPE *yyvsp;
   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
   int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
 

engine/source/graphics/TextureManager.cc

@@ -456,6 +456,9 @@ void TextureManager::getSourceDestByteFormat(GBitmap *pBitmap, U32 *sourceFormat
     case GBitmap::Luminance:
         *sourceFormat = GL_LUMINANCE;
         break;
+    case GBitmap::LuminanceAlpha:
+        *sourceFormat = GL_LUMINANCE_ALPHA;
+        break;
     case GBitmap::RGB:
         *sourceFormat = GL_RGB;
         break;

engine/source/graphics/bitmapJpeg.cc

@@ -200,6 +200,7 @@ bool GBitmap::writeJPEG(Stream& stream) const
       case RGB565:
       case RGB5551:
       case Luminance:
+      case LuminanceAlpha:
 #ifdef TORQUE_OS_IOS
       case PVR2:
       case PVR2A:

engine/source/graphics/bitmapPng.cc

@@ -129,7 +129,7 @@ bool GBitmap::readPNG(Stream& io_rStream)
    U8 header[cs_headerBytesChecked];
    io_rStream.read(cs_headerBytesChecked, header);
 
-   bool isPng = png_check_sig(header, cs_headerBytesChecked) != 0;
+   bool isPng = (png_check_sig(header, cs_headerBytesChecked)) != 0;
    if (isPng == false) 
    {
       AssertWarn(false, "GBitmap::readPNG: stream doesn't contain a PNG");

engine/source/gui/editor/guiInspector.cc

@@ -885,7 +885,7 @@ void GuiInspectorDynamicGroup::clearFields()
 SimFieldDictionary::Entry* GuiInspectorDynamicGroup::findDynamicFieldInDictionary( StringTableEntry fieldName )
 {
    if( !mTarget )
-      return false;
+      return NULL;
 
    SimFieldDictionary * fieldDictionary = mTarget->getFieldDictionary();
 

engine/source/memory/dataChunker.cc

@@ -51,7 +51,8 @@ void *DataChunker::alloc(S32 size)
    }
    void *ret = curBlock->data + curBlock->curIndex;
    
-   S32 index = curBlock->curIndex;
+   S32 index;
+   index = curBlock->curIndex;
    curBlock->curIndex += ((U32)size + 3) & ~3; // dword align
    
 #ifdef EMSCRIPTEN

engine/source/module/moduleManager_ScriptBinding.h

@@ -288,7 +288,7 @@ ConsoleMethodWithDocs(ModuleManager, copyModule, ConsoleString, 6, 6, (sourceMod
     {
         // No, so warn.
         Con::warnf( "ModuleManager::copyModule() - Could not find source module definition '%s'.", argv[2] );
-        return false;
+        return NULL;
     }
 
     // Fetch the target module Id.

engine/source/network/serverQuery.cc

@@ -127,7 +127,7 @@ static const S32 gMaxConcurrentQueries = 2;
 static const S32 gPingRetryCount = 4;
 static const S32 gPingTimeout = 800;
 static const S32 gQueryRetryCount = 4;
-static const S32 gQueryTimeout = 1000;
+//static const S32 gQueryTimeout = 1000;
 
 // State variables:
 static bool sgServerQueryActive = false;