gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

​

Browse Source
This commit is contained in:
Yoshman29
2023-02-18 15:09:21 +01:00
parent a67ce3e425
commit da6296e587
8 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/game/PlayState.hx
+1 -3
View File
@@ -1422,14 +1422,12 @@ class PlayState extends MusicBeatState
__pressed.clear();
__justPressed.clear();
__justReleased.clear();
// TODO: player identifier in event
__pressed.pushGroup(p.controls.NOTE_LEFT, p.controls.NOTE_DOWN, p.controls.NOTE_UP, p.controls.NOTE_RIGHT);
__justPressed.pushGroup(p.controls.NOTE_LEFT_P, p.controls.NOTE_DOWN_P, p.controls.NOTE_UP_P, p.controls.NOTE_RIGHT_P);
__justReleased.pushGroup(p.controls.NOTE_LEFT_R, p.controls.NOTE_DOWN_R, p.controls.NOTE_UP_R, p.controls.NOTE_RIGHT_R);
var event = scripts.event("onKeyShit", EventManager.get(InputSystemEvent).recycle(__pressed, __justPressed, __justReleased));
var event = scripts.event("onKeyShit", EventManager.get(InputSystemEvent).recycle(__pressed, __justPressed, __justReleased, p, id));
if (event.cancelled) return;
__pressed = CoolUtil.getDefault(event.pressed, []);
source/funkin/game/Stage.hx
+1 -4
View File
@@ -64,7 +64,6 @@ class Stage extends FlxBasic implements IBeatReceiver {
state.add(spr);
spr;
case "box":
trace('HOLY FUCK BOX DETECTED'); // TODO: someone help this aint doing shit!! >:(
if ( !node.has.name || !node.has.width || !node.has.height) continue;
var spr = new FlxSprite(
@@ -73,11 +72,9 @@ class Stage extends FlxBasic implements IBeatReceiver {
).makeGraphic(
Std.parseInt(node.att.width),
Std.parseInt(node.att.height),
(node.has.color) ? Std.parseInt(node.att.color) : 0xFFFFFFFF
(node.has.color) ? CoolUtil.getColorFromDynamic(node.att.color) : 0xFFFFFFFF
);
trace(node.att.name, node.att.width, node.att.height);
stageSprites.set(node.getAtt("name"), spr);
state.add(spr);
spr;