Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 16 insertions, 16 deletions

diff --git a/engines/lastexpress/game/action.h b/engines/lastexpress/game/action.h
index e1a4a53224..80de60511d 100644
--- a/engines/lastexpress/game/action.h
+++ b/engines/lastexpress/game/action.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -82,28 +82,28 @@ private:
 	DECLARE_ACTION(playSounds);
 	DECLARE_ACTION(playAnimation);
 	DECLARE_ACTION(openCloseObject);
-	DECLARE_ACTION(updateObjetLocation2);
-	DECLARE_ACTION(setItemLocation);
-	DECLARE_ACTION(knockNoSound);
+	DECLARE_ACTION(setModel);
+	DECLARE_ACTION(setItem);
+	DECLARE_ACTION(knockInside);
 	DECLARE_ACTION(pickItem);
 	DECLARE_ACTION(dropItem);
 	DECLARE_ACTION(enterCompartment);
-	DECLARE_ACTION(getOutsideTrain);
-	DECLARE_ACTION(slip);
-	DECLARE_ACTION(getInsideTrain);
-	DECLARE_ACTION(climbUpTrain);
+	DECLARE_ACTION(leanOutWindow);
+	DECLARE_ACTION(almostFall);
+	DECLARE_ACTION(climbInWindow);
+	DECLARE_ACTION(climbLadder);
 	DECLARE_ACTION(climbDownTrain);
-	DECLARE_ACTION(jumpUpDownTrain);
-	DECLARE_ACTION(unbound);
-	DECLARE_ACTION(25);
-	DECLARE_ACTION(26);
+	DECLARE_ACTION(kronosSanctum);
+	DECLARE_ACTION(escapeBaggage);
+	DECLARE_ACTION(enterBaggage);
+	DECLARE_ACTION(bombPuzzle);
 	DECLARE_ACTION(27);
-	DECLARE_ACTION(concertSitCough);
+	DECLARE_ACTION(kronosConcert);
 	DECLARE_ACTION(29);
 	DECLARE_ACTION(catchBeetle);
 	DECLARE_ACTION(exitCompartment);
-	DECLARE_ACTION(32);
-	DECLARE_ACTION(useWhistle);
+	DECLARE_ACTION(outsideTrain);
+	DECLARE_ACTION(firebirdPuzzle);
 	DECLARE_ACTION(openMatchBox);
 	DECLARE_ACTION(openBed);
 	DECLARE_ACTION(dialog);