Bläddra i källkod

Merge pull request #473 from kwhatmough/next

File rename and menu fix for Mac
Sean Paul Taylor 13 år sedan
förälder
incheckning
3d0c8e62b5
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      gameplay/src/PhysicsVehicleWheel.h
  2. 1 1
      gameplay/src/PlatformMacOSX.mm

+ 1 - 1
gameplay/src/PhysicsVehicleWheel.h

@@ -22,7 +22,7 @@ class PhysicsVehicle;
         type                     = VEHICLE_WHEEL
         type                     = VEHICLE_WHEEL
 
 
         steerable                = <bool>                // indicates whether wheel is steerable
         steerable                = <bool>                // indicates whether wheel is steerable
-        wheelDirection           = <float, float, float> // direction strut extension, in chassis space
+        wheelDirection           = <float, float, float> // direction of strut extension, in chassis space
         wheelAxle                = <float, float, float> // direction of axle (spin axis), in chassis space
         wheelAxle                = <float, float, float> // direction of axle (spin axis), in chassis space
         strutConnectionOffset    = <float, float, float> // offset from default strut connection point
         strutConnectionOffset    = <float, float, float> // offset from default strut connection point
         strutRestLength          = <float>               // strut rest length
         strutRestLength          = <float>               // strut rest length

+ 1 - 1
gameplay/src/PlatformMacOSX.mm

@@ -659,7 +659,7 @@ double getMachTimeInMilliseconds()
 
 
     [[self openGLContext] makeCurrentContext];
     [[self openGLContext] makeCurrentContext];
     CGLLockContext((CGLContextObj)[[self openGLContext] CGLContextObj]);
     CGLLockContext((CGLContextObj)[[self openGLContext] CGLContextObj]);
-    if (_game && _game->getState() == Game::RUNNING)
+    if (_game)
     {
     {
         _game->frame();
         _game->frame();
     }
     }