Moved and added a bunch of stuff

hGameTest/src/game/Input.hx

@@ -1,17 +1,19 @@
 package game;
 
 import openfl.text.TextField;
-import engine.enums.CVarFlag;
-import engine.typedefs.CCmd;
-import game.ui.console.Console;
-import game.video.Mode;
 import openfl.events.KeyboardEvent;
 import openfl.ui.Keyboard in Kb;
 import openfl.Lib;
-import engine.enums.CVarType;
-import engine.typedefs.CVar;
+
+import engine.enums.console.CVarFlag;
+import engine.enums.console.CVarType;
+import engine.typedefs.console.CCmd;
+import engine.typedefs.console.CVar;
 import engine.ConVar;
 
+import game.ui.console.Console;
+import game.video.Mode;
+
 class Input{
     public static var keys:Map<Int,Bool> = [];
     public static var keysLast:Map<Int,Bool> = [];
@@ -44,7 +46,9 @@ class Input{
     });
     public static function onKeyIsDown(e:KeyboardEvent){
         if(!Std.isOfType(Lib.current.stage.focus,TextField)){
-            Console.consoleInstance.parseCmd(bindMap[keyNameMap[e.keyCode]]);
+            // Check if not null so we don't end up cooming all over unallocated memory;
+            if(bindMap[keyNameMap[e.keyCode]] != null)
+                Console.consoleInstance.parseCmd(bindMap[keyNameMap[e.keyCode]]);
         }
         if(!keys[e.keyCode]){
             if(cv_debugKeys.value == 1)
@@ -59,8 +63,11 @@ class Input{
     }
     public static function onKeyIsUp(e:KeyboardEvent){
         if(!Std.isOfType(Lib.current.stage.focus,TextField)){
-            if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
-                Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
+            // Make sure we're not checking a null value (this can cause a crash)
+            if(bindMap[keyNameMap[e.keyCode]] != null){
+                if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
+                    Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
+                }
             }
         }
         keys[e.keyCode] = false;