SAGA2: Fix more warnings

engines/saga2/actor.cpp

@@ -2813,7 +2813,7 @@ void Actor::handleSuccessfulKill(Actor *target) {
 
 bool Actor::canBlockWith(GameObject *defenseObj, Direction relativeDir) {
 	assert(defenseObj->proto()->canBlock());
-	assert(relativeDir >= 0 && relativeDir < 8);
+	assert(relativeDir < 8);
 
 	//  Assuming that the actor may increment or decrement their facing
 	//  to block, these masks represent the possible relative facings

engines/saga2/audtweak.h

@@ -40,7 +40,7 @@ enum audioTerrains {
 	audioTerrainRiver,
 	audioTerrainFire,
 
-	audioTerrainLIMIT,
+	audioTerrainLIMIT
 };
 
 struct IntermittentAudioRecord {

engines/saga2/code.h

@@ -194,10 +194,6 @@ enum op_types {
 	op_jmp_seedrandom,                      // seeded random jump
 	op_symref_x,                            // get the export number of the symbol
 
-#if 0
-	op_type,
-#endif
-
 	op_last         /* about 90 so far */
 };
 
@@ -254,14 +250,7 @@ enum addr_types {
 	//  specified that the address is relative to whatever
 	//  object the 1st argument is referrring to.
 
-	addr_this,                              // relative to arg 1
-
-//	addr_common=0,                           // offset from global variables
-//	addr_static,                         // offset from global variables
-
-//	addr_id,                             // offset from const id object
-//	addr_id_indirect,                        // offset from stack id object
-//	addr_index,                              // index from id
+	addr_this                              // relative to arg 1
 };
 
 #define IS_CONST(x)     ((x) >= op_constint && (x) <= op_conststr)
@@ -274,41 +263,6 @@ enum addr_types {
 // #define IS_UNOP2(x)      ((x) == op_getarray || (x) == op_putarray)
 // #define CONST(op)        ((op) >= op_constflag && (op) <= op_conststr)
 
-#if 0
-op_conststr,                            // constant string
-/* we would need an array ref for each type of thing we get,
-    as well as a way to get the array base...
-    (I.e. pointer math)
-*/
-op_getarray,                            /* arrays not supported currently */
-op_putarray,
-
-operands we need to add:
-op_select                   implements selection statement
-op_bin2str                  binary to string
-op_fork                     might have to be done in - language so debugger works ?
-op_foreach                  implements "foreach"
-
-op_t,                       fast true and false
-op_f,
-
-- - also need to change statement producer to "drop" top of stack
-if necessary.
-
-op_min,                 /* comparison opcodes */
-op_max,
-op_clamp,
-op_abs,
-
-op_dropn,               /* drop n stack locations */
-op_swap,                /* swap s[0] and s[1] */
-op_swap2,               /* transpose s[0] and  s[2] */
-op_dupn,                /* duplicate s[0]-s[n-1] */
-
-op_acalc,               /* array calculation */
-op_field,               /* field reference */
-#endif
-
 //  Flags for special statements
 
 #define SPEAKF_NOANIMATE (1<<0)             // speaker should animate

engines/saga2/display.h

@@ -38,13 +38,7 @@ enum DisplayDisabledBecause {
 	PlayingVideo            = 1 << 1,
 	GraphicsInit            = 1 << 2,
 	GameSuspended           = 1 << 3,
-	GameEnded               = 1 << 4,
-#ifdef _WIN32
-	WindowInactive        = 1 << 8,
-	WindowResizing        = 1 << 9,
-	TimerSuspended        = 1 << 10,
-	WindowReresing        = 1 << 11,
-#endif
+	GameEnded               = 1 << 4
 };
 
 /* ===================================================================== *

engines/saga2/dispnode.cpp

@@ -582,11 +582,8 @@ void DisplayNode::drawObject(void) {
 			if (anim == nullptr)
 				return;
 
-			assert(anim->start[0] >= 0);
 			assert(anim->start[0] <  10000);
-			assert(anim->start[1] >= 0);
 			assert(anim->start[1] <  10000);
-			assert(anim->start[2] >= 0);
 			assert(anim->start[2] <  10000);
 
 			assert(pose->rightObjectOffset.x < 1000);

engines/saga2/document.cpp

@@ -789,7 +789,7 @@ void CDocument::renderText(void) {
 			}
 
 			for (; lineIndex < numLines[pageIndex]; lineIndex++) {
-				assert(pageIndex <= maxPages && pageIndex >= 0);
+				assert(pageIndex <= maxPages);
 
 				tPort.moveTo(pageRect->x, pageRect->y + (textHeight * lineIndex) + 1);
 				tPort.setColor(app.textColors[lineIndex]);

engines/saga2/enchant.h

@@ -84,7 +84,7 @@ enum actorEnchantments {
 	enchDetectPoison,
 
 	//  Changes NPC behavior
-	enchHasNoSmell,
+	enchHasNoSmell
 };
 
 //-----------------------------------------------------------------------
@@ -112,7 +112,7 @@ enum worldEnchantments {
 
 	weTimeStop = 0,
 
-	weCount,
+	weCount
 };
 
 } // end of namespace Saga2

engines/saga2/speldefs.h

@@ -146,7 +146,7 @@ public :
 		spellTargetPoint,                   // targeted on a particular point
 		spellTargetObjectPoint,             // targeted on an object's location
 		spellTargetObject,                  // targeted on an object (tracking)
-		spellTargetTAG,                     // targeted on an object (tracking)
+		spellTargetTAG                      // targeted on an object (tracking)
 	};
 
 private:
@@ -254,7 +254,7 @@ enum EffectronFlagMasks {
 	effectronOK     = 0,
 	effectronHidden = (1 << 0),
 	effectronDead   = (1 << 1),
-	effectronBumped = (1 << 2),
+	effectronBumped = (1 << 2)
 };
 
 typedef uint32 EffectronFlags;

engines/saga2/spellbuk.h

@@ -44,7 +44,7 @@ enum SpellManaID {
 	sManaIDGreen    = 3,
 	sManaIDBlue     = 4,
 	sManaIDViolet   = 5,
-	sManaIDSkill    = 6,        // skills are here for convenience
+	sManaIDSkill    = 6         // skills are here for convenience
 };
 
 //-------------------------------------------------------------------
@@ -63,7 +63,7 @@ enum SpellTargetingTypes {
 	spellTargTAG        = 1 << 2, // cast at tileactivity inst.
 	spellTargObject     = 1 << 3, // cast at objects
 	spellTargActor      = 1 << 4,
-	spellTargCaster     = 1 << 5,
+	spellTargCaster     = 1 << 5
 };
 
 //-------------------------------------------------------------------
@@ -75,7 +75,7 @@ enum SpellApplicationTypes {
 	spellApplyTAG       = spellTargTAG,
 	spellApplyObject    = spellTargObject,
 	spellApplyActor     = spellTargObject,
-	spellApplyTracking  = 1 << 6, // track object targets
+	spellApplyTracking  = 1 << 6  // track object targets
 };
 
 
@@ -97,7 +97,7 @@ enum effectAreas {
 	eAreaMissle,
 	eAreaGlow,
 	eAreaBeam,
-	eAreaWall,
+	eAreaWall
 };
 
 

engines/saga2/spelshow.h

@@ -218,7 +218,7 @@ enum effectCollisionCont {
 	ecFlagNone = 0,
 	ecFlagBounce,
 	ecFlagDie,
-	ecFlagStop,
+	ecFlagStop
 };
 
 enum effectDirectionInit {
@@ -227,7 +227,7 @@ enum effectDirectionInit {
 	diFlagInc2 = 2,
 	diFlagInc3 = 3,
 	diFlagInc4 = 4,
-	diFlagRand = 5,
+	diFlagRand = 5
 };
 
 

engines/saga2/uidialog.h

@@ -79,7 +79,7 @@ private:
 
 	enum {
 		maxLines    = 16,
-		maxText     = 512,
+		maxText     = 512
 	};
 
 	int16   titleCount;
@@ -120,7 +120,7 @@ public:
 class CPlacardPanel : public CPlaqText {
 	enum {
 		maxLines    = 16,
-		maxText     = 512,
+		maxText     = 512
 	};
 
 	int16   titleCount;