[Scummvm-git-logs] scummvm master -> a199672540388ad2017309be274f0e96993d903c
waltervn
walter at vanniftrik-it.nl
Sun Aug 28 21:02:30 CEST 2016
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9250bf58fe ADL: Load hires4 dropped-item offsets
1cfc4832bb ADL: Load more hires4 strings
a199672540 ADL: Change some SeekableReadStream to ReadStream
Commit: 9250bf58fe00ab5a0265b9a4ca32726abab83c37
https://github.com/scummvm/scummvm/commit/9250bf58fe00ab5a0265b9a4ca32726abab83c37
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-28T21:01:12+02:00
Commit Message:
ADL: Load hires4 dropped-item offsets
Changed paths:
engines/adl/adl.cpp
engines/adl/adl.h
engines/adl/hires0.cpp
engines/adl/hires1.cpp
engines/adl/hires2.cpp
engines/adl/hires4.cpp
engines/adl/hires4.h
engines/adl/hires6.cpp
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 8135d40..9afb2c6 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -402,6 +402,15 @@ byte AdlEngine::roomArg(byte room) const {
return room;
}
+void AdlEngine::loadDroppedItemOffsets(Common::ReadStream &stream, byte count) {
+ for (uint i = 0; i < count; ++i) {
+ Common::Point p;
+ p.x = stream.readByte();
+ p.y = stream.readByte();
+ _itemOffsets.push_back(p);
+ }
+}
+
void AdlEngine::clearScreen() const {
_display->setMode(DISPLAY_MODE_MIXED);
_display->clear(0x00);
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 89cdabe..971336e 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -247,6 +247,7 @@ protected:
virtual void initState();
virtual byte roomArg(byte room) const;
virtual void advanceClock() { }
+ void loadDroppedItemOffsets(Common::ReadStream &stream, byte count);
// Opcodes
int o1_isItemInRoom(ScriptEnv &e);
diff --git a/engines/adl/hires0.cpp b/engines/adl/hires0.cpp
index d5f7ab5..6581322 100644
--- a/engines/adl/hires0.cpp
+++ b/engines/adl/hires0.cpp
@@ -88,12 +88,7 @@ void HiRes0Engine::init() {
// Load dropped item offsets
stream.reset(_disk->createReadStream(0x1b, 0x4, 0x15));
- for (uint i = 0; i < IDI_HR0_NUM_ITEM_OFFSETS; ++i) {
- Common::Point p;
- p.x = stream->readByte();
- p.y = stream->readByte();
- _itemOffsets.push_back(p);
- }
+ loadDroppedItemOffsets(*stream, IDI_HR0_NUM_ITEM_OFFSETS);
// Load verbs
stream.reset(_disk->createReadStream(0x19, 0x0, 0x00, 3));
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index 26565c0..50fe254 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -183,12 +183,7 @@ void HiRes1Engine::init() {
// Load dropped item offsets
stream->seek(IDI_HR1_OFS_ITEM_OFFSETS);
- for (uint i = 0; i < IDI_HR1_NUM_ITEM_OFFSETS; ++i) {
- Common::Point p;
- p.x = stream->readByte();
- p.y = stream->readByte();
- _itemOffsets.push_back(p);
- }
+ loadDroppedItemOffsets(*stream, IDI_HR1_NUM_ITEM_OFFSETS);
// Load right-angle line art
stream->seek(IDI_HR1_OFS_CORNERS);
diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index 25a3bba..ec340c1 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -111,12 +111,7 @@ void HiRes2Engine::init() {
// Load dropped item offsets
stream.reset(_disk->createReadStream(0x1b, 0x4, 0x15));
- for (uint i = 0; i < IDI_HR2_NUM_ITEM_OFFSETS; ++i) {
- Common::Point p;
- p.x = stream->readByte();
- p.y = stream->readByte();
- _itemOffsets.push_back(p);
- }
+ loadDroppedItemOffsets(*stream, IDI_HR2_NUM_ITEM_OFFSETS);
// Load verbs
stream.reset(_disk->createReadStream(0x19, 0x0, 0x00, 3));
diff --git a/engines/adl/hires4.cpp b/engines/adl/hires4.cpp
index ae04a66..5c6f2d6 100644
--- a/engines/adl/hires4.cpp
+++ b/engines/adl/hires4.cpp
@@ -63,6 +63,9 @@ void HiRes4Engine::init() {
stream.reset(createReadStream(_boot, 0x06, 0xd, 0x12, 2));
loadItemDescriptions(*stream, IDI_HR4_NUM_ITEM_DESCS);
+ stream.reset(createReadStream(_boot, 0x07, 0x1, 0xf4));
+ loadDroppedItemOffsets(*stream, IDI_HR4_NUM_ITEM_OFFSETS);
+
stream.reset(createReadStream(_boot, 0x08, 0xe, 0xa5, 5));
readCommands(*stream, _roomCommands);
diff --git a/engines/adl/hires4.h b/engines/adl/hires4.h
index fd682cb..14671d7 100644
--- a/engines/adl/hires4.h
+++ b/engines/adl/hires4.h
@@ -32,8 +32,9 @@ namespace Adl {
#define IDI_HR4_NUM_ROOMS 164
#define IDI_HR4_NUM_MESSAGES 255
#define IDI_HR4_NUM_VARS 40
-#define IDI_HR4_NUM_ITEM_PICS 41
#define IDI_HR4_NUM_ITEM_DESCS 44
+#define IDI_HR4_NUM_ITEM_PICS 41
+#define IDI_HR4_NUM_ITEM_OFFSETS 40
// Messages used outside of scripts
#define IDI_HR4_MSG_CANT_GO_THERE 110
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index 314d817..d44a2e4 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -146,12 +146,7 @@ void HiRes6Engine::init() {
// Load dropped item offsets
stream.reset(_boot->createReadStream(0x8, 0x9, 0x16));
- for (uint i = 0; i < IDI_HR6_NUM_ITEM_OFFSETS; ++i) {
- Common::Point p;
- p.x = stream->readByte();
- p.y = stream->readByte();
- _itemOffsets.push_back(p);
- }
+ loadDroppedItemOffsets(*stream, IDI_HR6_NUM_ITEM_OFFSETS);
// Location of game data for each disc
stream.reset(_boot->createReadStream(0x5, 0xa, 0x03));
Commit: 1cfc4832bbc7898c5b7018fe779b2f4bb629f222
https://github.com/scummvm/scummvm/commit/1cfc4832bbc7898c5b7018fe779b2f4bb629f222
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-28T21:01:12+02:00
Commit Message:
ADL: Load more hires4 strings
Changed paths:
engines/adl/hires4.cpp
diff --git a/engines/adl/hires4.cpp b/engines/adl/hires4.cpp
index 5c6f2d6..70287dd 100644
--- a/engines/adl/hires4.cpp
+++ b/engines/adl/hires4.cpp
@@ -54,6 +54,17 @@ void HiRes4Engine::init() {
_strings.nounError = readStringAt(*stream, 0x83);
_strings.enterCommand = readStringAt(*stream, 0xa6);
+ stream.reset(createReadStream(_boot, 0x05, 0xb, 0xd7));
+ _strings_v2.time = readString(*stream, 0xff);
+
+ stream.reset(createReadStream(_boot, 0x06, 0x7, 0x00, 2));
+ _strings_v2.saveInsert = readStringAt(*stream, 0x62);
+ _strings_v2.saveReplace = readStringAt(*stream, 0xdd);
+ _strings_v2.restoreInsert = readStringAt(*stream, 0x12a);
+ _strings_v2.restoreReplace = readStringAt(*stream, 0x1b8);
+ _strings.playAgain = readStringAt(*stream, 0x21b);
+ // TODO: restart sequence has "insert side a/b" strings
+
_messageIds.cantGoThere = IDI_HR4_MSG_CANT_GO_THERE;
_messageIds.dontUnderstand = IDI_HR4_MSG_DONT_UNDERSTAND;
_messageIds.itemDoesntMove = IDI_HR4_MSG_ITEM_DOESNT_MOVE;
Commit: a199672540388ad2017309be274f0e96993d903c
https://github.com/scummvm/scummvm/commit/a199672540388ad2017309be274f0e96993d903c
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-28T21:01:12+02:00
Commit Message:
ADL: Change some SeekableReadStream to ReadStream
Changed paths:
engines/adl/adl_v2.cpp
engines/adl/adl_v2.h
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp
index 4522591..979d794 100644
--- a/engines/adl/adl_v2.cpp
+++ b/engines/adl/adl_v2.cpp
@@ -364,7 +364,7 @@ DataBlockPtr AdlEngine_v2::readDataBlockPtr(Common::ReadStream &f) const {
return _disk->getDataBlock(track, sector, offset, size);
}
-void AdlEngine_v2::loadItems(Common::SeekableReadStream &stream) {
+void AdlEngine_v2::loadItems(Common::ReadStream &stream) {
byte id;
while ((id = stream.readByte()) != 0xff && !stream.eos() && !stream.err()) {
Item item = Item();
@@ -395,7 +395,7 @@ void AdlEngine_v2::loadItems(Common::SeekableReadStream &stream) {
error("Error loading items");
}
-void AdlEngine_v2::loadRooms(Common::SeekableReadStream &stream, byte count) {
+void AdlEngine_v2::loadRooms(Common::ReadStream &stream, byte count) {
for (uint i = 0; i < count; ++i) {
Room room;
@@ -414,12 +414,12 @@ void AdlEngine_v2::loadRooms(Common::SeekableReadStream &stream, byte count) {
error("Error loading rooms");
}
-void AdlEngine_v2::loadMessages(Common::SeekableReadStream &stream, byte count) {
+void AdlEngine_v2::loadMessages(Common::ReadStream &stream, byte count) {
for (uint i = 0; i < count; ++i)
_messages.push_back(readDataBlockPtr(stream));
}
-void AdlEngine_v2::loadPictures(Common::SeekableReadStream &stream) {
+void AdlEngine_v2::loadPictures(Common::ReadStream &stream) {
byte picNr;
while ((picNr = stream.readByte()) != 0xff) {
if (stream.eos() || stream.err())
@@ -429,7 +429,7 @@ void AdlEngine_v2::loadPictures(Common::SeekableReadStream &stream) {
}
}
-void AdlEngine_v2::loadItemPictures(Common::SeekableReadStream &stream, byte count) {
+void AdlEngine_v2::loadItemPictures(Common::ReadStream &stream, byte count) {
for (uint i = 0; i < count; ++i) {
stream.readByte(); // number
_itemPics.push_back(readDataBlockPtr(stream));
diff --git a/engines/adl/adl_v2.h b/engines/adl/adl_v2.h
index 85c7544..8f36b5c 100644
--- a/engines/adl/adl_v2.h
+++ b/engines/adl/adl_v2.h
@@ -53,11 +53,11 @@ protected:
virtual DataBlockPtr readDataBlockPtr(Common::ReadStream &f) const;
virtual void adjustDataBlockPtr(byte &track, byte §or, byte &offset, byte &size) const { }
- void loadItems(Common::SeekableReadStream &stream);
- void loadRooms(Common::SeekableReadStream &stream, byte count);
- void loadMessages(Common::SeekableReadStream &stream, byte count);
- void loadPictures(Common::SeekableReadStream &stream);
- void loadItemPictures(Common::SeekableReadStream &stream, byte count);
+ void loadItems(Common::ReadStream &stream);
+ void loadRooms(Common::ReadStream &stream, byte count);
+ void loadMessages(Common::ReadStream &stream, byte count);
+ void loadPictures(Common::ReadStream &stream);
+ void loadItemPictures(Common::ReadStream &stream, byte count);
void checkTextOverflow(char c);
More information about the Scummvm-git-logs
mailing list