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

restoring one line in trackDestination that gave problems with the player using docking computer

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3747 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2010-09-07 18:25:08 +00:00
parent 929fb9f2c0
commit 1eddd475cf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Oolite.xcodeproj/project.pbxproj
View File

@ -3840,6 +3840,7 @@
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DLOADSAVEGUIXX"; OTHER_CFLAGS = "-DLOADSAVEGUIXX";
PRODUCT_NAME = Oolite; PRODUCT_NAME = Oolite;
SDKROOT = macosx10.5;
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\""; USER_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\"";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
@ -3918,7 +3919,7 @@
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\""; HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\"";
MACOSX_DEPLOYMENT_TARGET = 10.4; MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DLOADSAVEGUI"; OTHER_CFLAGS = "-DLOADSAVEGUI";
SDKROOT = macosx10.4; SDKROOT = macosx10.5;
}; };
name = Debug; name = Debug;
}; };
@ -3934,7 +3935,7 @@
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\""; HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\"";
MACOSX_DEPLOYMENT_TARGET = 10.4; MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DLOADSAVEGUI"; OTHER_CFLAGS = "-DLOADSAVEGUI";
SDKROOT = macosx10.4; SDKROOT = macosx10.5;
"SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; "SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
}; };
name = Deployment; name = Deployment;
@ -4016,7 +4017,7 @@
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\""; HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\"";
MACOSX_DEPLOYMENT_TARGET = 10.4; MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DLOADSAVEGUI"; OTHER_CFLAGS = "-DLOADSAVEGUI";
SDKROOT = macosx10.4; SDKROOT = macosx10.5;
}; };
name = TestRelease; name = TestRelease;
}; };
@ -4032,11 +4033,16 @@
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = PNG_USER_CONFIG; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = PNG_USER_CONFIG;
GCC_VERSION = "";
"GCC_VERSION[sdk=macosx*][arch=*]" = 4.0;
GENERATE_MASTER_OBJECT_FILE = YES; GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/src/Core/Materials/\""; HEADER_SEARCH_PATHS = "\"$(SRCROOT)/src/Core/Materials/\"";
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO; PREBINDING = NO;
PRODUCT_NAME = png_for_oolite; PRODUCT_NAME = png_for_oolite;
SDKROOT = macosx10.5;
}; };
name = Debug; name = Debug;
}; };

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

@ -7033,7 +7033,7 @@ BOOL class_masslocks(int some_class)
} }
// check if we are flying toward (or away from) the destination.. // check if we are flying toward (or away from) the destination..
if (reverse * d_forward < max_cos) // not on course so we must adjust controls.. if ((d_forward < max_cos)||(retreat)) // not on course so we must adjust controls..
{ {
if (d_forward <= -max_cos) // hack to avoid just flying away from the destination if (d_forward <= -max_cos) // hack to avoid just flying away from the destination