pull/3/merge
Jens Mönig 2015-04-15 17:30:43 +02:00
rodzic db01489a49
commit 834b3918ad
2 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -2484,3 +2484,4 @@ ______
150415 150415
------ ------
* Threads: flush Stage>>keysPressed when prompting the user * Threads: flush Stage>>keysPressed when prompting the user
* Objects: fixed #770

Wyświetl plik

@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.objects = '2015-February-28'; modules.objects = '2015-April-15';
var SpriteMorph; var SpriteMorph;
var StageMorph; var StageMorph;
@ -3081,7 +3081,7 @@ SpriteMorph.prototype.setEffect = function (effect, value) {
if (eff === 'ghost') { if (eff === 'ghost') {
this.alpha = 1 - Math.min(Math.max(+value || 0, 0), 100) / 100; this.alpha = 1 - Math.min(Math.max(+value || 0, 0), 100) / 100;
} else { } else {
this.graphicsValues[eff] = value; this.graphicsValues[eff] = +value;
} }
this.drawNew(); this.drawNew();
this.changed(); this.changed();
@ -3096,7 +3096,7 @@ SpriteMorph.prototype.changeEffect = function (effect, value) {
if (eff === 'ghost') { if (eff === 'ghost') {
this.setEffect(effect, this.getGhostEffect() + (+value || 0)); this.setEffect(effect, this.getGhostEffect() + (+value || 0));
} else { } else {
this.setEffect(effect, this.graphicsValues[eff] + value); this.setEffect(effect, +this.graphicsValues[eff] + (+value));
} }
}; };