leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo GCing the actor list

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-12 20:36:11 -06:00
parent 5ccaad4666
commit afa132bd4c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/game.js
View File

@ -356,16 +356,16 @@ export class Level {
if (actor.animation_speed) { if (actor.animation_speed) {
// Deal with movement animation // Deal with movement animation
actor.animation_progress += 1; this._set_prop(actor, 'animation_progress', actor.animation_progress + 1);
if (actor.animation_progress >= actor.animation_speed) { if (actor.animation_progress >= actor.animation_speed) {
if (actor.type.ttl) { if (actor.type.ttl) {
// This is purely an animation so it disappears once it's played // This is purely an animation so it disappears once it's played
this.remove_tile(actor); this.remove_tile(actor);
continue; continue;
} }
actor.previous_cell = null; this._set_prop(actor, 'previous_cell', null);
actor.animation_progress = null; this._set_prop(actor, 'animation_progress', null);
actor.animation_speed = null; this._set_prop(actor, 'animation_speed', null);
if (! this.compat.tiles_react_instantly) { if (! this.compat.tiles_react_instantly) {
this.step_on_cell(actor); this.step_on_cell(actor);
} }
@ -544,6 +544,7 @@ export class Level {
} }
// Strip out any destroyed actors from the acting order // Strip out any destroyed actors from the acting order
// FIXME this is O(n), where n is /usually/ small, but i still don't love it
let p = 0; let p = 0;
for (let i = 0, l = this.actors.length; i < l; i++) { for (let i = 0, l = this.actors.length; i < l; i++) {
let actor = this.actors[i]; let actor = this.actors[i];
@ -553,6 +554,10 @@ export class Level {
} }
p++; p++;
} }
else {
let local_p = p;
this.pending_undo.push(() => this.actors.splice(local_p, 0, actor));
}
} }
this.actors.length = p; this.actors.length = p;

1
js/tileset.js
View File

@ -549,6 +549,7 @@ export class Tileset {
w, h); w, h);
} }
else { else {
if (!coords) console.error(name, tile);
this.blit(ctx, coords[0], coords[1], x, y); this.blit(ctx, coords[0], coords[1], x, y);
} }