[Scummvm-git-logs] scummvm master -> 097523d0ecd4e3da6a991b57c02cf278e7af216b

[dreammaster]

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

Summary:
93d465f2e3 TINSEL: Increase maximum number of objects
097523d0ec Merge pull request #1064 from csnover/tinsel-oom


Commit: 93d465f2e38dc192ad356d143dd8fe426dc336c3
    https://github.com/scummvm/scummvm/commit/93d465f2e38dc192ad356d143dd8fe426dc336c3
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-19T23:04:32-06:00

Commit Message:
TINSEL: Increase maximum number of objects

This needs to be at least 374 to avoid crashes in the in-game
save/load dialogues with save games using the maximum 40 letters
per save game, so just round up to the next power of two (which
increases memory usage by a whopping ~20KiB) to give more than
enough space for long save game names.

Fixes Trac#6748.

Changed paths:
    engines/tinsel/object.h


diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h
index 0b6efc3..097e187 100644
--- a/engines/tinsel/object.h
+++ b/engines/tinsel/object.h
@@ -34,7 +34,7 @@ struct PALQ;
 
 enum {
 	/** the maximum number of objects */
-	NUM_OBJECTS	= 256,
+	NUM_OBJECTS	= 512,
 
 	// object flags
 	DMA_WNZ		= 0x0001,	///< write non-zero data


Commit: 097523d0ecd4e3da6a991b57c02cf278e7af216b
    https://github.com/scummvm/scummvm/commit/097523d0ecd4e3da6a991b57c02cf278e7af216b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-20T18:29:05-05:00

Commit Message:
Merge pull request #1064 from csnover/tinsel-oom

TINSEL: Increase maximum number of objects

Changed paths:
    engines/tinsel/object.h