[Scummvm-cvs-logs] scummvm master -> 4f7913c3553a0294675b46a9ccbbee19fceecb8d
dreammaster
dreammaster at scummvm.org
Wed Nov 13 03:51:27 CET 2013
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:
4f7913c355 TSAGE: R2R Fix for restoriong scenes with objects using a shadow map
Commit: 4f7913c3553a0294675b46a9ccbbee19fceecb8d
https://github.com/scummvm/scummvm/commit/4f7913c3553a0294675b46a9ccbbee19fceecb8d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-12T18:50:52-08:00
Commit Message:
TSAGE: R2R Fix for restoriong scenes with objects using a shadow map
Changed paths:
engines/tsage/core.cpp
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f2744d5..040dbc8 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2737,15 +2737,16 @@ void SceneObject::reposition() {
*/
void SceneObject::draw() {
Rect destRect = _bounds;
- destRect.translate(-g_globals->_sceneManager._scene->_sceneBounds.left,
- -g_globals->_sceneManager._scene->_sceneBounds.top);
+ Scene *scene = g_globals->_sceneManager._scene;
+ destRect.translate(-scene->_sceneBounds.left, -scene->_sceneBounds.top);
GfxSurface frame = getFrame();
- Region *priorityRegion = g_globals->_sceneManager._scene->_priorities.find(_priority);
+ Region *priorityRegion = scene->_priorities.find(_priority);
if (g_vm->getGameID() == GType_Ringworld2) {
switch (_effect) {
case EFFECT_SHADOW_MAP: {
- assert(_shadowMap);
+ if (!_shadowMap)
+ _shadowMap = static_cast<Ringworld2::SceneExt *>(scene)->_shadowPaletteMap;
GLOBALS.gfxManager().getSurface().copyFrom(frame, frame.getBounds(),
destRect, priorityRegion, _shadowMap);
More information about the Scummvm-git-logs
mailing list