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

Changed more ScanVectorFromString()s to oo_vectorForKey:s. (N.b.: fully backwards compatible.)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4749 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2012-01-21 19:05:12 +00:00
parent bb41b5f075
commit 059c2ceede
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1447,10 +1447,10 @@ static GLfloat sBaseMass = 0.0;
// set view offsets
[self setDefaultViewOffsets];
ScanVectorFromString([shipDict oo_stringForKey:@"view_position_forward"], &forwardViewOffset);
ScanVectorFromString([shipDict oo_stringForKey:@"view_position_aft"], &aftViewOffset);
ScanVectorFromString([shipDict oo_stringForKey:@"view_position_port"], &portViewOffset);
ScanVectorFromString([shipDict oo_stringForKey:@"view_position_starboard"], &starboardViewOffset);
forwardViewOffset = [shipDict oo_vectorForKey:@"view_position_forward" defaultValue:forwardViewOffset];
aftViewOffset = [shipDict oo_vectorForKey:@"view_position_aft" defaultValue:aftViewOffset];
portViewOffset = [shipDict oo_vectorForKey:@"view_position_port" defaultValue:portViewOffset];
starboardViewOffset = [shipDict oo_vectorForKey:@"view_position_starboard" defaultValue:starboardViewOffset];
[self setDefaultCustomViews];

14
src/Core/Entities/ShipEntity.m
View File

@ -369,14 +369,13 @@ static ShipEntity *doOctreesCollide(ShipEntity *prime, ShipEntity *other);
// set weapon offsets
[self setDefaultWeaponOffsets];
ScanVectorFromString([shipDict objectForKey:@"weapon_position_forward"], &forwardWeaponOffset);
ScanVectorFromString([shipDict objectForKey:@"weapon_position_aft"], &aftWeaponOffset);
ScanVectorFromString([shipDict objectForKey:@"weapon_position_port"], &portWeaponOffset);
ScanVectorFromString([shipDict objectForKey:@"weapon_position_starboard"], &starboardWeaponOffset);
forwardWeaponOffset = [shipDict oo_vectorForKey:@"weapon_position_forward" defaultValue:forwardWeaponOffset];
aftWeaponOffset = [shipDict oo_vectorForKey:@"weapon_position_aft" defaultValue:aftWeaponOffset];
portWeaponOffset = [shipDict oo_vectorForKey:@"weapon_position_port" defaultValue:portWeaponOffset];
starboardWeaponOffset = [shipDict oo_vectorForKey:@"weapon_position_starboard" defaultValue:starboardWeaponOffset];
// fuel scoop destination position (where cargo gets sucked into)
tractor_position = kZeroVector;
ScanVectorFromString([shipDict objectForKey:@"scoop_position"], &tractor_position);
tractor_position = [shipDict oo_vectorForKey:@"scoop_position"];
// Get scriptInfo dictionary, containing arbitrary stuff scripts might be interested in.
scriptInfo = [[shipDict oo_dictionaryForKey:@"script_info" defaultValue:nil] retain];
@ -7932,8 +7931,9 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
start.x = 0.0f; // in the middle
start.y = boundingBox.min.y - 4.0f; // 4m below bounding box
start.z = boundingBox.max.z + 1.0f; // 1m ahead of bounding box
// custom launching position
ScanVectorFromString([shipinfoDictionary objectForKey:@"missile_launch_position"], &start);
start = [shipinfoDictionary oo_vectorForKey:@"missile_launch_position" defaultValue:start];
if (start.x == 0.0f && start.y == 0.0f && start.z <= 0.0f) // The kZeroVector as start is illegal also.
{