[Scummvm-git-logs] scummvm master -> 89de1549ca267c137c23f2fd88b9fc7256b23194
dreammaster
dreammaster at scummvm.org
Sun Jan 15 23:12:04 CET 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:
89de1549ca TITANIC: Fix showing correct inventory glyphs after loading savegame
Commit: 89de1549ca267c137c23f2fd88b9fc7256b23194
https://github.com/scummvm/scummvm/commit/89de1549ca267c137c23f2fd88b9fc7256b23194
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T17:11:46-05:00
Commit Message:
TITANIC: Fix showing correct inventory glyphs after loading savegame
Changed paths:
engines/titanic/pet_control/pet_inventory_glyphs.cpp
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
index d19ea60..a994df0 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -294,8 +294,10 @@ int CPetInventoryGlyph::getItemIndex(CGameObject *item, bool isLoading) {
int frameNum = item->getFrameNumber();
int movieFrame = item->getMovieFrame();
- if (isLoading && frameNum != -1 && frameNum != movieFrame)
+ if (isLoading && frameNum != -1 && frameNum != movieFrame) {
item->loadFrame(frameNum);
+ movieFrame = frameNum;
+ }
return movieFrame;
}
More information about the Scummvm-git-logs
mailing list