AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-08-02 15:02:26 +02:00
commit 18eb77080d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/Sound.scala
View File

@ -9,7 +9,7 @@ object Sound {
val lastPlayed = mutable.WeakHashMap.empty[Container, Long] val lastPlayed = mutable.WeakHashMap.empty[Container, Long]
def play(container: Container, name: String) { 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) { def playDiskInsert(container: Container) {

2
src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
View File

@ -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" // 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) // (as whole Int, i.e. 0xAABBGGRR, alpha is unused but present for alignment)
colors(index - 1) = convertColor(value) colors(index - 1) = convertColor(value)
ServerPacketSender.sendHologramColor(this, index - 1, value) ServerPacketSender.sendHologramColor(this, index - 1, colors(index - 1))
result(oldValue) result(oldValue)
} }