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

Fixed damaged equipment displayin incorrectly on non 4:3 screen resolutions.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@977 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2007-05-21 07:41:18 +00:00
parent 55f832da66
commit 0a3c5fcf79
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/GuiDisplayGen.h
View File

@ -181,7 +181,7 @@ extern int debug;
- (void) drawStarChart:(GLfloat)x :(GLfloat)y :(GLfloat)z :(GLfloat) alpha;
- (void) drawGalaxyChart:(GLfloat)x :(GLfloat)y :(GLfloat)z :(GLfloat) alpha;
- (void) drawEqptList: (NSArray *)eqptList;
- (void) drawEqptList: (NSArray *)eqptList :(GLfloat)z;
- (void) drawAdvancedNavArrayAtX:(float)x y:(float)y z:(float)z alpha:(float)alpha;

12
src/Core/GuiDisplayGen.m
View File

@ -682,7 +682,7 @@ MA 02110-1301, USA.
}
- (void) drawEqptList: (NSArray *)eqptList
- (void) drawEqptList: (NSArray *)eqptList :(GLfloat)z
{
int eqpt_items_per_column = 12; // Default value.
int i;
@ -716,11 +716,11 @@ MA 02110-1301, USA.
if (i < eqpt_items_per_column)
{
drawString ([eqptList objectAtIndex:i], -220, 40 - (15 * i), 640, NSMakeSize(15,15));
drawString ([eqptList objectAtIndex:i], -220, 40 - (15 * i), z, NSMakeSize(15,15));
}
else
{
drawString ([eqptList objectAtIndex:i], 50, 40 - (15 * (i - eqpt_items_per_column)), 640, NSMakeSize(15,15));
drawString ([eqptList objectAtIndex:i], 50, 40 - (15 * (i - eqpt_items_per_column)), z, NSMakeSize(15,15));
}
glColor4f (1.0, 1.0, 0.0, 1.0); // Reset text color to yellow.
}
@ -748,7 +748,7 @@ MA 02110-1301, USA.
}
if ([player gui_screen] == GUI_SCREEN_STATUS)
{
[self drawEqptList:[player equipmentList]];
[self drawEqptList:[player equipmentList] :z1];
}
}
@ -823,7 +823,7 @@ MA 02110-1301, USA.
}
if ([player gui_screen] == GUI_SCREEN_STATUS)
{
[self drawEqptList:[player equipmentList]];
[self drawEqptList:[player equipmentList] :z1];
}
}
@ -896,7 +896,7 @@ MA 02110-1301, USA.
}
if ([player gui_screen] == GUI_SCREEN_STATUS)
{
[self drawEqptList:[player equipmentList]];
[self drawEqptList:[player equipmentList] :z];
}
}