[Scummvm-git-logs] scummvm master -> 47b599de20f05936466636b1386887022e97a40f

somaen noreply at scummvm.org
Sun Sep 25 18:49:24 UTC 2022


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:
47b599de20 TINSEL: Fix wrong mapping of IO_-attributes


Commit: 47b599de20f05936466636b1386887022e97a40f
    https://github.com/scummvm/scummvm/commit/47b599de20f05936466636b1386887022e97a40f
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-09-25T20:42:08+02:00

Commit Message:
TINSEL: Fix wrong mapping of IO_-attributes

1839780513c05ad7b3e7cbc98a36e546021f8222 made a mistake by
confusing the IO-attributes with the non-IO_-attributes,
as there is a difference in the order of the flags between
these two sets.

Fixes bug: https://bugs.scummvm.org/ticket/13810

Changed paths:
    engines/tinsel/inv_objects.h


diff --git a/engines/tinsel/inv_objects.h b/engines/tinsel/inv_objects.h
index 0bf677ed343..06ee53337e0 100644
--- a/engines/tinsel/inv_objects.h
+++ b/engines/tinsel/inv_objects.h
@@ -30,9 +30,9 @@ namespace Tinsel {
 
 // attribute values - not a bit bit field to prevent portability problems
 enum class InvObjAttr {
-	IO_DROPCODE = 0x01,
-	IO_ONLYINV1 = 0x02,
-	IO_ONLYINV2 = 0x04,
+	IO_ONLYINV1 = 0x01,
+	IO_ONLYINV2 = 0x02,
+	IO_DROPCODE = 0x04,
 	DEFINV1 = 0x08,
 	DEFINV2 = 0x10,
 	PERMACONV = 0x20,




More information about the Scummvm-git-logs mailing list