Fix error in multi-paging of manifest screen with lots of parcel contracts.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5430 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Chris Morris 2012-10-16 20:58:04 +00:00
parent ea664c901c
commit 1124895630
2 changed files with 3 additions and 2 deletions

View File

@ -88,7 +88,6 @@ MA 02110-1301, USA.
self = nil;
}
collisionTestFilter = NO;
_haveExecutedSpawnAction = NO;
return self;
@ -107,6 +106,8 @@ MA 02110-1301, USA.
orientation = kIdentityQuaternion;
rotMatrix = kIdentityMatrix;
collision_radius = 0;
NSString *modelName = [effectDict oo_stringForKey:@"model"];
if (modelName != nil)
{

View File

@ -1342,7 +1342,7 @@ static NSString * const kOOLogNoteShowShipyardModel = @"script.debug.note.showSh
NSInteger page_offset = 0;
BOOL multi_page = NO;
NSUInteger total_rows = cargoRowCount + [passengerManifest count] + [contractManifest count] + [missionsManifest count] + 4;
NSUInteger total_rows = cargoRowCount + [passengerManifest count] + [contractManifest count] + [missionsManifest count] + [parcelManifest count] + 5;
if (total_rows > max_rows)
{
max_rows -= 2;