All Projects FSSCP  wxFRED

View Issue Details

Related ChangesetsJump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0002666FSSCPHUDpublic2012-06-16 20:112012-07-02 01:25
ReporterYarn Assigned Toniffiwan  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Platformx64OSWindows 7 
Product Version3.6.14 RC5 
Summary0002666: Background for red-alert "downloading new orders..." message not positioned correctly in custom HUD layouts
DescriptionIf the "downloading new orders..." message appears and a custom HUD layout is being used, the background for that message (but not the text itself) will be positioned and scaled for a 1024x768 HUD, regardless of the current HUD's actual resolution.
Steps To Reproduce1) Make sure that a mod with a widescreen HUD (such as FSPort 3.3 with MediaVPs) is selected and that your game is configured for a widescreen resolution.

2) Play a mission that ends in red alert, such as one of the attached missions.

3) When the "downloading new orders..." message appears, notice where the message background is. It will probably be below and to the right of the message text.
Additional InformationThis problem also occurs in r8892 and RC6.
TagsNo tags attached.

Activities

Yarn

2012-06-16 20:11

developer  

RedAlertTestFSPort.fs2 (3,122 bytes)

Yarn

2012-06-16 20:12

developer  

RedAlertTestFS2.fs2 (3,364 bytes)

Yarn

2012-06-16 20:12

developer  

RedAlert.jpg (19,626 bytes)   
RedAlert.jpg (19,626 bytes)   

niffiwan

2012-06-21 06:44

developer   ~0013687

The attached patch has fixed the issue in my testing with your missions - could you also run some tests and let me know if this fixes it for you as well? Thanks

Yarn

2012-06-21 18:52

developer   ~0013694

Last edited: 2012-06-21 18:53

 I can't get your patch to apply. Could you make another one? I'm applying it as instructed here: http://www.hard-light.net/forums/index.php?topic=74840.msg1479356#msg1479356

niffiwan

2012-06-21 23:17

developer   ~0013697

I think I know what was wrong with the patch - here's a new one.

Yarn

2012-06-22 02:24

developer   ~0013698

