john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

fix double input bug

Browse source
This commit is contained in:
John Alanbrook 2024-09-06 18:51:09 -05:00
parent af79dba48a
commit 67fe729d8c
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/actor.js
View file

@ -29,9 +29,6 @@ globalThis.class_use = function(script, config, base, callback)
if (callback) callback(padawan);
if (typeof config === 'object')
Object.merge(padawan,config);
var script = Resources.replstrs(file);
script = `(function() {
var self = this;
@ -42,6 +39,9 @@ globalThis.class_use = function(script, config, base, callback)
var fn = os.eval(file,script);
fn.call(padawan);
if (typeof config === 'object')
Object.merge(padawan,config);
return padawan;
}

33
scripts/input.js
View file

@ -32,7 +32,6 @@ var mod = {
released
rep
pressed
pressrep
down
*/
@ -83,7 +82,6 @@ prosperon.keydown = function(key, repeat)
mod.shift = 1;
else {
var emacs = modstr() + keyname_extd(key);
player[0].raw_input(emacs, "pressrep");
if (repeat)
player[0].raw_input(emacs, "rep");
else
@ -289,6 +287,11 @@ input.tabcomplete = function(val, list) {
}
/* May be a human player; may be an AI player */
/*
'block' on a pawn's input blocks any input from reaching below for the
*/
var Player = {
players: [],
input(fn, ...args) {
@ -335,19 +338,15 @@ var Player = {
},
raw_input(cmd, state, ...args) {
console.info(cmd + state);
for (var pawn of this.pawns.reversed()) {
if (!pawn.inputs) {
console.error(`pawn no longer has inputs object.`);
continue;
}
if (typeof pawn.inputs.any === 'function') {
pawn.inputs.any(cmd);
if (!pawn.inputs.fallthru)
return;
}
var block = pawn.inputs.block;
if (!pawn.inputs[cmd]) {
if (pawn.inputs.block) return;
continue;
@ -372,17 +371,15 @@ var Player = {
fn = pawn.inputs[cmd];
}
if (typeof fn === 'function') {
if (typeof fn === 'function')
fn.call(pawn, ... args);
if (!pawn.inputs) continue; // TODO: OK? Checking if the call uncontrolled the pawn
pawn.inputs.post?.call(pawn);
}
switch (state) {
case 'released':
pawn.inputs.release_post?.call(pawn);
break;
}
if (!pawn.inputs)
if (block) return;
else continue;
if (state === 'released')
pawn.inputs.release_post?.call(pawn);
if (!pawn.inputs.fallthru) return;
if (pawn.inputs.block) return;