[Scummvm-git-logs] scummvm master -> 8813b7e48915ad82bc2538cb6c952229239faca4

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8813b7e489 ICB: Silence warnings


Commit: 8813b7e48915ad82bc2538cb6c952229239faca4
    https://github.com/scummvm/scummvm/commit/8813b7e48915ad82bc2538cb6c952229239faca4
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-30T20:48:03+02:00

Commit Message:
ICB: Silence warnings

Changed paths:
    engines/icb/actor_view_pc.cpp
    engines/icb/route_manager.cpp


diff --git a/engines/icb/actor_view_pc.cpp b/engines/icb/actor_view_pc.cpp
index 64167e7570b..e28cea8a42a 100644
--- a/engines/icb/actor_view_pc.cpp
+++ b/engines/icb/actor_view_pc.cpp
@@ -376,7 +376,7 @@ void DrawFrame(const int32 frame) {
 	ambient.b = 128;
 
 	pxanim = (PXanim *)rs_anims->Res_open(raj_name, raj_name_hash, cluster_name, cluster_name_hash);
-	PXFrameEnOfAnim(framenum, pxanim)->markers[ORG_POS];
+	PXFrameEnOfAnim(framenum, pxanim);
 
 	// Make the actors orientation matrix
 	g_av_actor->rot = rot;
diff --git a/engines/icb/route_manager.cpp b/engines/icb/route_manager.cpp
index f86f7ca19b7..4ba494de2ff 100644
--- a/engines/icb/route_manager.cpp
+++ b/engines/icb/route_manager.cpp
@@ -212,12 +212,14 @@ bool8 _game_session::Process_route() {
 		else
 			res = Play_anim_with_no_movement();
 
+		// if more to do then return
+		//if (!res)
 		return (res);
 
 		// remove the phase so headup diagnostics disappear now the route is effectively done
-		M->m_phase = RM_NONE;
+		//M->m_phase = RM_NONE;
 
-		return (1); // no slow-out so we're done
+		//return (1); // no slow-out so we're done
 	}
 
 	// ok, process that point-to-point route!