diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee index e0aa01341..ecebba5f0 100644 --- a/app/lib/surface/SpriteBoss.coffee +++ b/app/lib/surface/SpriteBoss.coffee @@ -104,7 +104,7 @@ module.exports = class SpriteBoss extends CocoClass unless thangType = @thangTypeFor indieSprite.thangType console.warn "Need to convert #{indieSprite.id}'s ThangType #{indieSprite.thangType} to a ThangType reference. Until then, #{indieSprite.id} won't show up." return - sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites} + sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites, colorConfig: indieSprite.colorConfig} @addSprite sprite, sprite.thang.id createWizardSprite: (options) -> diff --git a/app/styles/play/level/playback.sass b/app/styles/play/level/playback.sass index 39fcd6b73..ba3b1567f 100644 --- a/app/styles/play/level/playback.sass +++ b/app/styles/play/level/playback.sass @@ -26,6 +26,10 @@ #music-button @include opacity(0.25) font-size: 20px + span + position: relative + left: -3px + top: -2px &:hover @include opacity(0.50) &.music-on diff --git a/app/templates/play/level/playback.jade b/app/templates/play/level/playback.jade index 84801141f..51bb71110 100644 --- a/app/templates/play/level/playback.jade +++ b/app/templates/play/level/playback.jade @@ -8,7 +8,7 @@ button.btn.btn-xs.btn-inverse#volume-button(title="Adjust volume") i.icon-volume-down.icon-white.big i.icon-volume-up.icon-white.big button.btn.btn-xs.btn-inverse#music-button(title="Toggle Music") - | ♫ + span ♫ .scrubber .progress.secret diff --git a/app/views/play/level/hud_view.coffee b/app/views/play/level/hud_view.coffee index da29ba985..2038262cd 100644 --- a/app/views/play/level/hud_view.coffee +++ b/app/views/play/level/hud_view.coffee @@ -93,7 +93,7 @@ module.exports = class HUDView extends View return if speakerSprite is @speakerSprite @speakerSprite = speakerSprite @speaker = @speakerSprite.thang.id - @createAvatar @speakerSprite.thangType, @speakerSprite.thang + @createAvatar @speakerSprite.thangType, @speakerSprite.thang, @speakerSprite.options.colorConfig @$el.removeClass 'no-selection' @switchToDialogueElements() @@ -107,9 +107,10 @@ module.exports = class HUDView extends View @bubble = null @update() - createAvatar: (thangType, thang) -> + createAvatar: (thangType, thang, colorConfig) -> options = thang.getSpriteOptions() or {} options.async = false + options.colorConfig = colorConfig stage = thangType.getPortraitStage options wrapper = @$el.find '.thang-canvas-wrapper' newCanvas = $(stage.canvas).addClass('thang-canvas')