[Scummvm-git-logs] scummvm master -> 5ddbf58e323c07b9db77c4b8b0034acfeefb6338

sev- noreply at scummvm.org
Sat Aug 12 23:38:01 UTC 2023


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:
5ddbf58e32 WATCHMAKER: Fix warning


Commit: 5ddbf58e323c07b9db77c4b8b0034acfeefb6338
    https://github.com/scummvm/scummvm/commit/5ddbf58e323c07b9db77c4b8b0034acfeefb6338
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-08-13T01:37:45+02:00

Commit Message:
WATCHMAKER: Fix warning

Changed paths:
    engines/watchmaker/t2d/t2d.cpp


diff --git a/engines/watchmaker/t2d/t2d.cpp b/engines/watchmaker/t2d/t2d.cpp
index 292016b9991..9b291e521f8 100644
--- a/engines/watchmaker/t2d/t2d.cpp
+++ b/engines/watchmaker/t2d/t2d.cpp
@@ -1353,7 +1353,7 @@ void doT2DMouse(WGame &game) {
 			}*/
 		}
 
-		if ((T2DActualWindow(nullptr) == T2D_WIN_COMPUTER_DOCUMENT) |
+		if ((T2DActualWindow(nullptr) == T2D_WIN_COMPUTER_DOCUMENT) ||
 		        (T2DActualWindow(nullptr) == T2D_WIN_COMPUTER_EMAIL_VIEWER)) {
 			GetDDBitmapExtends(renderer, &t, &w->bm[a]);
 




More information about the Scummvm-git-logs mailing list