[Scummvm-cvs-logs] scummvm master -> 32c52c3df7948adfbb249ecd9c68d92191265d81
Strangerke
Strangerke at scummvm.org
Tue Oct 22 11:03:18 CEST 2013
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:
f7586343b6 AVALANCHE: last modification wasn't in previous commit, fixed.
32c52c3df7 AVALANCHE: Fix CID 1109698 - Uninitialized scalar field in Sequence
Commit: f7586343b66674afa327837d1dc377c952fecabf
https://github.com/scummvm/scummvm/commit/f7586343b66674afa327837d1dc377c952fecabf
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-22T01:49:13-07:00
Commit Message:
AVALANCHE: last modification wasn't in previous commit, fixed.
Changed paths:
engines/avalanche/avalanche.cpp
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index ef56459..43e9994 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -173,9 +173,9 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
sz.syncAsByte(actChr);
}
- uint16 favourite_songSize = _favoriteSong.size();
- sz.syncAsUint16LE(favourite_songSize);
- for (uint16 i = 0; i < favourite_songSize; i++) {
+ uint16 favoriteSongSize = _favoriteSong.size();
+ sz.syncAsUint16LE(favoriteSongSize);
+ for (uint16 i = 0; i < favoriteSongSize; i++) {
char actChr = _favoriteSong[i];
sz.syncAsByte(actChr);
}
Commit: 32c52c3df7948adfbb249ecd9c68d92191265d81
https://github.com/scummvm/scummvm/commit/32c52c3df7948adfbb249ecd9c68d92191265d81
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-22T02:01:28-07:00
Commit Message:
AVALANCHE: Fix CID 1109698 - Uninitialized scalar field in Sequence
Changed paths:
engines/avalanche/sequence.cpp
diff --git a/engines/avalanche/sequence.cpp b/engines/avalanche/sequence.cpp
index 10fa7f0..3a60c4e 100644
--- a/engines/avalanche/sequence.cpp
+++ b/engines/avalanche/sequence.cpp
@@ -34,6 +34,8 @@ namespace Avalanche {
Sequence::Sequence(AvalancheEngine *vm) {
_vm = vm;
+
+ resetVariables();
}
void Sequence::resetVariables() {
More information about the Scummvm-git-logs
mailing list