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

Last-minute change: changing misspelled event handler playerTargettedMissile() to playerTargetedMissile(), and related spelling fixes in code.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2321 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-08-29 17:05:36 +00:00
parent ce6b8d3c21
commit efca253270
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oolite.xcodeproj/project.pbxproj
View File

@ -1061,7 +1061,7 @@
083325DC09DDBCDE00F5B8E4 /* OOColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOColor.m; sourceTree = "<group>"; };
083DB4D30A70E51E00B419B2 /* OOBrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOBrain.h; sourceTree = "<group>"; };
083DB4D40A70E51E00B419B2 /* OOBrain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOBrain.m; sourceTree = "<group>"; };
0865432206B8447D000CA0AB /* OoliteDev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OoliteDev.app; sourceTree = BUILT_PRODUCTS_DIR; };
0865432206B8447D000CA0AB /* Oolite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Oolite.app; sourceTree = BUILT_PRODUCTS_DIR; };
0878FD2F086EF845004CB752 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
1A020E0A0D020AFB00C3F51E /* changedScriptHandlers.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = changedScriptHandlers.plist; sourceTree = "<group>"; };
@ -1767,7 +1767,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
0865432206B8447D000CA0AB /* OoliteDev.app */,
0865432206B8447D000CA0AB /* Oolite.app */,
1A71E6F30BCE340C00CD5C13 /* libpng.a */,
);
name = Products;
@ -3034,7 +3034,7 @@
name = Oolite;
productInstallPath = "$(HOME)/Applications";
productName = Oolite;
productReference = 0865432206B8447D000CA0AB /* OoliteDev.app */;
productReference = 0865432206B8447D000CA0AB /* Oolite.app */;
productType = "com.apple.product-type.application";
};
1A71E6F20BCE340C00CD5C13 /* libpng-custom */ = {

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

@ -2011,7 +2011,7 @@ static PlayerEntity *sSharedPlayer = nil;
(ident_engaged || missile_status != MISSILE_STATUS_SAFE) &&
([self status] == STATUS_IN_FLIGHT || [self status] == STATUS_WITCHSPACE_COUNTDOWN))
{
Entity *target = [UNIVERSE getFirstEntityTargettedByPlayer];
Entity *target = [UNIVERSE getFirstEntityTargetedByPlayer];
if ([self isValidTarget:target])
{
[self addTarget:target];
@ -6524,7 +6524,7 @@ static int last_outfitting_index;
{
int i = 0;
BOOL foundSlot = NO;
// if targetted previously use that memory space
// if targeted previously use that memory space
for (i = 0; i < PLAYER_TARGET_MEMORY_SIZE; i++)
{
if (primaryTarget == target_memory[i])

2
src/Core/Entities/PlayerEntityLegacyScriptEngine.m
View File

@ -2656,7 +2656,7 @@ static int scriptRandomSeed = -1; // ensure proper random function
missile_status = MISSILE_STATUS_TARGET_LOCKED;
[self addTarget:ent];
}
[self doScriptEvent:@"playerTargettedMissile" withArgument:ent];
[self doScriptEvent:@"playerTargetedMissile" withArgument:ent];
}
#endif

2
src/Core/HeadUpDisplay.m
View File

@ -2253,7 +2253,7 @@ static void hudDrawReticleOnTarget(Entity* target, PlayerEntity* player1, GLfloa
#endif
{
// If reticle is target sensitive, draw target box in red when target passes through crosshairs.
if (reticleTargetSensitive && [UNIVERSE getFirstEntityTargettedByPlayer] == [player1 primaryTarget])
if (reticleTargetSensitive && [UNIVERSE getFirstEntityTargetedByPlayer] == [player1 primaryTarget])
{
GLColorWithOverallAlpha(red_color, overallAlpha);
}

2
src/Core/Universe.h
View File

@ -390,7 +390,7 @@ enum
- (Vector) getSafeVectorFromEntity:(Entity *) e1 toDistance:(double)dist fromPoint:(Vector) p2;
- (OOUniversalID) getFirstEntityHitByLaserFromEntity:(ShipEntity *)srcEntity inView:(OOViewID)viewdir offset:(Vector)offset rangeFound:(GLfloat*)range_ptr;
- (Entity *) getFirstEntityTargettedByPlayer;
- (Entity *) getFirstEntityTargetedByPlayer;
- (NSArray *) getEntitiesWithinRange:(double)range ofEntity:(Entity *)entity;
- (unsigned) countShipsWithRole:(NSString *)role inRange:(double)range ofEntity:(Entity *)entity;

2
src/Core/Universe.m
View File

@ -4611,7 +4611,7 @@ static BOOL MaintainLinkedLists(Universe* uni)
}
- (Entity *)getFirstEntityTargettedByPlayer
- (Entity *)getFirstEntityTargetedByPlayer
{
PlayerEntity *player = [PlayerEntity sharedPlayer];
Entity *hit_entity = nil;