mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-04 13:27:14 +00:00
Code Issues Releases Wiki Activity

sync with icculus repo

Browse source
This commit is contained in:
fgenesis 2011-11-20 15:44:17 +01:00
commit e64fb75f84
48 changed files with 21570 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

1
game_scripts/scripts/entities/doorcommon.lua
View file

@ -35,6 +35,7 @@ function v.commonInit(me, tex, snd, sz, flipDir)
setupEntity(me, tex, -2)
entity_scale(me, sz, sz)
entity_setActivationType(me, AT_NONE)
entity_setAllDamageTargets(me, false)
entity_setFillGrid(me, true)
v.sound = snd
loadSound(v.sound)

1
game_scripts/scripts/entities/orbholder.lua
View file

@ -28,6 +28,7 @@ v.savedOrb = false
function init(me)
setupEntity(me, "OrbHolder", -2)
entity_setActivationType(me, AT_NONE)
entity_setAllDamageTargets(me, false)
end
function update(me, dt)

18
game_scripts/scripts/entities/seahorsecommon.lua
View file

@ -566,13 +566,13 @@ function exitState(me)
end
function shiftWorlds(me, old, new)
if v.riding then
if new == WT_SPIRIT then
entity_setRiding(v.n, 0)
cam_toEntity(v.n)
elseif new == WT_NORMAL then
entity_setRiding(v.n, me)
cam_toEntity(me)
end
end
if v.riding then
if new == WT_SPIRIT then
entity_setRiding(v.n, 0)
cam_toEntity(v.n)
elseif new == WT_NORMAL then
entity_setRiding(v.n, me)
cam_toEntity(me)
end
end
end

2
game_scripts/scripts/include/healthupgradetemplate.lua
View file

@ -90,6 +90,8 @@ function v.commonInit(me, id)
entity_setState(me, STATE_IDLE)
entity_setEntityLayer(me, -1)
entity_setAllDamageTargets(me, false)
end
function postInit(me)