[Scummvm-cvs-logs] scummvm master -> 903dc7d1d27ae9bbbca6b768c6511763e9755407
dreammaster
dreammaster at scummvm.org
Tue Aug 2 01:37:25 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
903dc7d1d2 TITANIC: Fix infinite recursion in CPetRoomsGlyph
Commit: 903dc7d1d27ae9bbbca6b768c6511763e9755407
https://github.com/scummvm/scummvm/commit/903dc7d1d27ae9bbbca6b768c6511763e9755407
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-01T19:37:16-04:00
Commit Message:
TITANIC: Fix infinite recursion in CPetRoomsGlyph
Changed paths:
engines/titanic/pet_control/pet_rooms_glyphs.cpp
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
index 851ca0c..d9e19b1 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
@@ -174,7 +174,7 @@ void CPetRoomsGlyph::saveGlyph(SimpleFile *file, int indent) {
bool CPetRoomsGlyph::proc33(CPetGlyph *glyph) {
CPetRoomsGlyph *roomGlyph = static_cast<CPetRoomsGlyph *>(glyph);
- return proc33(glyph) && _roomFlags == roomGlyph->_roomFlags;
+ return CPetGlyph::proc33(glyph) && _roomFlags == roomGlyph->_roomFlags;
}
void CPetRoomsGlyph::loadFlags(SimpleFile *file, int val) {
More information about the Scummvm-git-logs
mailing list