Moved ConVar related files to engine
This commit is contained in:
parent
4fe14e341c
commit
07fa2e7868
@ -1,4 +1,4 @@
|
||||
package game.ui;
|
||||
package engine;
|
||||
|
||||
|
||||
typedef CVar = {
|
||||
@ -1,4 +1,4 @@
|
||||
package game.ui;
|
||||
package engine;
|
||||
|
||||
enum CVarType {
|
||||
CInt;
|
||||
@ -1,4 +1,4 @@
|
||||
package game.ui;
|
||||
package engine;
|
||||
|
||||
import haxe.Constraints.Function;
|
||||
import engine.typedefs.CVar;
|
||||
@ -7,7 +7,7 @@ import openfl.display.Sprite;
|
||||
import openfl.events.Event;
|
||||
import assets.Scanner;
|
||||
import assets.HTex;
|
||||
import game.ui.ConVar;
|
||||
import engine.ConVar;
|
||||
import game.ui.console.Console;
|
||||
|
||||
class Game
|
||||
@ -41,20 +41,9 @@ class Game
|
||||
uiLayer = new Sprite();
|
||||
stage.addChild(gameLayer);
|
||||
stage.addChild(uiLayer);
|
||||
//player.graphics.lineStyle(2,0xFF0000);
|
||||
//player.graphics.drawRect(0,0,16,16);
|
||||
// var bitmapData:BitmapData = Assets.getBitmapData("textures/sprites/character.png");
|
||||
//player = new Player();
|
||||
//gameLayer.addChild(player.sprite);
|
||||
uiLayer.addChild(console);
|
||||
var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
|
||||
//var sheet:SpriteSheet = new SpriteSheet(sheetData);
|
||||
//var playerBitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile5"]);
|
||||
//var someotherbitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile3"]);
|
||||
//playerBitmap.scaleX = playerBitmap.scaleY = 10;
|
||||
//player.addChild(playerBitmap);
|
||||
//TextureData.parseConfig();
|
||||
//Sys.
|
||||
//var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
|
||||
|
||||
}
|
||||
public function onEnterFrame(e:Event):Void
|
||||
{
|
||||
|
||||
@ -10,7 +10,7 @@ import openfl.ui.Keyboard in Kb;
|
||||
import openfl.Lib;
|
||||
import engine.enums.CVarType;
|
||||
import engine.typedefs.CVar;
|
||||
import game.ui.ConVar;
|
||||
import engine.ConVar;
|
||||
|
||||
class Input{
|
||||
public static var keys:Map<Int,Bool> = [];
|
||||
@ -58,9 +58,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]],"+","-"));
|
||||
}
|
||||
}
|
||||
keys[e.keyCode] = false;
|
||||
}
|
||||
// public static function resolveKeyName(key:Int):String
|
||||
@ -112,6 +114,12 @@ class Input{
|
||||
if (keys[Kb.DOWN] && !keysLast[Kb.DOWN]){
|
||||
Console.histNext();
|
||||
}
|
||||
|
||||
}
|
||||
if(Console.consoleInstance.visible){
|
||||
if (keys[Kb.ESCAPE]){
|
||||
Console.toggle();
|
||||
}
|
||||
}
|
||||
keysLast = keys.copy();
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ import openfl.Assets;
|
||||
import openfl.text.TextFormat;
|
||||
import openfl.text.TextFieldType;
|
||||
import engine.typedefs.CVar;
|
||||
import game.ui.ConVar;
|
||||
import engine.ConVar;
|
||||
import engine.typedefs.CCmd;
|
||||
import game.ui.console.elements.ConsoleInput;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package game.video;
|
||||
|
||||
import game.ui.ConVar;
|
||||
import engine.ConVar;
|
||||
import openfl.Lib;
|
||||
import openfl.display.StageDisplayState;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user