[Scummvm-git-logs] scummvm master -> 89a9c452ed931cb81ccaa44c67e4659c23dfa420

[sev-]

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:
80420df095 DIRECTOR: More debug output to D4 cast member loading
2fd5490de4 SCUMM HE: Fix Football logic initialization
89a9c452ed BBVS: Remove guitar minigame strings from translation.


Commit: 80420df095b1861d0808f9b500ee026ba6b09e3f
    https://github.com/scummvm/scummvm/commit/80420df095b1861d0808f9b500ee026ba6b09e3f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-24T11:28:51+01:00

Commit Message:
DIRECTOR: More debug output to D4 cast member loading

Changed paths:
    engines/director/cast.cpp
    engines/director/score.cpp



diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 667fc24..892ac48 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -45,6 +45,15 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint16 version) {
 		boundingRect = Score::readRect(stream);
 		regX = stream.readUint16();
 		regY = stream.readUint16();
+
+		int tail = 0;
+
+		while (!stream.eos()) {
+			stream.readByte();
+			tail++;
+		}
+
+		warning("BitmapCast: %d bytes left", tail);
 	}
 	modified = 0;
 }
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 819ae26..8a80e30 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -436,7 +436,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id)
 	debugC(3, kDebugLoading, "CASt: id: %d type: %x size1: %d size2: %d (%x) size3: %d unk1: %d unk2: %d unk3: %d",
 				id, castType, size1, size2, size2, size3, unk1, unk2, unk3);
 
-	byte *data = (byte *)calloc(size1 + 16, 1);
+	byte *data = (byte *)calloc(size1, 1); // 16 is for bounding rects
 	stream.read(data, size1 + 16);
 
 	Common::MemoryReadStreamEndian castStream(data, size1 + 16, stream.isBE());


Commit: 2fd5490de4f18580fc06ec42881ab6add149e609
    https://github.com/scummvm/scummvm/commit/2fd5490de4f18580fc06ec42881ab6add149e609
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-24T11:34:13+01:00

Commit Message:
SCUMM HE: Fix Football logic initialization

Changed paths:
    engines/scumm/he/logic/football.cpp



diff --git a/engines/scumm/he/logic/football.cpp b/engines/scumm/he/logic/football.cpp
index bde0c38..ab93e9c 100644
--- a/engines/scumm/he/logic/football.cpp
+++ b/engines/scumm/he/logic/football.cpp
@@ -286,7 +286,12 @@ int LogicHEfootball::computeTwoCircleIntercepts(int32 *args) {
 
 class LogicHEfootball2002 : public LogicHEfootball {
 public:
-	LogicHEfootball2002(ScummEngine_v90he *vm) : LogicHEfootball(vm) {}
+	LogicHEfootball2002(ScummEngine_v90he *vm) : LogicHEfootball(vm) {
+		_var0 = _var1 = _var2 = _var3 = _var4 = 0.0;
+                _angle = 0.0;
+                _maxX = -1;
+                _minX = 1000000;
+	}
 
 	int32 dispatch(int op, int numArgs, int32 *args);
 


Commit: 89a9c452ed931cb81ccaa44c67e4659c23dfa420
    https://github.com/scummvm/scummvm/commit/89a9c452ed931cb81ccaa44c67e4659c23dfa420
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-24T11:34:14+01:00

Commit Message:
BBVS: Remove guitar minigame strings from translation.

Although they're shown in our GUI, they were not supposed to be
translatable, rather extracted from the original executable

Changed paths:
    engines/bbvs/minigames/bbairguitar.cpp



diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index 8a18f86..bf05406 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -23,7 +23,6 @@
 #include "bbvs/minigames/bbairguitar.h"
 
 #include "common/savefile.h"
-#include "common/translation.h"
 
 #include "gui/message.h"
 #include "gui/filebrowser-dialog.h"
@@ -1230,9 +1229,9 @@ bool MinigameBbAirGuitar::querySaveModifiedDialog() {
 		Original ok button caption: "Yeah, heh, heh, save it!"
 		Original discard button caption: "Who cares?  It sucked!"
 	*/
-	GUI::MessageDialog query(_("Hey Beavis - you didn't save that last Jam!"),
-		_("Save it!"),
-		_("It sucked!"));
+	GUI::MessageDialog query("Hey Beavis - you didn't save that last Jam!",
+		"Save it!",
+		"It sucked!");
 	return query.runModal() == GUI::kMessageOK;
 }