[Scummvm-cvs-logs] SF.net SVN: scummvm: [22035] scummvm/trunk/engines/simon
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Wed Apr 19 04:55:06 CEST 2006
Revision: 22035
Author: kirben
Date: 2006-04-19 04:54:38 -0700 (Wed, 19 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22035&view=rev
Log Message:
-----------
Correct dummyItems in FF and cleanup
Modified Paths:
--------------
scummvm/trunk/engines/simon/items.cpp
scummvm/trunk/engines/simon/oracle.cpp
scummvm/trunk/engines/simon/saveload.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-19 11:05:47 UTC (rev 22034)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-19 11:54:38 UTC (rev 22035)
@@ -379,12 +379,12 @@
void SimonEngine::o_at() {
// 1: ptrA parent is
- setScriptCondition(getItem1Ptr()->parent == getNextItemID());
+ setScriptCondition(me()->parent == getNextItemID());
}
void SimonEngine::o_notAt() {
// 2: ptrA parent is not
- setScriptCondition(getItem1Ptr()->parent != getNextItemID());
+ setScriptCondition(me()->parent != getNextItemID());
}
void SimonEngine::o_carried() {
@@ -633,7 +633,7 @@
void SimonEngine::o_goto() {
// 55: set itemA parent
- setItemParent(getItem1Ptr(), getNextItemPtr());
+ setItemParent(me(), getNextItemPtr());
}
void SimonEngine::o_oset() {
@@ -1030,7 +1030,7 @@
void SimonEngine::o_here() {
// 125: item is sibling with item 1
Item *item = getNextItemPtr();
- setScriptCondition(getItem1Ptr()->parent == item->parent);
+ setScriptCondition(me()->parent == item->parent);
}
void SimonEngine::o_doClassIcons() {
@@ -1340,10 +1340,10 @@
_objectItem = _hitAreaObjectItem;
if (_objectItem == _dummyItem2)
- _objectItem = getItem1Ptr();
+ _objectItem = me();
if (_objectItem == _dummyItem3)
- _objectItem = derefItem(getItem1Ptr()->parent);
+ _objectItem = derefItem(me()->parent);
if (_objectItem != NULL) {
_scriptNoun2 = _objectItem->noun;
@@ -1811,7 +1811,7 @@
h = getVarOrWord();
num = getVarOrByte();
if (num < _numTextBoxes)
- defineBox(id, x, y, w, h, flags + (num << 8), 208, _dummyItem1);
+ defineBox(id, x, y, w, h, flags + (num << 8), 208, _dummyItem2);
}
void SimonEngine::o3_printLongText() {
Modified: scummvm/trunk/engines/simon/oracle.cpp
===================================================================
--- scummvm/trunk/engines/simon/oracle.cpp 2006-04-19 11:05:47 UTC (rev 22034)
+++ scummvm/trunk/engines/simon/oracle.cpp 2006-04-19 11:54:38 UTC (rev 22035)
@@ -34,7 +34,7 @@
if (_hyperLink != 0) {
_variableArray[52] = _textWindow->x + _textWindow->textColumn - _variableArray[50];
if (_variableArray[52] != 0) {
- defineBox(_variableArray[53], _variableArray[50], _variableArray[51], _variableArray[52], 15, 145, 208, _dummyItem1);
+ defineBox(_variableArray[53], _variableArray[50], _variableArray[51], _variableArray[52], 15, 145, 208, _dummyItem2);
_variableArray[53]++;
}
_variableArray[50] = _textWindow->x;
@@ -57,7 +57,7 @@
return;
_variableArray[52] = _textWindow->x + _textWindow->textColumn - _variableArray[50];
- defineBox(_variableArray[53], _variableArray[50], _variableArray[51], _variableArray[52], 15, 145, 208, _dummyItem1);
+ defineBox(_variableArray[53], _variableArray[50], _variableArray[51], _variableArray[52], 15, 145, 208, _dummyItem2);
_variableArray[53]++;
_hyperLink = 0;
}
Modified: scummvm/trunk/engines/simon/saveload.cpp
===================================================================
--- scummvm/trunk/engines/simon/saveload.cpp 2006-04-19 11:05:47 UTC (rev 22034)
+++ scummvm/trunk/engines/simon/saveload.cpp 2006-04-19 11:54:38 UTC (rev 22035)
@@ -116,7 +116,7 @@
} else {
// Redraw Inventory
mouseOff();
- drawIconArray(2, getItem1Ptr(), 0, 0);
+ drawIconArray(2, me(), 0, 0);
mouseOn();
// Reset engine?
setBitFlag(97, true);
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-04-19 11:05:47 UTC (rev 22034)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-04-19 11:54:38 UTC (rev 22035)
@@ -280,7 +280,7 @@
_subjectItem = 0;
_objectItem = 0;
- _item1 = 0;
+ _currentPlayer = 0;
_currentBoxNumber = 0;
_iOverflow = 0;
@@ -804,15 +804,15 @@
void SimonEngine::createPlayer() {
Child *child;
- _item1 = _itemArrayPtr[1];
- _item1->adjective = -1;
- _item1->noun = 10000;
+ _currentPlayer = _itemArrayPtr[1];
+ _currentPlayer->adjective = -1;
+ _currentPlayer->noun = 10000;
- child = (Child *)allocateChildBlock(_item1, 3, sizeof(Child));
+ child = (Child *)allocateChildBlock(_currentPlayer, 3, sizeof(Child));
if (child == NULL)
error("player create failure");
- setUserFlag(_item1, 0, 0);
+ setUserFlag(_currentPlayer, 0, 0);
}
void SimonEngine::allocateStringTable(int num) {
@@ -1011,11 +1011,11 @@
case -3:
return _objectItem;
case -5:
- return getItem1Ptr();
+ return me();
case -7:
- return getItemPtrB();
+ return actor();
case -9:
- return derefItem(getItem1Ptr()->parent);
+ return derefItem(me()->parent);
default:
return derefItem(a);
}
@@ -1051,20 +1051,22 @@
case -7:
return 0;
case -9:
- return getItem1Ptr()->parent;
+ return me()->parent;
default:
return a;
}
}
-Item *SimonEngine::getItem1Ptr() {
- if (_item1)
- return _item1;
+Item *SimonEngine::me() {
+ if (_currentPlayer)
+ return _currentPlayer;
return _dummyItem1;
}
-Item *SimonEngine::getItemPtrB() {
- error("getItemPtrB: is this code ever used?");
+Item *SimonEngine::actor() {
+ error("actor: is this code ever used?");
+ //if (_actorPlayer)
+ // return _actorPlayer;
return _dummyItem1;
}
@@ -2080,18 +2082,18 @@
_objectItem = _hitAreaObjectItem;
if (_objectItem == _dummyItem2) {
- _objectItem = getItem1Ptr();
+ _objectItem = me();
}
if (_objectItem == _dummyItem3) {
- _objectItem = derefItem(getItem1Ptr()->parent);
+ _objectItem = derefItem(me()->parent);
}
_subjectItem = _hitAreaSubjectItem;
if (_subjectItem == _dummyItem2) {
- _subjectItem = getItem1Ptr();
+ _subjectItem = me();
}
if (_subjectItem == _dummyItem3) {
- _subjectItem = derefItem(getItem1Ptr()->parent);
+ _subjectItem = derefItem(me()->parent);
}
if (_subjectItem) {
@@ -2817,7 +2819,7 @@
if (item == NULL)
return true;
- return getItem1Ptr()->parent == item->parent;
+ return me()->parent == item->parent;
}
bool SimonEngine::itemIsParentOf(uint16 a, uint16 b) {
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-19 11:05:47 UTC (rev 22034)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-19 11:54:38 UTC (rev 22035)
@@ -279,7 +279,7 @@
WindowBlock *_textWindow;
Item *_subjectItem, *_objectItem;
- Item *_item1;
+ Item *_currentPlayer;
Item *_hitAreaObjectItem;
HitArea *_lastHitArea;
@@ -522,8 +522,8 @@
Item *getNextItemPtr();
uint getNextItemID();
uint getItem1ID() {return 1;}
- Item *getItem1Ptr();
- Item *getItemPtrB();
+ Item *me();
+ Item *actor();
byte getByte();
int getNextWord();
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