From ebad9911edd7fd9ed24fdbe5cf84afc18a8fe0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 2 Aug 2014 14:36:42 +0200 Subject: [PATCH 1/2] Fixed disk / floppy access sounds ignoring OC specific volume setting from config. --- src/main/scala/li/cil/oc/common/Sound.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/Sound.scala b/src/main/scala/li/cil/oc/common/Sound.scala index b7fed40d6..f2a2c3f93 100644 --- a/src/main/scala/li/cil/oc/common/Sound.scala +++ b/src/main/scala/li/cil/oc/common/Sound.scala @@ -9,7 +9,7 @@ object Sound { val lastPlayed = mutable.WeakHashMap.empty[Container, Long] def play(container: Container, name: String) { - container.world.playSoundEffect(container.xPosition, container.yPosition, container.zPosition, Settings.resourceDomain + ":" + name, 1, 1) + container.world.playSoundEffect(container.xPosition, container.yPosition, container.zPosition, Settings.resourceDomain + ":" + name, Settings.get.soundVolume, 1) } def playDiskInsert(container: Container) { From d77da6698f08f4e733605d3dddb633df84a2c05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 2 Aug 2014 15:01:35 +0200 Subject: [PATCH 2/2] Fixed non-flipped color value being sent to clients in hologram.setPaletteColor(), leading to wrong display until reloading. --- src/main/scala/li/cil/oc/common/tileentity/Hologram.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala index 196e1ed4d..a8d26f730 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala @@ -227,7 +227,7 @@ class Hologram(var tier: Int) extends traits.Environment with SidedEnvironment w // Change byte order here to allow passing stored color to OpenGL "as-is" // (as whole Int, i.e. 0xAABBGGRR, alpha is unused but present for alignment) colors(index - 1) = convertColor(value) - ServerPacketSender.sendHologramColor(this, index - 1, value) + ServerPacketSender.sendHologramColor(this, index - 1, colors(index - 1)) result(oldValue) }