Skip to content

Commit bef83f8

Browse files
committed
Step one, kill the bad function
1 parent d6acfe9 commit bef83f8

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/Map.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,11 +916,6 @@ Map.prototype = {
916916
this._maybeAddEntityTexture(data, false, filename);
917917
},
918918

919-
maybeAddEntityTexture(data, entity) {
920-
alert('KILL THIS, USE _maybeAddEntityTexture');
921-
this._maybeAddEntityTexture(data, entity);
922-
},
923-
924919
_maybeAddEntityTexture(data, entity, filename) {
925920
try {
926921
let imageFilename = '';

src/js/ui/EntityPalette.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ const setup_template = (ent, id) => {
474474
if (ent) {
475475
oldData = get_entity_data(ent.filename);
476476
oldEnt = ent;
477-
window.$$$currentMap.maybeAddEntityTexture(data, ent);
477+
window.$$$currentMap._maybeAddEntityTexture(data, ent, ent.filename);
478478
} else {
479479
// TODO: is this used?
480480
window.$$$currentMap.maybeAddEntityTextureFromFilename(data, path);
@@ -690,6 +690,7 @@ function _entity_click(evt, id) {
690690
Cancel: function() {
691691
if (hasDirtyArt) {
692692
// / put it back!
693+
alert('This will blow up yell at grue.');
693694
window.$$$currentMap.maybeAddEntityTexture(oldData, oldEnt);
694695
oldData = null;
695696
oldEnt = null;

0 commit comments

Comments
 (0)