I still can't apply your patch. I've applied FSO patches before; is this one supposed to be applied differently? (I'm trying to apply this to revision 8897, by the way.)

niffiwan

2012-06-22 09:20

developer   ~0013699

Sorry about this (one of the pitfalls of using git instead of svn...) - please try this one. If it still doesn't work, please send me a screenshot of the error you get from TortoiseSVN. Oh, and also send me an example of a patch you've applied before so I can figure out what I'm doing wrong :)

Yarn

2012-06-22 17:55

developer  

ApplyError1.png (70,879 bytes)   
ApplyError1.png (70,879 bytes)   

Yarn

2012-06-22 17:55

developer  

ApplyError2.png (44,399 bytes)   
ApplyError2.png (44,399 bytes)   

Yarn

2012-06-22 18:02

developer   ~0013702

Here are the errors that I get. The first error appeared only with your first and third attempts, but the second error appeared with all three.

As for what you're doing wrong, the only thing that I can think of is that you're saving the patch outside the fs2_open folder (or whatever your working folder is); it should be saved inside (but not in the subfolders).

I can't remember exactly what patches I've applied in the past, but the one posted to Mantis 0002657 works for me.

niffiwan

2012-06-22 23:05

developer  

mantis2666.patch (551 bytes)    
Index: code/hud/hud.cpp
===================================================================
--- code/hud/hud.cpp    (revision 8899)
+++ code/hud/hud.cpp    (working copy)
@@ -3383,7 +3383,7 @@ void HudGaugeObjectiveNotify::renderRedAlert()
	// Blit the background
	gr_set_color_fast(&Color_red);		// Color box red, because it's an emergency
 
-	GR_AABITMAP(Objective_display_gauge.first_frame, position[0], position[1]);	
+	renderBitmap(Objective_display_gauge.first_frame, position[0], position[1]);
 
	startFlashNotify();
	if(maybeFlashNotify()) {
mantis2666.patch (551 bytes)   

niffiwan

2012-06-22 23:10

developer   ~0013703

fingers crossed - this one should work. You're right, my patches are made from one level higher than the "fs2_open" directory, my local git repository is a copy of everything at trunk (e.g. includes the fsoinstaller & Launcher) which has been causing me various issues. In this patch I've removed the extra directory from the path in the patch, which is what I did in the 2nd patch, however the 2nd patch had the wrong revision...

Yarn

2012-06-23 00:28

developer   ~0013704

I figured out what the problem was: the patches that you uploaded had spaces instead of tabs in the third and fourth lines. Changing those allowed me to apply the patch.

Anyway, I tested your patch and it worked fine.

niffiwan

2012-06-23 03:02

developer   ~0013706

Fix committed to trunk@8900.

Zacam

2012-07-02 01:25

administrator   ~0013769

Fix committed to fs2_open_3_6_14@8958.

Related Changesets

fs2open: trunk r8900

2012-06-22 23:02

niffiwan


Ported: N/A

Details Diff		 Fix for mantis 0002666: call the new HUD renderBitmap function for the red alert notification background image Affected Issues
0002666
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File

fs2open: fs2_open_3_6_14 r8958

2012-07-01 21:25

Zacam


Ported: N/A

Details Diff		 Backport: Trunk r8900; Fix for mantis 0002666: call the new HUD renderBitmap function for the red alert notification background image Affected Issues
0002666
mod - /branches/fs2_open_3_6_14/code/hud/hud.cpp Diff File

Issue History

Date Modified Username Field Change
2012-06-16 20:11 Yarn New Issue
2012-06-16 20:11 Yarn File Added: RedAlertTestFSPort.fs2
2012-06-16 20:12 Yarn File Added: RedAlertTestFS2.fs2
2012-06-16 20:12 Yarn File Added: RedAlert.jpg
2012-06-21 06:41 niffiwan Assigned To => niffiwan
2012-06-21 06:41 niffiwan Status new => assigned
2012-06-21 06:41 niffiwan File Added: mantis-2666.patch
2012-06-21 06:44 niffiwan Note Added: 0013687
2012-06-21 06:44 niffiwan Status assigned => feedback
2012-06-21 18:52 Yarn Note Added: 0013694
2012-06-21 18:52 Yarn Status feedback => assigned
2012-06-21 18:53 Yarn Note Edited: 0013694
2012-06-21 18:53 Yarn Note Edited: 0013694
2012-06-21 23:15 niffiwan File Deleted: mantis-2666.patch
2012-06-21 23:16 niffiwan File Added: mantis-2666.patch
2012-06-21 23:17 niffiwan Note Added: 0013697
2012-06-21 23:17 niffiwan Status assigned => feedback
2012-06-22 02:24 Yarn Note Added: 0013698
2012-06-22 02:24 Yarn Status feedback => assigned
2012-06-22 09:12 niffiwan File Deleted: mantis-2666.patch
2012-06-22 09:12 niffiwan File Added: mantis2666.patch
2012-06-22 09:20 niffiwan Note Added: 0013699
2012-06-22 09:20 niffiwan Status assigned => feedback
2012-06-22 17:55 Yarn File Added: ApplyError1.png
2012-06-22 17:55 Yarn File Added: ApplyError2.png
2012-06-22 18:02 Yarn Note Added: 0013702
2012-06-22 18:02 Yarn Status feedback => assigned
2012-06-22 22:57 niffiwan File Deleted: mantis2666.patch
2012-06-22 22:58 niffiwan File Added: mantis2666.patch
2012-06-22 23:05 niffiwan File Deleted: mantis2666.patch
2012-06-22 23:05 niffiwan File Added: mantis2666.patch
2012-06-22 23:10 niffiwan Note Added: 0013703
2012-06-22 23:10 niffiwan Status assigned => feedback
2012-06-23 00:28 Yarn Note Added: 0013704
2012-06-23 00:28 Yarn Status feedback => assigned
2012-06-23 03:02 niffiwan Changeset attached => fs2open trunk r8900
2012-06-23 03:02 niffiwan Note Added: 0013706
2012-06-23 03:02 niffiwan Status assigned => resolved
2012-06-23 03:02 niffiwan Resolution open => fixed
2012-07-02 01:25 Zacam Changeset attached => fs2open fs2_open_3_6_14 r8958
2012-07-02 01:25 Zacam Note Added: 0013769