Merge branch 'small_fixes' into 'master'

Small fixes

A couple o' typos I've ran across.

game/engines/default/engine/Projectile.lua

@@ -232,10 +232,13 @@ function _M:act()
 			self:moveDirection(self.homing.target.x, self.homing.target.y)
 			self.homing.count = self.homing.count - 1
 			if self.src then self.src.__project_source = self end -- intermediate projector source
-			if (self.x == self.homing.target.x and self.y == self.homing.target.y) or self.homing.count <= 0 then
+			if self.x == self.homing.target.x and self.y == self.homing.target.y then
 				game.level:removeEntity(self, true)
 				self.dead = true
 				self.homing.on_hit(self, self.src, self.homing.target)
+			elseif self.homing.count <= 0 then
+				game.level:removeEntity(self, true)
+				self.dead = true
 			else
 				self.homing.on_move(self, self.src)
 			end

game/modules/tome/class/Player.lua

@@ -336,8 +336,8 @@ function _M:move(x, y, force)
 	return moved
 end
 
-function _M:act()
-	if not mod.class.Actor.act(self) then return end
+function _M:actBase()
+	mod.class.Actor.actBase(self)
 
 	-- Run out of time ?
 	if self.summon_time then
@@ -348,6 +348,10 @@ function _M:act()
 			return true
 		end
 	end
+end
+
+function _M:act()
+	if not mod.class.Actor.act(self) then return end
 
 	-- Funky shader things !
 	self:updateMainShader()