[Scummvm-cvs-logs] scummvm master -> 9d89861f77c9f7fc17ea93f90e7b8e937ec94298
dreammaster
dreammaster at scummvm.org
Mon Jul 29 01:05:55 CEST 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:
9d89861f77 TSAGE: Fix for clearing conversation dialogs
Commit: 9d89861f77c9f7fc17ea93f90e7b8e937ec94298
https://github.com/scummvm/scummvm/commit/9d89861f77c9f7fc17ea93f90e7b8e937ec94298
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-28T16:01:55-07:00
Commit Message:
TSAGE: Fix for clearing conversation dialogs
Changed paths:
engines/tsage/converse.cpp
engines/tsage/converse.h
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 145f04a..82feb31 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -535,18 +535,6 @@ void ConversationChoiceDialog::draw() {
_gfxManager.deactivate();
}
-void ConversationChoiceDialog::remove() {
- if (_savedArea) {
- // Restore the area the dialog covered
- Rect tempRect = _bounds;
- tempRect.collapse(-10, -10);
- g_globals->_gfxManagerInstance.copyFrom(*_savedArea, tempRect.left, tempRect.top);
-
- delete _savedArea;
- _savedArea = NULL;
- }
-}
-
int ConversationChoiceDialog::textLeft() const {
return (g_vm->getGameID() == GType_Ringworld2) ? 20 : 25;
}
diff --git a/engines/tsage/converse.h b/engines/tsage/converse.h
index aedd7b7..af0b3b8 100644
--- a/engines/tsage/converse.h
+++ b/engines/tsage/converse.h
@@ -168,7 +168,6 @@ public:
int execute(const Common::StringArray &choiceList);
virtual void draw();
- virtual void remove();
};
class Obj0A : public Serialisable {
More information about the Scummvm-git-logs
mailing list