Merge pull request #460 from MageKing17/feature/subsys-autorepair-when-disabled

Adds the ability for subsystems to repair themselves when disabled.

Author: asarium

code/model/model.h

@@ -140,6 +140,8 @@ typedef struct polymodel_instance {
 #define MSS_FLAG2_COLLIDE_SUBMODEL				 (1 << 3)	// subsystem takes damage only from hits which impact the associated submodel
 #define MSS_FLAG2_DESTROYED_ROTATION			 (1 << 4)   // allows subobjects to continue to rotate even if they have been destroyed
 #define MSS_FLAG2_TURRET_USE_AMMO				 (1 << 5)	// enables ammo consumption for turrets (DahBlount)
+#define MSS_FLAG2_AUTOREPAIR_IF_DISABLED		 (1 << 6)	// Allows the subsystem to repair itself even if disabled (MageKing17)
+#define MSS_FLAG2_NO_AUTOREPAIR_IF_DISABLED		 (1 << 7)	// Inversion of the previous; disallows this particular subsystem if the ship-wide flag is set (MageKing17)
 
 #define NUM_SUBSYSTEM_FLAGS			33
 

code/ship/ship.cpp

@@ -256,7 +256,9 @@ flag_def_list Subsystem_flags[] = {
 	{ "no disappear",			MSS_FLAG2_NO_DISAPPEAR, 1},
 	{ "collide submodel",		MSS_FLAG2_COLLIDE_SUBMODEL, 1},
 	{ "allow destroyed rotation",	MSS_FLAG2_DESTROYED_ROTATION, 1},
-	{ "turret use ammo",		MSS_FLAG2_TURRET_USE_AMMO, 1}
+	{ "turret use ammo",		MSS_FLAG2_TURRET_USE_AMMO, 1},
+	{ "autorepair if disabled",	MSS_FLAG2_AUTOREPAIR_IF_DISABLED, 1},
+	{ "don't autorepair if disabled", MSS_FLAG2_NO_AUTOREPAIR_IF_DISABLED, 1},
 };
 
 const int Num_subsystem_flags = sizeof(Subsystem_flags)/sizeof(flag_def_list);
@@ -310,6 +312,7 @@ flag_def_list Ship_flags[] = {
 	{ "no lighting",				SIF2_NO_LIGHTING,			1 },
 	{ "auto spread shields",		SIF2_AUTO_SPREAD_SHIELDS,	1 },
 	{ "model point shields",		SIF2_MODEL_POINT_SHIELDS,	1 },
+	{ "repair disabled subsystems", SIF2_SUBSYS_REPAIR_WHEN_DISABLED, 1},
 
 	// to keep things clean, obsolete options go last
 	{ "ballistic primaries",		-1,		255 }
@@ -4334,6 +4337,15 @@ int parse_ship_values(ship_info* sip, const bool is_template, const bool first_t
 				sp->flags |= MSS_FLAG_USE_MULTIPLE_GUNS;
 			}
 
+			if ((sp->flags2 & MSS_FLAG2_AUTOREPAIR_IF_DISABLED) && (sp->flags2 & MSS_FLAG2_NO_AUTOREPAIR_IF_DISABLED)) {
+				Warning(LOCATION, "\"autorepair if disabled\" flag used with \"don't autorepair if disabled\" flag on a subsystem on %s '%s'.\nWhichever flag would be default behavior anyway for this ship has been removed.\n", info_type_name, sip->name);
+				if (sip->flags2 & SIF2_SUBSYS_REPAIR_WHEN_DISABLED){
+					sp->flags2 &= ~MSS_FLAG2_AUTOREPAIR_IF_DISABLED;
+				} else {
+					sp->flags2 &= ~MSS_FLAG2_NO_AUTOREPAIR_IF_DISABLED;
+				}
+			}
+
 			if (old_flags) {
 				mprintf(("Use of deprecated subsystem syntax.  Please use the $Flags: field for subsystem flags.\n\n" \
 				"At least one of the following tags was used on %s '%s', subsystem %s:\n" \
@@ -6307,6 +6319,10 @@ int subsys_set(int objnum, int ignore_subsys_info)
 			ship_system->flags |= SSF_PLAY_SOUND_FOR_PLAYER;
 		if (model_system->flags2 & MSS_FLAG2_NO_DISAPPEAR)
 			ship_system->flags |= SSF_NO_DISAPPEAR;
+		if (model_system->flags2 & MSS_FLAG2_AUTOREPAIR_IF_DISABLED)
+			ship_system->flags |= SSF_AUTOREPAIR_IF_DISABLED;
+		if (model_system->flags2 & MSS_FLAG2_NO_AUTOREPAIR_IF_DISABLED)
+			ship_system->flags |= SSF_NO_AUTOREPAIR_IF_DISABLED;
 
 		ship_system->turn_rate = model_system->turn_rate;
 
@@ -8774,9 +8790,19 @@ void ship_auto_repair_frame(int shipnum, float frametime)
 		if ( ssp->current_hits < ssp->max_hits ) {
 
 			// only repair those subsystems which are not destroyed
-			if ( ssp->max_hits <= 0 || ssp->current_hits <= 0 )
+			if ( ssp->max_hits <= 0 )
 				continue;
 
+			if ( ssp->current_hits <= 0 ) {
+				if (sip->flags2 & SIF2_SUBSYS_REPAIR_WHEN_DISABLED) {
+					if (ssp->flags & SSF_NO_AUTOREPAIR_IF_DISABLED) {
+						continue;
+					}
+				} else if (!(ssp->flags & SSF_AUTOREPAIR_IF_DISABLED)) {
+					continue;
+				}
+			}
+
 			// do incremental repair on the subsystem
 			// check for overflow of current_hits
 			ssp->current_hits += ssp->max_hits * real_repair_rate * frametime;
@@ -8790,7 +8816,14 @@ void ship_auto_repair_frame(int shipnum, float frametime)
 				if ( ssip->aggregate_current_hits > ssip->aggregate_max_hits ) {
 					ssip->aggregate_current_hits = ssip->aggregate_max_hits;
 				}
-			}		
+			}
+
+			// check to see if this subsystem was totally non functional before -- if so, then
+			// reset the flags
+			if ( (ssp->system_info->type == SUBSYSTEM_ENGINE) && (sp->flags & SF_DISABLED) ) {
+				sp->flags &= ~SF_DISABLED;
+				ship_reset_disabled_physics(objp, sp->ship_info_index);
+			}
 		}
 	}	// end for
 }

code/ship/ship.h

@@ -294,6 +294,8 @@ typedef struct cockpit_display_info {
 #define SSF_NO_AGGREGATE		(1 << 12)		// exclude this subsystem from the aggregate subsystem-info tracking - Goober5000
 #define SSF_PLAY_SOUND_FOR_PLAYER	( 1 << 13)	// If this subsystem is a turret on a player ship, play firing sounds - The E 
 #define SSF_NO_DISAPPEAR		( 1 << 14)		// prevents submodel from disappearing when subsys destroyed
+#define SSF_AUTOREPAIR_IF_DISABLED	(1 << 15)	// Allows the subsystem to repair itself even when disabled - MageKing17
+#define SSF_NO_AUTOREPAIR_IF_DISABLED (1 << 16) // Inversion of the above; allow a specific subsystem not to repair itself after being disabled if the ship has the "repair disabled subsystems" flag - MageKing17
 
 
 // Wanderer 
@@ -931,6 +933,7 @@ extern int ship_find_exited_ship_by_signature( int signature);
 #define SIF2_AUTO_SPREAD_SHIELDS			(1 << 16)	// zookeeper - auto spread shields
 #define SIF2_DRAW_WEAPON_MODELS				(1 << 17)	// the ship draws weapon models of any sort (used to be a boolean)
 #define SIF2_MODEL_POINT_SHIELDS			(1 << 18)	// zookeeper - uses model-defined shield points instead of quadrants
+#define SIF2_SUBSYS_REPAIR_WHEN_DISABLED	(1 << 19)	// MageKing17 - Subsystems auto-repair themselves even when disabled.
 
 #define	SIF_DEFAULT_VALUE		0
 #define SIF2_DEFAULT_VALUE		0