Skip to content

A couple of small improvements to CraftOS #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

A couple of small improvements to CraftOS #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/resources/assets/computercraft/lua/bios.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ if _VERSION == "Lua 5.1" then
if env ~= nil and type( env) ~= "table" then
error( "bad argument #4 (expected table, got " .. type( env ) .. ")", 2 )
end
if mode ~= nil and mode ~= "t" then
error( "Binary chunk loading prohibited", 2 )
end
local ok, p1, p2 = pcall( function()
if type(x) == "string" then
local result, err = nativeloadstring( x, name )
Expand Down
6 changes: 4 additions & 2 deletions src/main/resources/assets/computercraft/lua/rom/apis/window.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,10 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
function window.reposition( nNewX, nNewY, nNewWidth, nNewHeight )
if type( nNewX ) ~= "number" then error( "bad argument #1 (expected number, got " .. type( nNewX ) .. ")", 2 ) end
if type( nNewY ) ~= "number" then error( "bad argument #2 (expected number, got " .. type( nNewY ) .. ")", 2 ) end
if nNewWidth ~= nil and type( nNewWidth ) ~= "number" then error( "bad argument #3 (expected number, got " .. type( nNewWidth ) .. ")", 2 ) end
if nNewHeight ~= nil and type( nNewHeight ) ~= "number" then error( "bad argument #4 (expected number, got " .. type( nNewHeight ) .. ")", 2 ) end
if nNewWidth ~= nil or nNewHeight ~= nil then
if type( nNewWidth ) ~= "number" then error( "bad argument #3 (expected number, got " .. type( nNewWidth ) .. ")", 2 ) end
if type( nNewHeight ) ~= "number" then error( "bad argument #4 (expected number, got " .. type( nNewHeight ) .. ")", 2 ) end
end

nX = nNewX
nY = nNewY
Expand Down
12 changes: 4 additions & 8 deletions src/main/resources/assets/computercraft/lua/rom/programs/help.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ if sTopic == "index" then
return
end

local w,h = term.getSize()
local sFile = help.lookup( sTopic )
local file = ((sFile ~= nil) and io.open( sFile )) or nil
local nLinesPrinted = 0
if file then
local sLine = file:read()
local nLines = 0
while sLine do
nLines = nLines + textutils.pagedPrint( sLine, (h-3) - nLines )
sLine = file:read()
end
local sContents = file:read("*a")
file:close()

local _, nHeight = term.getSize()
textutils.pagedPrint( sContents, nHeight - 3 )
else
print( "No help available" )
end
2 changes: 1 addition & 1 deletion src/main/resources/assets/computercraft/lua/rom/programs/http/pastebin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ elseif sCommand == "run" then
printError( err )
return
end
local success, msg = pcall(func, table.unpack(tArgs, 3))
local success, msg = pcall(func, select(3, ...))
if not success then
printError( msg )
end
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/assets/computercraft/lua/rom/programs/turtle/dance.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,17 @@ end

print( "Press any key to stop the groove" )

local bEnd = false
parallel.waitForAll(
parallel.waitForAny(
function()
while not bEnd do
local event, key = os.pullEvent("key")
if key ~= keys.escape then
bEnd = true
return
end
end
end,
function()
while not bEnd do
while true do
local fnMove = tMoves[math.random(1,#tMoves)]
fnMove()
end
Expand Down