Преглед изворни кода

Merge pull request #463 from blackberry/next

Next
Sean Paul Taylor пре 13 година
родитељ
комит
4519a02449
2 измењених фајлова са 7 додато и 1 уклоњено
  1. 4 1
      gameplay/src/PlatformMacOSX.mm
  2. 3 0
      gameplay/src/gameplay-main-macosx.mm

+ 4 - 1
gameplay/src/PlatformMacOSX.mm

@@ -566,7 +566,10 @@ int getKey(unsigned short keyCode, unsigned int modifierFlags)
 
 
 - (void) keyDown: (NSEvent*) event
 - (void) keyDown: (NSEvent*) event
 {    
 {    
-    gameplay::Platform::keyEventInternal(Keyboard::KEY_PRESS, getKey([event keyCode], [event modifierFlags]));
+    if([event isARepeat] == NO)
+    {
+        gameplay::Platform::keyEventInternal(Keyboard::KEY_PRESS, getKey([event keyCode], [event modifierFlags]));
+    }
 }
 }
 
 
 - (void) keyUp: (NSEvent*) event
 - (void) keyUp: (NSEvent*) event

+ 3 - 0
gameplay/src/gameplay-main-macosx.mm

@@ -1,5 +1,6 @@
 #ifdef __APPLE__
 #ifdef __APPLE__
 
 
+#import <Foundation/Foundation.h>
 #include "gameplay.h"
 #include "gameplay.h"
 
 
 using namespace gameplay;
 using namespace gameplay;
@@ -9,11 +10,13 @@ using namespace gameplay;
  */
  */
 int main(int argc, char** argv)
 int main(int argc, char** argv)
 {
 {
+    NSAutoreleasePool *p = [[NSAutoreleasePool alloc] init];
     Game* game = Game::getInstance();
     Game* game = Game::getInstance();
     Platform* platform = Platform::create(game);
     Platform* platform = Platform::create(game);
     GP_ASSERT(platform);
     GP_ASSERT(platform);
     int result = platform->enterMessagePump();
     int result = platform->enterMessagePump();
 	delete platform;
 	delete platform;
+    [p release];
     return result;
     return result;
 }
 }