[Scummvm-cvs-logs] SF.net SVN: scummvm: [21759] scummvm/trunk/engines/simon
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Apr 10 01:50:06 CEST 2006
Revision: 21759
Author: eriktorbjorn
Date: 2006-04-10 01:49:28 -0700 (Mon, 10 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21759&view=rev
Log Message:
-----------
Merged o_setup_cond_c() into o1_getDollar2(). (We could merge
setup_cond_c_helper() into o1_getDollar2() as well, but for now I'm only trying
to get rid of the o_* functions.)
Modified Paths:
--------------
scummvm/trunk/engines/simon/items.cpp
scummvm/trunk/engines/simon/simon.cpp
scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp 2006-04-10 08:42:29 UTC (rev 21758)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-10 08:49:28 UTC (rev 21759)
@@ -1369,7 +1369,25 @@
void SimonEngine::o1_getDollar2() {
// 164
_showPreposition = true;
- o_setup_cond_c();
+
+ setup_cond_c_helper();
+
+ _objectItem = _hitAreaObjectItem;
+
+ if (_objectItem == _dummyItem2)
+ _objectItem = getItem1Ptr();
+
+ if (_objectItem == _dummyItem3)
+ _objectItem = derefItem(getItem1Ptr()->parent);
+
+ if (_objectItem != NULL) {
+ _scriptNoun2 = _objectItem->noun;
+ _scriptAdj2 = _objectItem->adjective;
+ } else {
+ _scriptNoun2 = -1;
+ _scriptAdj2 = -1;
+ }
+
_showPreposition = false;
}
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-04-10 08:42:29 UTC (rev 21758)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-04-10 08:49:28 UTC (rev 21759)
@@ -1533,27 +1533,6 @@
_runScriptReturn1 = false;
}
-void SimonEngine::o_setup_cond_c() {
-
- setup_cond_c_helper();
-
- _objectItem = _hitAreaObjectItem;
-
- if (_objectItem == _dummyItem2)
- _objectItem = getItem1Ptr();
-
- if (_objectItem == _dummyItem3)
- _objectItem = derefItem(getItem1Ptr()->parent);
-
- if (_objectItem != NULL) {
- _scriptNoun2 = _objectItem->noun;
- _scriptAdj2 = _objectItem->adjective;
- } else {
- _scriptNoun2 = -1;
- _scriptAdj2 = -1;
- }
-}
-
void SimonEngine::setup_cond_c_helper() {
HitArea *last;
uint id;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-10 08:42:29 UTC (rev 21758)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-10 08:49:28 UTC (rev 21759)
@@ -585,7 +585,6 @@
void o_fadeToBlack();
TextLocation *getTextLocation(uint a);
- void o_setup_cond_c();
void setup_cond_c_helper();
void checkLinkBox();
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