Merge branch 'master' into fbo_mrt

game/engines/default/engine/Map.lua

@@ -622,6 +622,7 @@ function _M:zDisplay(z, nb_keyframe, prevfbo)
 	self:calcEffectVisibility(z)
 	self:displayParticles(z, nb_keyframe)
 	self:displayEffects(z, prevfbo, nb_keyframe)
+	return true
 end
 
 --- Sets checks if a grid lets sight pass through

game/modules/tome/data/talents/psionic/other.lua

@@ -235,7 +235,7 @@ newTalent{
 		return true
 	end,
 	activate = function (self, t)
-		local tk = self:getInven("PSIONIC_FOCUS")[1]
+		local tk = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
 		if not tk then return false end
 
 		local ret = {}

src/map.c

@@ -331,8 +331,8 @@ static int map_object_set_move_anim(lua_State *L)
 	obj->move_blur = lua_tonumber(L, 7); // defaults to 0
 	obj->move_twitch_dir = lua_tonumber(L, 8); // defaults to 0 (which is equivalent to up or 8)
 	obj->move_twitch = lua_tonumber(L, 9); // defaults to 0
-	obj->animdx = obj->animdx - ((float)obj->cur_x - obj->oldx);
-	obj->animdy = obj->animdy - ((float)obj->cur_y - obj->oldy);
+	// obj->animdx = obj->animdx - ((float)obj->cur_x - obj->oldx);
+	// obj->animdy = obj->animdy - ((float)obj->cur_y - obj->oldy);
 
 	return 0;
 }