thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

Browse source 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
This commit is contained in:
Christopher Page 2008-07-21 22:46:39 +00:00
commit 09f4fd946e
70 changed files with 4241 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/lure/luredefs.h
View file

@ -36,7 +36,7 @@ namespace Lure {
#define LURE_DAT_MAJOR 1
#define LURE_DAT_MINOR 29
#define LURE_MIN_SAVEGAME_MINOR 25
#define LURE_SAVEGAME_MINOR 32
#define LURE_SAVEGAME_MINOR 33
#define LURE_DEBUG 1

6
engines/lure/res_struct.cpp
View file

@ -456,6 +456,8 @@ void HotspotData::saveToStream(WriteStream *stream) {
stream->writeSint16LE(startY);
stream->writeUint16LE(roomNumber);
stream->writeByte(layer);
stream->writeUint16LE(walkX);
stream->writeUint16LE(walkY);
stream->writeUint16LE(width);
stream->writeUint16LE(height);
@ -503,6 +505,10 @@ void HotspotData::loadFromStream(ReadStream *stream) {
uint8 saveVersion = LureEngine::getReference().saveVersion();
if (saveVersion >= 29)
layer = stream->readByte();
if (saveVersion >= 33) {
walkX = stream->readUint16LE();
walkY = stream->readUint16LE();
}
width = stream->readUint16LE();
height = stream->readUint16LE();