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

Removed one error and one warning on the Mac builds

Browse Source
This commit is contained in:
ericwalch 2014-11-07 12:57:08 +01:00
parent 9190b566a9
commit 75360d5501
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/Linux-deps vendored

@ -1 +1 @@
Subproject commit 341a3d978bec1c72d686bd8c0c2099e36a92936f
Subproject commit fd8dcaa0e4dc532ad07cc8eb2df802ed70ec0ddf

2
deps/Windows-deps vendored

@ -1 +1 @@
Subproject commit fa987fe850f078054d1ef226fda4c811991b5284
Subproject commit 617b6557ee4b421805c32db3615611040b5ab212

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

@ -734,7 +734,9 @@ static NSTimeInterval time_last_frame;
else
{
[UNIVERSE addMessage:DESC(@"mouse-off") forCount:3.0];
#if OOLITE_GNUSTEP
[gameView grabMouseInsideGameWindow:NO];
#endif
}
}
if (OOMouseInteractionModeIsFlightMode([gameController mouseInteractionMode]))
@ -754,7 +756,9 @@ static NSTimeInterval time_last_frame;
{
mouse_control_on = NO;
[UNIVERSE addMessage:DESC(@"mouse-off") forCount:3.0];
#if OOLITE_GNUSTEP
[gameView grabMouseInsideGameWindow:NO];
#endif
if (OOMouseInteractionModeIsFlightMode([gameController mouseInteractionMode]))
{

2
src/Core/Universe.m
View File

@ -7218,7 +7218,7 @@ OOINLINE BOOL EntityInRange(HPVector p1, Entity *e2, float range)
}
- (void) setSystemTo:(OOSystemID) s;
- (void) setSystemTo:(OOSystemID) s
{
NSDictionary *systemData;
PlayerEntity *player = PLAYER;