[Scummvm-cvs-logs] SF.net SVN: scummvm:[55809] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 7 18:53:35 CET 2011
Revision: 55809
http://scummvm.svn.sourceforge.net/scummvm/?rev=55809&view=rev
Author: fingolfin
Date: 2011-02-07 17:53:34 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
SCUMM: Avoid hiding overloaded virtual method
Modified Paths:
--------------
scummvm/trunk/engines/scumm/script_v0.cpp
scummvm/trunk/engines/scumm/script_v2.cpp
scummvm/trunk/engines/scumm/scumm_v0.h
scummvm/trunk/engines/scumm/scumm_v2.h
scummvm/trunk/engines/scumm/vars.cpp
scummvm/trunk/engines/scumm/verbs.cpp
Modified: scummvm/trunk/engines/scumm/script_v0.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v0.cpp 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/script_v0.cpp 2011-02-07 17:53:34 UTC (rev 55809)
@@ -664,7 +664,7 @@
_fullRedraw = true;
- resetSentence();
+ resetSentence(false);
if (x >= 0 && y >= 0) {
a->startWalkActor(x, y, -1);
@@ -934,7 +934,7 @@
setUserState(15);
_sentenceNum = 0;
- resetSentence();
+ resetSentence(false);
vm.cutScenePtr[0] = 0;
}
Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/script_v2.cpp 2011-02-07 17:53:34 UTC (rev 55809)
@@ -875,7 +875,7 @@
return;
}
if (a == 0xFB) {
- resetSentence();
+ resetSentence(false);
return;
}
@@ -1398,7 +1398,7 @@
_fullRedraw = true;
- resetSentence();
+ resetSentence(false);
if (x >= 0 && y >= 0) {
a->startWalkActor(x, y, -1);
@@ -1477,7 +1477,7 @@
_sentenceNum = 0;
stopScript(SENTENCE_SCRIPT);
- resetSentence();
+ resetSentence(false);
vm.cutScenePtr[0] = 0;
}
@@ -1625,7 +1625,7 @@
o2_dummy();
}
-void ScummEngine_v2::resetSentence() {
+void ScummEngine_v2::resetSentence(bool walking) {
VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB);
VAR(VAR_SENTENCE_OBJECT1) = 0;
VAR(VAR_SENTENCE_OBJECT2) = 0;
Modified: scummvm/trunk/engines/scumm/scumm_v0.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v0.h 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/scumm_v0.h 2011-02-07 17:53:34 UTC (rev 55809)
@@ -95,7 +95,7 @@
virtual int getActiveObject();
- virtual void resetSentence(bool walking = false);
+ virtual void resetSentence(bool walking);
virtual bool areBoxesNeighbours(int box1nr, int box2nr);
Modified: scummvm/trunk/engines/scumm/scumm_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v2.h 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/scumm_v2.h 2011-02-07 17:53:34 UTC (rev 55809)
@@ -93,7 +93,7 @@
void setStateCommon(byte type);
void clearStateCommon(byte type);
- virtual void resetSentence();
+ virtual void resetSentence(bool walking);
void setUserState(byte state);
virtual void handleMouseOver(bool updateInventory);
Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/vars.cpp 2011-02-07 17:53:34 UTC (rev 55809)
@@ -546,7 +546,7 @@
#endif
void ScummEngine_v0::resetScummVars() {
- resetSentence();
+ resetSentence(false);
VAR(VAR_EGO) = 3;
Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp 2011-02-07 17:53:15 UTC (rev 55808)
+++ scummvm/trunk/engines/scumm/verbs.cpp 2011-02-07 17:53:34 UTC (rev 55809)
@@ -852,7 +852,7 @@
if (whereIsObject(obj) == WIO_INVENTORY)
_activeInventory = obj;
else
- resetSentence();
+ resetSentence(false);
_v0ObjectInInventory = false;
}
@@ -889,7 +889,7 @@
int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
if ((!_activeInvExecute && _activeObject && getObjectIndex(_activeObject) == -1)) {
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -940,7 +940,7 @@
runObject(_activeInventory , 3);
_v0ObjectInInventory = false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -951,7 +951,7 @@
_v0ObjectIndex = false;
_verbExecuting = false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -965,7 +965,7 @@
if ((_currentMode == 3 || _currentMode == 2) && _activeVerb == 13)
return false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -982,7 +982,7 @@
return false;
}
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -1025,7 +1025,7 @@
return false;
}
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -1175,7 +1175,7 @@
// Clicked on nothing, walk here?
if (!over && !act && _activeVerb == 13 && !obj && _currentMode != 0) {
// Clear all selected
- resetSentence();
+ resetSentence(false);
// 0xB31
VAR(6) = _virtualMouse.x / V12_X_MULTIPLIER;
@@ -1206,7 +1206,7 @@
if (_activeVerb != over) {
_activeVerb = over;
if (_activeVerb == 13) {
- resetSentence();
+ resetSentence(false);
}
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list