Merge pull request #3595 from Goober5000/ship_logging

improve logging of ship creation and cleanup

Author: Goober5000

code/mission/missionlog.cpp

@@ -383,8 +383,67 @@ void mission_log_add_entry(LogType type, const char *pname, const char *sname, i
 			nprintf(("missionlog", "new highwater point reached for mission log (%d entries).\n", last_entry));
 		}
 	}
-#endif
 
+	float mission_time = f2fl(Missiontime);
+	int minutes = (int)(mission_time / 60);
+	int seconds = (int)mission_time % 60;
+
+	// record the entry to the debug log too
+	switch (entry->type) {
+		case LOG_SHIP_DESTROYED:
+		case LOG_WING_DESTROYED:
+			nprintf(("missionlog", "MISSION LOG: %s destroyed at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_SHIP_ARRIVED:
+		case LOG_WING_ARRIVED:
+			nprintf(("missionlog", "MISSION LOG: %s arrived at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_SHIP_DEPARTED:
+		case LOG_WING_DEPARTED:
+			nprintf(("missionlog", "MISSION LOG: %s departed at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_SHIP_DOCKED:
+		case LOG_SHIP_UNDOCKED:
+			nprintf(("missionlog", "MISSION LOG: %s %sdocked with %s at %02d:%02d\n", entry->pname, entry->type == LOG_SHIP_UNDOCKED ? "un" : "", entry->sname, minutes, seconds));
+			break;
+		case LOG_SHIP_SUBSYS_DESTROYED:
+			nprintf(("missionlog", "MISSION LOG: %s subsystem %s destroyed at %02d:%02d\n", entry->pname, entry->sname, minutes, seconds));
+			break;
+		case LOG_SHIP_DISABLED:
+			nprintf(("missionlog", "MISSION LOG: %s disabled at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_SHIP_DISARMED:
+			nprintf(("missionlog", "MISSION LOG: %s disarmed at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_PLAYER_CALLED_FOR_REARM:
+			nprintf(("missionlog", "MISSION LOG: Player %s called for rearm at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_PLAYER_ABORTED_REARM:
+			nprintf(("missionlog", "MISSION LOG: Player %s aborted rearm at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_PLAYER_CALLED_FOR_REINFORCEMENT:
+			nprintf(("missionlog", "MISSION LOG: A player called for reinforcement %s at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_GOAL_SATISFIED:
+			nprintf(("missionlog", "MISSION LOG: Goal %s satisfied at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_GOAL_FAILED:
+			nprintf(("missionlog", "MISSION LOG: Goal %s failed at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+		case LOG_WAYPOINTS_DONE:
+			nprintf(("missionlog", "MISSION LOG: %s completed waypoint path %s at %02d:%02d\n", entry->pname, entry->sname, minutes, seconds));
+			break;
+		case LOG_CARGO_REVEALED:
+			nprintf(("missionlog", "MISSION LOG: %s cargo %s revealed at %02d:%02d\n", entry->pname, Cargo_names[entry->index], minutes, seconds));
+			break;
+		case LOG_CAP_SUBSYS_CARGO_REVEALED:
+			nprintf(("missionlog", "MISSION LOG: %s subsystem %s cargo %s revealed at %02d:%02d\n", entry->pname, entry->sname, Cargo_names[entry->index], minutes, seconds));
+			break;
+		case LOG_SELF_DESTRUCTED:
+			nprintf(("missionlog", "MISSION LOG: %s self-destructed at %02d:%02d\n", entry->pname, minutes, seconds));
+			break;
+	}
+#endif
 }
 
 // function, used in multiplayer only, which adds an entry sent by the host of the game, into

code/mission/missionparse.cpp

@@ -2453,14 +2453,6 @@ int parse_create_object_sub(p_object *p_objp)
 			Script_system.RunCondition(CHA_ONSHIPARRIVE, &Objects[objnum]);
 			Script_system.RemHookVars({"Ship", "Parent"});
 		}
-
-		if (Ship_info[shipp->ship_info_index].is_big_or_huge() && !brought_in_docked_wing) {
-			float mission_time = f2fl(Missiontime);
-			int minutes = (int)(mission_time / 60);
-			int seconds = (int)mission_time % 60;
-
-			mprintf(("%s arrived at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-		}
 	}
 
 	return objnum;

code/parse/sexp.cpp

@@ -16077,14 +16077,6 @@ void sexp_ship_create(int n)
 		Script_system.RunCondition(CHA_ONSHIPARRIVE, &Objects[objnum]);
 		Script_system.RemHookVars({"Ship", "Parent"});
 	}
-
-	if (Game_mode & GM_IN_MISSION && sip->is_big_or_huge()) {
-		float mission_time = f2fl(Missiontime);
-		int minutes = (int)(mission_time / 60);
-		int seconds = (int)mission_time % 60;
-
-		mprintf(("%s created at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-	}
 }
 
 // Goober5000

code/scripting/api/libs/mission.cpp

@@ -939,14 +939,6 @@ ADE_FUNC(createShip,
 			Script_system.RemHookVars({"Ship", "Parent"});
 		}
 
-		if (Game_mode & GM_IN_MISSION && sip->is_big_or_huge()) {
-			float mission_time = f2fl(Missiontime);
-			int minutes = (int)(mission_time / 60);
-			int seconds = (int)mission_time % 60;
-
-			mprintf(("%s created at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-		}
-
 		return ade_set_args(L, "o", l_Ship.Set(object_h(&Objects[obj_idx])));
 	} else
 		return ade_set_error(L, "o", l_Ship.Set(object_h()));

code/ship/ship.cpp

@@ -8030,27 +8030,16 @@ void ship_cleanup(int shipnum, int cleanup_mode)
 		}
 	}
 
-	if (Ship_info[shipp->ship_info_index].is_big_or_huge()) {
-		float mission_time = f2fl(Missiontime);  
+#ifndef NDEBUG
+	// this isn't posted to the mission log, so log it here
+	if (cleanup_mode == SHIP_VANISHED) {
+		float mission_time = f2fl(Missiontime);
 		int minutes = (int)(mission_time / 60);
 		int seconds = (int)mission_time % 60;
 
-		switch (cleanup_mode) {
-		case SHIP_DESTROYED:
-			mprintf(("%s destroyed at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-			break;
-		case SHIP_DEPARTED:
-		case SHIP_DEPARTED_WARP:
-		case SHIP_DEPARTED_BAY:
-			mprintf(("%s departed at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-			break;
-		case SHIP_VANISHED:
-			mprintf(("%s vanished at %02d:%02d\n", shipp->ship_name, minutes, seconds));
-			break;
-		default:
-			break;
-		}
+		nprintf(("missionlog", "MISSION LOG: %s vanished at %02d:%02d\n", shipp->ship_name, minutes, seconds));
 	}
+#endif
 
 	// update wingman status gauge
 	if ( (shipp->wing_status_wing_index >= 0) && (shipp->wing_status_wing_pos >= 0) ) {