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

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source
This commit is contained in:
payonel 2020-05-18 02:43:11 -07:00
commit 5225dfc2e8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/server/component/GraphicsCard.scala
View File

@ -105,12 +105,12 @@ class GraphicsCard(val tier: Int) extends prefab.ManagedEnvironment with DeviceI
} }
@Callback(direct = true, doc = """function(): number -- returns the index of the currently selected buffer. 0 is reserved for the screen. Can return 0 even when there is no screen""") @Callback(direct = true, doc = """function(): number -- returns the index of the currently selected buffer. 0 is reserved for the screen. Can return 0 even when there is no screen""")
def getBuffer(context: Context, args: Arguments): Array[AnyRef] = { def getActiveBuffer(context: Context, args: Arguments): Array[AnyRef] = {
result(bufferIndex) result(bufferIndex)
} }
@Callback(direct = true, doc = """function(index: number): number -- Sets the active buffer to `index`. 1 is the first vram buffer and 0 is reserved for the screen. returns nil for invalid index (0 is always valid)""") @Callback(direct = true, doc = """function(index: number): number -- Sets the active buffer to `index`. 1 is the first vram buffer and 0 is reserved for the screen. returns nil for invalid index (0 is always valid)""")
def setBuffer(context: Context, args: Arguments): Array[AnyRef] = { def setActiveBuffer(context: Context, args: Arguments): Array[AnyRef] = {
val previousIndex: Int = bufferIndex val previousIndex: Int = bufferIndex
val newIndex: Int = args.checkInteger(0) val newIndex: Int = args.checkInteger(0)
if (newIndex != RESERVED_SCREEN_INDEX && getBuffer(newIndex).isEmpty) { if (newIndex != RESERVED_SCREEN_INDEX && getBuffer(newIndex).isEmpty) {
@ -454,8 +454,6 @@ class GraphicsCard(val tier: Int) extends prefab.ManagedEnvironment with DeviceI
val vertical = args.optBoolean(3, false) val vertical = args.optBoolean(3, false)
screen(s => { screen(s => {
val x2 = if (vertical) x else x + value.length - 1
val y2 = if (!vertical) y else y + value.length - 1
if (consumeViewportPower(s, context, setCosts(tier), value.length, Settings.get.gpuSetCost)) { if (consumeViewportPower(s, context, setCosts(tier), value.length, Settings.get.gpuSetCost)) {
s.set(x, y, value, vertical) s.set(x, y, value, vertical)
result(true) result(true)