minor

oxygine/src/core/oxygine.cpp

@@ -5,6 +5,7 @@
 #include "res/CreateResourceContext.h"
 #include "res/Resources.h"
 
+
 #include "res/ResBuffer.h"
 #include "res/ResFontBM.h"
 #include "res/ResAtlas.h"
@@ -174,6 +175,11 @@ namespace oxygine
     }
 #endif
 
+    namespace key
+    {
+        void update();
+    }
+
     namespace core
     {
         void focusLost()
@@ -715,6 +721,8 @@ namespace oxygine
 
         bool update()
         {
+            key::update();
+
             timeMS duration = IVideoDriver::_stats.duration;
             IVideoDriver::_stats = IVideoDriver::Stats();
             IVideoDriver::_stats.duration = duration;

oxygine/src/key.cpp

@@ -6,11 +6,30 @@ namespace oxygine
 {
     namespace key
     {
+        int _counter = 0;
+
         const int KEYS = 256;
         unsigned char _keys[KEYS];
 
+        void init()
+        {
+            if (!_counter)
+                memset(_keys, 0, sizeof(_keys));
+
+            _counter++;
+        }
+
+        void release()
+        {
+            _counter--;
+            OX_ASSERT(_counter >= 0);
+        }
+
         void update()
         {
+            if (!_counter)
+                return;
+
             int num = 0;
             const Uint8* data = SDL_GetKeyboardState(&num);
             num = std::min(num, KEYS);
@@ -20,12 +39,14 @@ namespace oxygine
 
         bool wasPressed(keycode k)
         {
+            OX_ASSERT(_counter);
             const Uint8* data = SDL_GetKeyboardState(0);
             return data[k] && !_keys[k];
         }
 
         bool wasReleased(keycode key)
         {
+            OX_ASSERT(_counter);
             const Uint8* data = SDL_GetKeyboardState(0);
             return !data[key] && _keys[key];
         }

oxygine/src/key.h

@@ -5,13 +5,15 @@ namespace oxygine
 {
     namespace key
     {
-        /**should be called before core::update*/
-        void update();
-
         typedef int keycode;
 
+        void init();
+        void release();
+
         bool wasPressed(keycode);
         bool wasReleased(keycode);
+
+        /*could be used without key::init()**/
         bool isPressed(keycode);
     }
 }