View Issue Details

IDProjectCategoryView StatusLast Update
0002133FSSCPHUDpublic2010-04-19 19:01
ReporterThe_E Assigned ToZacam  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version3.6.11 
Summary0002133: "Monitoring" string in escort list does not display (3.6.12 RC 1)
DescriptionAs the summary says. The "Monitoring" has somehow disappeared from the Escort list.



The attached patch is a stopgap measure only, it reenables the old functions and circumvents the new system.
TagsNo tags attached.

Activities

2010-02-20 18:36

 

escortlist.patch (1,004 bytes)   
Index: code/hud/hudescort.cpp
===================================================================
--- code/hud/hudescort.cpp	(revision 5925)
+++ code/hud/hudescort.cpp	(working copy)
@@ -114,7 +114,7 @@
 		{865, 354},
 		{865, 365}
 	}
-};
+};*/
 
 // monitoring text coords
 int Monitoring_coords[GR_NUM_RESOLUTIONS][2] = {
@@ -125,7 +125,7 @@
 		869, 331
 	}
 };
-	
+/*
 char *Escort_gauge_filenames[GR_NUM_RESOLUTIONS][MAX_ESCORT_SHIPS] = 
 {
 //XSTR:OFF
@@ -690,7 +690,7 @@
 
 	// draw the top of the escort view
 	GR_AABITMAP(Escort_gauges[0].first_frame, current_hud->Escort_coords[0], current_hud->Escort_coords[1]);	
-	gr_string(current_hud->Escort_htext_coords[0], current_hud->Escort_htext_coords[1], current_hud->Escort_htext);
+	gr_string(Monitoring_coords[gr_screen.res][0], Monitoring_coords[gr_screen.res][1], current_hud->Escort_htext);
 
 	int x = current_hud->Escort_coords[0] + current_hud->Escort_list[0];
 	int y = current_hud->Escort_coords[1] + current_hud->Escort_list[1];
escortlist.patch (1,004 bytes)   

Zacam

2010-02-20 19:56

administrator   ~0011706

Going to try to track back to where this took place, because it shouldn't be happening. If all else fails, will implement The_E's fix.

2010-02-20 22:24

 

M2133_Monitoring.patch (1,154 bytes)   
Index: hudparse.cpp
===================================================================
--- hudparse.cpp	(revision 5930)
+++ hudparse.cpp	(working copy)
@@ -57,7 +57,7 @@
 	{ &gauges[2],	HUD_VAR(Hud_mini_1digit),		"$Text 1 digit:",			316, 298, 511, 477,	0, 0, 0, 0, 0, 0, 0, HG_NOADD, -1 },
 //	{ &gauges[2],	HUD_VAR(Hud_mini_2digit),		"$Text 2 digit:",			213, 298, 346, 477,	0, 0, 0, 0, 0, 0, 0, HG_NOADD, -1 },
 	{ &gauges[2],	HUD_VAR(Hud_mini_2digit),		"$Text 2 digit:",			313, 298, 506, 477,	0, 0, 0, 0, 0, 0, 0, HG_NOADD, -1 },
-	{ &gauges[6],	HUD_VAR(Escort_htext_coords),	"$Header Text:",			3,  2, 4,  1,	    0, 0, 0, 0, 0, 0, 0, 0,        -1 },
+	{ &gauges[6],	HUD_VAR(Escort_htext_coords),	"$Header Text:",			489, 208, 869, 331, 0, 0, 0, 0, 0, 0, 0, -1, -1 },
 	{ &gauges[6],	HUD_VAR(Escort_list),			"$List:",					0, 12, 0, 13,		0, 0, 0, 0, 0, 0, 0, HG_NOADD, -1 },
 	{ &gauges[6],	HUD_VAR(Escort_entry),			"$Ship:",					0, 11, 0, 11,		0, HUD_VAR(Escort_filename[1]), 0, 0, 0, 0, 0, HG_NOADD, -1 },
 	{ &gauges[6],	HUD_VAR(Escort_entry_last),		"$Last Ship:",				0, 11, 0, 11,		0, HUD_VAR(Escort_filename[2]), 0, 0, 0, 0, 0, HG_NOADD, -1 },
M2133_Monitoring.patch (1,154 bytes)   

Zacam

2010-02-20 22:25

administrator   ~0011707

Last edited: 2010-02-20 22:26

Attached M2133_Monitoring.patch committed to Trunk r5931.

The_E

2010-04-19 19:00

administrator   ~0011895

Closing as solved.

Issue History

Date Modified Username Field Change
2010-02-20 18:36 The_E New Issue
2010-02-20 18:36 The_E File Added: escortlist.patch
2010-02-20 19:55 Zacam Status new => assigned
2010-02-20 19:55 Zacam Assigned To => Zacam
2010-02-20 19:56 Zacam Note Added: 0011706
2010-02-20 19:56 Zacam Status assigned => confirmed
2010-02-20 22:24 Zacam File Added: M2133_Monitoring.patch
2010-02-20 22:25 Zacam Note Added: 0011707
2010-02-20 22:26 Zacam Note Edited: 0011707
2010-04-19 19:00 The_E Note Added: 0011895
2010-04-19 19:01 The_E Status confirmed => resolved
2010-04-19 19:01 The_E Resolution open => fixed