[Scummvm-git-logs] scummvm master -> 89b0580181704ce205e336fcf0ddea6c3a6c4dc7

[digitall]

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:
89b0580181 WATCHMAKER: Minor Refactor To Reduce GCC Compiler Warnings


Commit: 89b0580181704ce205e336fcf0ddea6c3a6c4dc7
    https://github.com/scummvm/scummvm/commit/89b0580181704ce205e336fcf0ddea6c3a6c4dc7
Author: D G Turner (digitall at scummvm.org)
Date: 2023-05-21T22:15:44+01:00

Commit Message:
WATCHMAKER: Minor Refactor To Reduce GCC Compiler Warnings

Changed paths:
    engines/watchmaker/classes/do_system.cpp


diff --git a/engines/watchmaker/classes/do_system.cpp b/engines/watchmaker/classes/do_system.cpp
index c7b7fe7ec7b..e78ff3e7de6 100644
--- a/engines/watchmaker/classes/do_system.cpp
+++ b/engines/watchmaker/classes/do_system.cpp
@@ -879,13 +879,9 @@ void doSystem(WGame &game) {
 
 			strcpy(RoomInfo.name, game.getCurRoom().desc);
 
-			if (t3dCurTime >= 1300) {
-				time = t3dCurTime - 1200;
-				sprintf(RoomInfo.fullstring, "%s, %d.%02dpm", RoomInfo.name, time / 100, time - (time / 100) * 100);
-			} else {
-				time = t3dCurTime;
-				sprintf(RoomInfo.fullstring, "%s, %d.%02dam", RoomInfo.name, time / 100, time - (time / 100) * 100);
-			}
+			time = t3dCurTime;
+			if (time >= 1300) time -= 1200;
+			sprintf(RoomInfo.fullstring, "%s, %d.%02dam", RoomInfo.name, time / 100, time - (time / 100) * 100);
 
 			rGetScreenInfos((unsigned int *)&width, (unsigned int *)&height, (unsigned int *)&bpp);
 			game._fonts.getTextDim(RoomInfo.fullstring, RoomInfo.f, &RoomInfo.dx, &RoomInfo.dy);