Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add MFD to small HUD, make MFDs work after loading game

Browse Source
This commit is contained in:
cim 2013-10-09 17:53:19 +01:00
parent 3cea6eb1d4
commit d817df2576
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Resources/Config/hud-small.plist
View File

@ -250,6 +250,15 @@
width = 8; width = 8;
} }
); );
multi_function_displays = (
{
width = 174;
height = 134;
x = -100;
y = -72;
y_origin = 1;
}
);
message_gui = { message_gui = {
width = 216; width = 216;
height = 112; height = 112;

1
Resources/Config/hud.plist
View File

@ -322,7 +322,6 @@
x = -156; x = -156;
y = -72; y = -72;
y_origin = 1; y_origin = 1;
mfd_number = 0;
}, },
{ {
width = 216; width = 216;

26
src/Core/Entities/PlayerEntity.m
View File

@ -867,6 +867,14 @@ static GLfloat sBaseMass = 0.0;
{ {
NSUInteger i; NSUInteger i;
// multi-function displays
// must be reset before ship setup
[multiFunctionDisplayText release];
multiFunctionDisplayText = [[NSMutableDictionary alloc] init];
[multiFunctionDisplaySettings release];
multiFunctionDisplaySettings = [[NSMutableArray alloc] init];
[[UNIVERSE gameView] resetTypedString]; [[UNIVERSE gameView] resetTypedString];
// Required keys // Required keys
@ -1196,14 +1204,6 @@ static GLfloat sBaseMass = 0.0;
[UNIVERSE addCommsMessage:[savedCommLog objectAtIndex:i] forCount:0 andShowComms:NO logOnly:YES]; [UNIVERSE addCommsMessage:[savedCommLog objectAtIndex:i] forCount:0 andShowComms:NO logOnly:YES];
} }
// multi-function displays
[multiFunctionDisplayText release];
multiFunctionDisplayText = [[NSMutableDictionary alloc] init];
[multiFunctionDisplaySettings release];
multiFunctionDisplaySettings = [[NSMutableArray alloc] init];
/* entity_personality for scripts and shaders. If undefined, we fall back /* entity_personality for scripts and shaders. If undefined, we fall back
to old behaviour of using a random value each time game is loaded (set to old behaviour of using a random value each time game is loaded (set
up in -setUp). Saving of entity_personality was added in 1.74. up in -setUp). Saving of entity_personality was added in 1.74.
@ -1481,16 +1481,16 @@ static GLfloat sBaseMass = 0.0;
[UNIVERSE setAutoCommLog:YES]; [UNIVERSE setAutoCommLog:YES];
[UNIVERSE setPermanentCommLog:NO]; [UNIVERSE setPermanentCommLog:NO];
[self switchHudTo:@"hud.plist"];
scanner_zoom_rate = 0.0f;
longRangeChartMode = OOLRC_MODE_NORMAL;
[multiFunctionDisplayText release]; [multiFunctionDisplayText release];
multiFunctionDisplayText = [[NSMutableDictionary alloc] init]; multiFunctionDisplayText = [[NSMutableDictionary alloc] init];
[multiFunctionDisplaySettings release]; [multiFunctionDisplaySettings release];
multiFunctionDisplaySettings = [[NSMutableArray alloc] init]; multiFunctionDisplaySettings = [[NSMutableArray alloc] init];
[self switchHudTo:@"hud.plist"];
scanner_zoom_rate = 0.0f;
longRangeChartMode = OOLRC_MODE_NORMAL;
[mission_variables release]; [mission_variables release];
mission_variables = [[NSMutableDictionary alloc] init]; mission_variables = [[NSMutableDictionary alloc] init];