fix search-and-replace damage from a while back
a batch change from ship to self broke the thing that kept the player on the screen. also spawn_goodie got missed in the migration to `_ENV` for looking up stuff by name.
This commit is contained in:
parent
97ddfb876b
commit
4804402f32
@ -443,7 +443,7 @@ function ship_m:move()
|
|||||||
self.x += self.xmomentum
|
self.x += self.xmomentum
|
||||||
self.y += self.ymomentum
|
self.y += self.ymomentum
|
||||||
|
|
||||||
if self == primary_self then
|
if self == primary_ship then
|
||||||
self.x = mid(0, 112 - 8 * self.size, self.x)
|
self.x = mid(0, 112 - 8 * self.size, self.x)
|
||||||
self.y = mid(0, 128 - 8 * self.size, self.y)
|
self.y = mid(0, 128 - 8 * self.size, self.y)
|
||||||
end
|
end
|
||||||
@ -1285,7 +1285,7 @@ end
|
|||||||
function spawn_goodie(goodie_name, x, y, sz)
|
function spawn_goodie(goodie_name, x, y, sz)
|
||||||
if (not goodie_name or #goodie_name == 0) return
|
if (not goodie_name or #goodie_name == 0) return
|
||||||
local sh = sz and sz/2 or 0
|
local sh = sz and sz/2 or 0
|
||||||
goodies[goodie_name].new{}:spawn_at(x+sh,y+sh)
|
_ENV[goodie_name].new{}:spawn_at(x+sh,y+sh)
|
||||||
end
|
end
|
||||||
|
|
||||||
function multi(times, interval, fnm, ...)
|
function multi(times, interval, fnm, ...)
|
||||||
|
@ -443,7 +443,7 @@ function ship_m:move()
|
|||||||
self.x += self.xmomentum
|
self.x += self.xmomentum
|
||||||
self.y += self.ymomentum
|
self.y += self.ymomentum
|
||||||
|
|
||||||
if self == primary_self then
|
if self == primary_ship then
|
||||||
self.x = mid(0, 112 - 8 * self.size, self.x)
|
self.x = mid(0, 112 - 8 * self.size, self.x)
|
||||||
self.y = mid(0, 128 - 8 * self.size, self.y)
|
self.y = mid(0, 128 - 8 * self.size, self.y)
|
||||||
end
|
end
|
||||||
@ -1285,7 +1285,7 @@ end
|
|||||||
function spawn_goodie(goodie_name, x, y, sz)
|
function spawn_goodie(goodie_name, x, y, sz)
|
||||||
if (not goodie_name or #goodie_name == 0) return
|
if (not goodie_name or #goodie_name == 0) return
|
||||||
local sh = sz and sz/2 or 0
|
local sh = sz and sz/2 or 0
|
||||||
goodies[goodie_name].new{}:spawn_at(x+sh,y+sh)
|
_ENV[goodie_name].new{}:spawn_at(x+sh,y+sh)
|
||||||
end
|
end
|
||||||
|
|
||||||
function multi(times, interval, fnm, ...)
|
function multi(times, interval, fnm, ...)
|
||||||
|
Loading…
Reference in New Issue
Block a user