Browse Source

various warnings

warnings cleanup
marauder2k7 1 year ago
parent
commit
a621cc5100

+ 3 - 0
Engine/source/T3D/proximityMine.cpp

@@ -495,6 +495,9 @@ void ProximityMine::processTick( const Move* move )
                return;
                return;
             }
             }
             break;
             break;
+         case default:
+            // just break out, unknown state, covers warnings for not fulfilling all possiblities in enum.
+            break;
       }
       }
    }
    }
 }
 }

+ 2 - 1
Engine/source/T3D/sfx/sfxEmitter.cpp

@@ -407,8 +407,9 @@ U32 SFXEmitter::packUpdate(NetConnection* con, U32 mask, BitStream* stream)
       stream->writeAffineTransform(mObjToWorld);
       stream->writeAffineTransform(mObjToWorld);
 
 
    // track
    // track
-   if (stream->writeFlag(mask & DirtyUpdateMask))
+   if (stream->writeFlag(mask & DirtyUpdateMask)){
       PACK_ASSET(con, Sound);
       PACK_ASSET(con, Sound);
+   }
    //if (stream->writeFlag(mDirty.test(Track)))
    //if (stream->writeFlag(mDirty.test(Track)))
    //   sfxWrite( stream, mTrack );
    //   sfxWrite( stream, mTrack );
 
 

+ 1 - 1
Engine/source/console/engineXMLExport.cpp

@@ -553,7 +553,7 @@ static void exportScope(const EngineExportScope* scope, SimXMLDocument* xml, boo
          break;
          break;
 
 
       default:
       default:
-         AssertFatal(true, "Unknown EngineExportKind: " + exportInfo->getExportKind());
+         AssertFatal(false, avar("Unknown EngineExportKind: %d", exportInfo->getExportKind()));
          break;
          break;
       }
       }
    }
    }

+ 1 - 1
Engine/source/console/script.h

@@ -52,7 +52,7 @@ namespace Con
    {
    {
       char buffer[4096];
       char buffer[4096];
       va_list args;
       va_list args;
-      va_start(args, &string);
+      va_start(args, string);
       dVsprintf(buffer, sizeof(buffer), string, args);
       dVsprintf(buffer, sizeof(buffer), string, args);
       va_end(args);
       va_end(args);
 
 

+ 1 - 1
Engine/source/console/torquescript/runtime.cpp

@@ -97,7 +97,7 @@ namespace TorqueScript
    {
    {
       char buffer[4096];
       char buffer[4096];
       va_list args;
       va_list args;
-      va_start(args, &string);
+      va_start(args, string);
       dVsprintf(buffer, sizeof(buffer), string, args);
       dVsprintf(buffer, sizeof(buffer), string, args);
       va_end(args);
       va_end(args);
       return evaluate(buffer);
       return evaluate(buffer);

+ 5 - 5
Engine/source/core/util/uuid.cpp

@@ -146,11 +146,11 @@ static void create_uuid_state(uuid_state *st)
  */
  */
 static void format_token(char *target, const xuuid_t *u)
 static void format_token(char *target, const xuuid_t *u)
 {
 {
-  sprintf(target, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	  u->time_low, u->time_mid, u->time_hi_and_version,
-	  u->clock_seq_hi_and_reserved, u->clock_seq_low,
-	  u->node[0], u->node[1], u->node[2],
-	  u->node[3], u->node[4], u->node[5]);
+   snprintf(target, sizeof(target), "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+            u->time_low, u->time_mid, u->time_hi_and_version,
+            u->clock_seq_hi_and_reserved, u->clock_seq_low,
+            u->node[0], u->node[1], u->node[2],
+            u->node[3], u->node[4], u->node[5]);
 }
 }
 
 
 /* convert a pair of hex digits to an integer value [0,255] */
 /* convert a pair of hex digits to an integer value [0,255] */

+ 1 - 1
Engine/source/gui/shaderEditor/guiShaderEditor.h

@@ -144,4 +144,4 @@ public:
    void canHitSelectedNodes(bool state = true);
    void canHitSelectedNodes(bool state = true);
 };
 };
 
 
-#endif _GUISHADEREDITOR_H_
+#endif //_GUISHADEREDITOR_H_

+ 3 - 0
Engine/source/gui/worldEditor/worldEditor.cpp

@@ -867,6 +867,9 @@ void WorldEditor::terrainSnapSelection(Selection* sel, U8 modifier, Point3F gizm
             case AlignNegZ:
             case AlignNegZ:
                rot.set(mDegToRad(-90.0f), 0.0f, mDegToRad(180.0f));
                rot.set(mDegToRad(-90.0f), 0.0f, mDegToRad(180.0f));
                break;
                break;
+               
+            case default:
+               break;
          }
          }
 
 
          MatrixF mat = MathUtils::createOrientFromDir(ri.normal);
          MatrixF mat = MathUtils::createOrientFromDir(ri.normal);

+ 3 - 0
Engine/source/navigation/duDebugDrawTorque.cpp

@@ -201,6 +201,9 @@ void duDebugDrawTorque::renderBuffer(Buffer &b)
                             buf[i].data.color.b,
                             buf[i].data.color.b,
                             buf[i].data.color.a);
                             buf[i].data.color.a);
          break;
          break;
+            
+         case default:
+            break;
       }
       }
    }
    }
    PrimBuild::end();
    PrimBuild::end();