thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r8509
This commit is contained in:
Max Horn 2003-06-15 13:07:06 +00:00
parent 9ef0657c5c
commit e6455a9dd2
4 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
simon/items.cpp
View file

@ -1145,7 +1145,6 @@ int SimonEngine::startSubroutine(Subroutine *sub) {
} }
int SimonEngine::startSubroutineEx(Subroutine *sub) { int SimonEngine::startSubroutineEx(Subroutine *sub) {
_item_1_ptr = _item_1;
return startSubroutine(sub); return startSubroutine(sub);
} }

1
simon/res.cpp
View file

@ -114,7 +114,6 @@ void SimonEngine::loadGamePcFile(const char *filename) {
num_inited_objects = allocGamePcVars(&in); num_inited_objects = allocGamePcVars(&in);
allocItem1();
loginPlayer(); loginPlayer();
readGamePcText(&in); readGamePcText(&in);

32
simon/simon.cpp
View file

@ -268,8 +268,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_subject_item = 0; _subject_item = 0;
_object_item = 0; _object_item = 0;
_item_1_ptr = 0;
_item_ptr_B = 0;
_item_1 = 0; _item_1 = 0;
_hitarea_object_item = 0; _hitarea_object_item = 0;
@ -522,7 +520,7 @@ int SimonEngine::allocGamePcVars(File *in) {
_itemarray_size = item_array_size; _itemarray_size = item_array_size;
_itemarray_inited = item_array_inited; _itemarray_inited = item_array_inited;
for (i = 2; i != item_array_inited; i++) { for (i = 1; i < item_array_inited; i++) {
_itemarray_ptr[i] = (Item *)allocateItem(sizeof(Item)); _itemarray_ptr[i] = (Item *)allocateItem(sizeof(Item));
} }
@ -533,12 +531,6 @@ int SimonEngine::allocGamePcVars(File *in) {
return item_array_inited; return item_array_inited;
} }
Item *SimonEngine::allocItem1() {
Item *item = (Item *)allocateItem(sizeof(Item));
_itemarray_ptr[1] = item;
return item;
}
void SimonEngine::loginPlayerHelper(Item *item, int a, int b) { void SimonEngine::loginPlayerHelper(Item *item, int a, int b) {
Child9 *child; Child9 *child;
@ -552,19 +544,17 @@ void SimonEngine::loginPlayerHelper(Item *item, int a, int b) {
} }
void SimonEngine::loginPlayer() { void SimonEngine::loginPlayer() {
Item *item;
Child *child; Child *child;
item = _itemarray_ptr[1]; _item_1 = _itemarray_ptr[1];
item->unk2 = -1; _item_1->unk2 = -1;
item->unk1 = 10000; _item_1->unk1 = 10000;
_item_1 = item;
child = (Child *)allocateChildBlock(item, 3, sizeof(Child)); child = (Child *)allocateChildBlock(_item_1, 3, sizeof(Child));
if (child == NULL) if (child == NULL)
error("player create failure"); error("player create failure");
loginPlayerHelper(item, 0, 0); loginPlayerHelper(_item_1, 0, 0);
} }
void SimonEngine::allocateStringTable(int num) { void SimonEngine::allocateStringTable(int num) {
@ -808,15 +798,13 @@ uint SimonEngine::getNextItemID() {
} }
Item *SimonEngine::getItem1Ptr() { Item *SimonEngine::getItem1Ptr() {
if (_item_1_ptr) if (_item_1)
return _item_1_ptr; return _item_1;
return _dummy_item_1; return _dummy_item_1;
} }
Item *SimonEngine::getItemPtrB() { Item *SimonEngine::getItemPtrB() {
error("getItemPtrB: is this code ever used?"); error("getItemPtrB: is this code ever used?");
if (_item_ptr_B)
return _item_ptr_B;
return _dummy_item_1; return _dummy_item_1;
} }
@ -1294,11 +1282,9 @@ void SimonEngine::invokeTimeEvent(TimeEvent *te) {
} }
void SimonEngine::o_setup_cond_c() { void SimonEngine::o_setup_cond_c() {
Item *item = _item_1;
setup_cond_c_helper(); setup_cond_c_helper();
_item_1_ptr = item;
_object_item = _hitarea_object_item; _object_item = _hitarea_object_item;
if (_object_item == _dummy_item_2) if (_object_item == _dummy_item_2)
@ -1940,8 +1926,6 @@ void SimonEngine::handle_verb_clicked(uint verb) {
Subroutine *sub; Subroutine *sub;
int result; int result;
_item_1_ptr = _item_1;
_object_item = _hitarea_object_item; _object_item = _hitarea_object_item;
if (_object_item == _dummy_item_2) { if (_object_item == _dummy_item_2) {
_object_item = getItem1Ptr(); _object_item = getItem1Ptr();

3
simon/simon.h
View file

@ -204,7 +204,7 @@ protected:
FillOrCopyStruct *_fcs_ptr_1; FillOrCopyStruct *_fcs_ptr_1;
Item *_subject_item, *_object_item; Item *_subject_item, *_object_item;
Item *_item_1_ptr, *_item_ptr_B; Item *_item_1_ptr;
Item *_item_1; Item *_item_1;
Item *_hitarea_object_item; Item *_hitarea_object_item;
@ -360,7 +360,6 @@ public:
protected: protected:
int allocGamePcVars(File *in); int allocGamePcVars(File *in);
Item *allocItem1();
void loginPlayerHelper(Item *item, int a, int b); void loginPlayerHelper(Item *item, int a, int b);
void loginPlayer(); void loginPlayer();
void allocateStringTable(int num); void allocateStringTable(int num);