Merge latest changes from branch miscellaneous-fixes.
--- a/Aquaria/Game.cpp Sat Dec 25 10:26:41 2010 +0900
+++ b/Aquaria/Game.cpp Thu Jan 06 01:33:47 2011 +0900
@@ -9441,6 +9441,7 @@
circlePageNum->alpha = 1;
previewRecipe->alpha = 0;
+ updatePreviewRecipe();
}
else if (!f && foodMenu)
{
--- a/game_scripts/scripts/entities/airship.lua Sat Dec 25 10:26:41 2010 +0900
+++ b/game_scripts/scripts/entities/airship.lua Thu Jan 06 01:33:47 2011 +0900
@@ -53,7 +53,7 @@
end
function update(me, dt)
- if v.attached then
+ if v.attached ~= 0 then
local bx, by = bone_getWorldPosition(v.bone_attach)
entity_setPosition(v.attached, bx, by)
end
--- a/game_scripts/scripts/entities/li.lua Sat Dec 25 10:26:41 2010 +0900
+++ b/game_scripts/scripts/entities/li.lua Thu Jan 06 01:33:47 2011 +0900
@@ -1182,6 +1182,8 @@
--debugLog("setting flag to 1")
setFlag(FLAG_LI, 1)
entity_alpha(me, 0, 1)
+ -- Make sure we don't see the head through the fading helmet.
+ bone_showFrame(v.bone_head, -1)
elseif entity_getState(me)==STATE_BURST then
debugLog("burst")
entity_animate(me, "burst")