Automated build commit

Normally the disabled/disarmed flags are only set if the destroyed subsystem is actually an engine or turret.  This should be done for cheats as well, otherwise, for example, destroying any subsystem on a non-engined ship will cause it to become disabled.

.github/workflows/build-release.yaml

@@ -92,6 +92,7 @@ jobs:
         name: Checkout
         with:
           submodules: true  # `true` to checkout submodules, `recursive` to recursively checkout submodules
+          ref: '${{ github.ref }}'
       - name: Prepare Vulkan SDK
         uses: humbletim/[email protected]
         with:
@@ -145,6 +146,7 @@ jobs:
         with:
           submodules: true
           fetch-depth: '0'  # value 0 to fetch all history and tags for all branches
+          ref: '${{ github.ref }}'
       - name: Download Release builds
         # Grab the release builds
         uses: actions/download-artifact@v2
@@ -191,6 +193,7 @@ jobs:
         name: Checkout
         with:
           submodules: true
+          ref: '${{ github.ref }}'
       # - name: Cache Qt
         # # Cache Qt
         # id: cache-qt-win
@@ -285,7 +288,7 @@ jobs:
         with:
           submodules: true
           fetch-depth: '0'
-
+          ref: '${{ github.ref }}'
       - name: Download Release builds
         uses: actions/download-artifact@v2
         with:
@@ -357,6 +360,7 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
+          ref: '${{ github.ref }}'
       - name: Prepare Vulkan SDK
         uses: humbletim/[email protected]
         with:

ci/post/release.mako

@@ -9,10 +9,10 @@ PLACEHOLDER
 
 Deprecations are a mechanism in FSO where a certain feature or aspect of the engine has changed or is no longer supported. Since this would normally break existing mods we have the mod table feature "[tt]$Target Version:[/tt]" with which a mod can specify what version of FSO it was developed with. The features listed above will be removed or changed when the target version of a mod is at least the version released in this post.
 
-[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=98682.0]23.0.0 Release Thread[/url][/size]
+[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=98682.0]23.2.0 Release Thread[/url][/size]
 
 Launchers, if you don't have one already:
-[b]All platforms: [/b] For every day use, we recommend [url=https://www.hard-light.net/forums/index.php?topic=94068.0]Knossos[/url], an integrated solution for downloading and launching mods.
+[b]All platforms: [/b] For every day use, we recommend [url=https://www.hard-light.net/forums/index.php?topic=98984.0]Knossos[/url], an integrated solution for downloading and launching mods.
 
 [hidden=Alternative Launchers]
 Cross-platform: [url=https://www.hard-light.net/forums/index.php?topic=89162]wxLauncher 0.12.x Test Build[/url] (ongoing project for a unified launcher, you should upgrade to the latest RC/test build if you have not yet)

code/gamesnd/eventmusic.cpp

@@ -604,7 +604,10 @@ void event_music_level_start(int force_soundtrack)
 
 	// Check that soundtrack index is in range, except that < 0 means no soundtrack
 	if (Current_soundtrack_num < 0)
+	{
+		Pattern_timer_id = TIMESTAMP::never();	// update the timestamp as if a soundtrack did start
 		return;
+	}
 	Assert(Current_soundtrack_num < (int)Soundtracks.size());
 	if (Current_soundtrack_num >= (int)Soundtracks.size())
 		return;

code/io/keycontrol.cpp

@@ -873,13 +873,17 @@ void process_debug_keys(int k)
 
 					do_subobj_hit_stuff(objp, Player_obj, &g_subobj_pos, Player_ai->targeted_subsys->system_info->subobj_num, (float) -Player_ai->targeted_subsys->system_info->type, NULL); //100.0f);
 
-					if ( sp->subsys_info[SUBSYSTEM_ENGINE].aggregate_current_hits <= 0.0f ) {
-						mission_log_add_entry(LOG_SHIP_DISABLED, sp->ship_name, NULL );
-						sp->flags.set(Ship::Ship_Flags::Disabled);				// add the disabled flag
+					if ( Player_ai->targeted_subsys->system_info->type == SUBSYSTEM_ENGINE ) {
+						if ( sp->subsys_info[SUBSYSTEM_ENGINE].aggregate_current_hits <= 0.0f ) {
+							mission_log_add_entry(LOG_SHIP_DISABLED, sp->ship_name, NULL );
+							sp->flags.set(Ship::Ship_Flags::Disabled);				// add the disabled flag
+						}
 					}
 
-					if ( sp->subsys_info[SUBSYSTEM_TURRET].aggregate_current_hits <= 0.0f ) {
-						mission_log_add_entry(LOG_SHIP_DISARMED, sp->ship_name, NULL );
+					if ( Player_ai->targeted_subsys->system_info->type == SUBSYSTEM_TURRET ) {
+						if ( sp->subsys_info[SUBSYSTEM_TURRET].aggregate_current_hits <= 0.0f ) {
+							mission_log_add_entry(LOG_SHIP_DISARMED, sp->ship_name, NULL );
+						}
 					}
 				}
 			}

code/missionui/missionweaponchoice.cpp

@@ -4030,6 +4030,10 @@ void wl_apply_current_loadout_to_all_ships_in_current_wing()
 		// get the slot for this ship
 		cur_wss_slot = cur_wing_block * MAX_WING_SLOTS + cur_wing_slot;
 
+		// make sure there is actually a ship here
+		if (Wss_slots[cur_wss_slot].ship_class < 0)
+			continue;
+
 		// get the ship's name and class
 		sip = &Ship_info[Wss_slots[cur_wss_slot].ship_class];	
 		ss_return_name(cur_wing_block, cur_wing_slot, ship_name);

code/ship/shipfx.cpp

@@ -866,7 +866,7 @@ bool shipfx_eye_in_shadow( vec3d *eye_pos, object * src_obj, int sun_n )
 				mc.model_instance_num = -1;
 				mc.model_num = sip->cockpit_model_num;
 				mc.submodel_num = -1;
-				mc.orient = &Eye_matrix;
+				mc.orient = &eye_ori;
 				mc.pos = &pos;
 				mc.p0 = &rp0;
 				mc.p1 = &rp1;

version_override.cmake

@@ -0,0 +1,5 @@
+set(FSO_VERSION_MAJOR 23)
+set(FSO_VERSION_MINOR 2)
+set(FSO_VERSION_BUILD 1)
+set(FSO_VERSION_REVISION 0)
+set(FSO_VERSION_REVISION_STR )