[Scummvm-git-logs] scummvm master -> e29b2fc7310ed6c14c798c7c160a1bc91c15462c
dreammaster
dreammaster at scummvm.org
Sun Aug 6 01:06:43 CEST 2017
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:
e29b2fc731 TITANIC: Fix original savegames from the bar not loading
Commit: e29b2fc7310ed6c14c798c7c160a1bc91c15462c
https://github.com/scummvm/scummvm/commit/e29b2fc7310ed6c14c798c7c160a1bc91c15462c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-05T19:06:35-04:00
Commit Message:
TITANIC: Fix original savegames from the bar not loading
Changed paths:
engines/titanic/core/saveable_object.cpp
engines/titanic/support/movie_range_info.cpp
engines/titanic/support/movie_range_info.h
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 4784151..256ca41 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -483,6 +483,7 @@ DEFFN(ListItem);
DEFFN(CMailMan);
DEFFN(CMessageTarget);
DEFFN(CMovieClip);
+DEFFN(CMovieRangeInfo);
DEFFN(CMultiDropTarget);
DEFFN(CNamedItem);
DEFFN(CNodeItem);
@@ -1052,6 +1053,7 @@ void CSaveableObject::initClassList() {
ADDFN(CFileListItem, ListItem);
ADDFN(CMailMan, CGameObject);
ADDFN(CMovieClip, ListItem);
+ ADDFN(CMovieRangeInfo, ListItem);
ADDFN(CMultiDropTarget, CDropTarget);
ADDFN(CStartAction, CBackground);
ADDFN(CEditControl, CGameObject);
diff --git a/engines/titanic/support/movie_range_info.cpp b/engines/titanic/support/movie_range_info.cpp
index 018ffd6..ddf4291 100644
--- a/engines/titanic/support/movie_range_info.cpp
+++ b/engines/titanic/support/movie_range_info.cpp
@@ -55,6 +55,8 @@ void CMovieRangeInfo::save(SimpleFile *file, int indent) {
file->writeNumberLine(_isRepeat, indent + 1);
file->writeNumberLine(_isReversed, indent + 1);
_events.save(file, indent + 1);
+
+ ListItem::save(file, indent);
}
void CMovieRangeInfo::load(SimpleFile *file) {
@@ -67,6 +69,8 @@ void CMovieRangeInfo::load(SimpleFile *file) {
_isReversed = file->readNumber();
_events.load(file);
}
+
+ ListItem::load(file);
}
void CMovieRangeInfo::getMovieEnd(CMovieEventList &list) {
diff --git a/engines/titanic/support/movie_range_info.h b/engines/titanic/support/movie_range_info.h
index 6b13fba..9a0f17a 100644
--- a/engines/titanic/support/movie_range_info.h
+++ b/engines/titanic/support/movie_range_info.h
@@ -41,6 +41,7 @@ public:
bool _isRepeat;
CMovieEventList _events;
public:
+ CLASSDEF;
CMovieRangeInfo();
CMovieRangeInfo(const CMovieRangeInfo *src);
virtual ~CMovieRangeInfo();
More information about the Scummvm-git-logs
mailing list