From cac9a090e7fad2a9d8951b969816d0199c7133a8 Mon Sep 17 00:00:00 2001 From: johndoe123 Date: Fri, 16 Sep 2011 12:30:49 +0000 Subject: NEVERHOOD: Use insertStaticSprite --- engines/neverhood/module1200.cpp | 22 +++++++++--------- engines/neverhood/module1300.cpp | 48 ++++++++++++++++++++-------------------- engines/neverhood/module1400.cpp | 18 +++++++-------- engines/neverhood/module1700.cpp | 4 ++-- engines/neverhood/module2000.cpp | 2 +- engines/neverhood/module3000.cpp | 2 +- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp index 163fc63a15..5a564ccfa1 100644 --- a/engines/neverhood/module1200.cpp +++ b/engines/neverhood/module1200.cpp @@ -816,16 +816,16 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) _asTape = addSprite(new AsScene1201Tape(_vm, this, 3, 1100, 243, 340, 0x9148A011)); _vm->_collisionMan->addSprite(_asTape); - tempSprite = addSprite(new StaticSprite(_vm, 0x03C82530, 100)); + tempSprite = insertStaticSprite(0x03C82530, 100); topY1 = tempSprite->getY() + tempSprite->getSurface()->getDrawRect().height; - tempSprite = addSprite(new StaticSprite(_vm, 0x88182069, 200)); + tempSprite = insertStaticSprite(0x88182069, 200); topY2 = tempSprite->getY() + tempSprite->getSurface()->getDrawRect().height; - tempSprite = addSprite(new StaticSprite(_vm, 0x476014E0, 300)); + tempSprite = insertStaticSprite(0x476014E0, 300); topY3 = tempSprite->getY() + tempSprite->getSurface()->getDrawRect().height; - tempSprite = addSprite(new StaticSprite(_vm, 0x04063110, 500)); + tempSprite = insertStaticSprite(0x04063110, 500); topY4 = tempSprite->getY() + 1; _class466 = addSprite(new Class466(_vm, getGlobalVar(0x000CF819) && which != 1)); @@ -834,12 +834,12 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) _class466->getSurface()->getClipRect().x2 = 640; _class466->getSurface()->getClipRect().y2 = 480; - addSprite(new StaticSprite(_vm, 0x400B04B0, 1200)); + insertStaticSprite(0x400B04B0, 1200); - tempSprite = addSprite(new StaticSprite(_vm, 0x40295462, 1200)); + tempSprite = insertStaticSprite(0x40295462, 1200); x1 = tempSprite->getX(); - tempSprite = addSprite(new StaticSprite(_vm, 0xA29223FA, 1200)); + tempSprite = insertStaticSprite(0xA29223FA, 1200); x2 = tempSprite->getX() + tempSprite->getSurface()->getDrawRect().width; class464 = addSprite(new Class464(_vm)); @@ -892,7 +892,7 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) } if (getGlobalVar(0x000CF819)) { - addSprite(new StaticSprite(_vm, 0x10002ED8, 500)); + insertStaticSprite(0x10002ED8, 500); if (!getGlobalVar(0x0A18CA33)) { AsScene1201TntMan *asTntMan; asTntMan = new AsScene1201TntMan(_vm, this, _class466, which == 1); @@ -940,7 +940,7 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) } else { - addSprite(new StaticSprite(_vm, 0x8E8A1981, 900)); + insertStaticSprite(0x8E8A1981, 900); uint32 tntIndex = 0; while (tntIndex < 18) { @@ -968,7 +968,7 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) } - tempSprite = addSprite(new StaticSprite(_vm, 0x63D400BC, 900)); + tempSprite = insertStaticSprite(0x63D400BC, 900); _asLeftDoor = addSprite(new AsScene1201LeftDoor(_vm, _klayman)); _asLeftDoor->getSurface()->getClipRect().x1 = x1; @@ -1207,7 +1207,7 @@ Scene1202::Scene1202(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_collisionMan->addSprite(_asTntItems[i]); } - addSprite(new StaticSprite(_vm, 0x8E8419C1, 1100)); + insertStaticSprite(0x8E8419C1, 1100); if (getGlobalVar(0x000CF819)) { SetMessageHandler(&Scene1202::handleMessage453D90); diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp index b8b7b8b54f..d148018d47 100644 --- a/engines/neverhood/module1300.cpp +++ b/engines/neverhood/module1300.cpp @@ -645,10 +645,10 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which) _mouseCursor = addSprite(new Mouse433(_vm, 0x643C0428, NULL)); _class595 = addSprite(new Class595(_vm, this)); - _sprite1 = addSprite(new StaticSprite(_vm, 0x942FC224, 300)); - _sprite2 = addSprite(new StaticSprite(_vm, 0x70430830, 1200)); + _sprite1 = insertStaticSprite(0x942FC224, 300); + _sprite2 = insertStaticSprite(0x70430830, 1200); _sprite2->getSurface()->setVisible(false); - _sprite3 = addSprite(new StaticSprite(_vm, 0x16E01E20, 1100)); + _sprite3 = insertStaticSprite(0x16E01E20, 1100); _asRing1 = addSprite(new AsScene1002Ring(_vm, this, false, 218, 122, _class595->getSurface()->getDrawRect().y, false)); _asRing2 = addSprite(new AsScene1002Ring(_vm, this, true, 218 + 32, 132, _class595->getSurface()->getDrawRect().y, getGlobalVar(0x13206309))); @@ -875,7 +875,7 @@ Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_collisionMan->addSprite(_asBalloon); } - _sprite1 = addSprite(new StaticSprite(_vm, 0xA014216B, 1100)); + _sprite1 = insertStaticSprite(0xA014216B, 1100); _klayman = new KmScene1303(_vm, this, 207, 332); addSprite(_klayman); @@ -958,9 +958,9 @@ Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which) _class544 = NULL; } - _sprite1 = addSprite(new StaticSprite(_vm, 0x0562E621, 1100)); - addSprite(new StaticSprite(_vm, 0x012AE033, 1100)); - addSprite(new StaticSprite(_vm, 0x090AF033, 1100)); + _sprite1 = insertStaticSprite(0x0562E621, 1100); + insertStaticSprite(0x012AE033, 1100); + insertStaticSprite(0x090AF033, 1100); if (which < 0) { _klayman = new KmScene1304(_vm, this, 217, 347); @@ -1148,9 +1148,9 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which) _asElevator = addSprite(new AsScene1306Elevator(_vm, this, _asElevatorDoor)); - _sprite1 = addSprite(new StaticSprite(_vm, 0x036A1EE0, 80)); + _sprite1 = insertStaticSprite(0x036A1EE0, 80); - addSprite(new StaticSprite(_vm, 0x00042313, 1100)); + insertStaticSprite(0x00042313, 1100); if (which < 0) { _klayman = new KmScene1306(_vm, this, 380, 440); @@ -1540,25 +1540,25 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule, int which) addEntity(_palette); _mouseCursor = addSprite(new Mouse435(_vm, 0x06204A88, 20, 620)); - tempSprite = addSprite(new StaticSprite(_vm, 0x00A3621C, 800)); + tempSprite = insertStaticSprite(0x00A3621C, 800); _clipRects[0].x1 = tempSprite->getSurface()->getDrawRect().x; _clipRects[0].y1 = 0; _clipRects[0].x2 = 640; _clipRects[0].y2 = 480; - tempSprite = addSprite(new StaticSprite(_vm, 0x00A3641C, 600)); + tempSprite = insertStaticSprite(0x00A3641C, 600); _clipRects[1].x1 = tempSprite->getSurface()->getDrawRect().x; _clipRects[1].y1 = 0; _clipRects[1].x2 = 640; _clipRects[1].y2 = 480; - tempSprite = addSprite(new StaticSprite(_vm, 0x00A3681C, 400)); + tempSprite = insertStaticSprite(0x00A3681C, 400); _clipRects[2].x1 = tempSprite->getSurface()->getDrawRect().x; _clipRects[2].y1 = 0; _clipRects[2].x2 = 640; _clipRects[2].y2 = 480; - tempSprite = addSprite(new StaticSprite(_vm, 0x00A3701C, 200)); + tempSprite = insertStaticSprite(0x00A3701C, 200); _clipRects[3].x1 = tempSprite->getSurface()->getDrawRect().x; _clipRects[3].y1 = 0; _clipRects[3].x2 = 640; @@ -1866,7 +1866,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) addSprite(new AnimatedSprite(_vm, 0x461A1490, 200, 235, 429)); } - _sprite1 = addSprite(new StaticSprite(_vm, 0x0A042060, 1100)); + _sprite1 = insertStaticSprite(0x0A042060, 1100); _class549 = addSprite(new Class549(_vm, this)); _class593 = addSprite(new Class593(_vm, this)); @@ -1874,28 +1874,28 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) _class601_2 = addSprite(new Class601(_vm, kScene1308FileHashes[getSubVar(0x0C10A000, 0)], 1)); _class601_2 = addSprite(new Class601(_vm, kScene1308FileHashes[getSubVar(0x0C10A000, 2)], 2)); - _sprite2 = addSprite(new StaticSprite(_vm, 0x40043120, 995)); - _sprite3 = addSprite(new StaticSprite(_vm, 0x43003100, 995)); + _sprite2 = insertStaticSprite(0x40043120, 995); + _sprite3 = insertStaticSprite(0x43003100, 995); _sprite4 = NULL; if (which < 0) { _klayman = new KmScene1308(_vm, this, 380, 440); setMessageList(0x004B57C0); if (getGlobalVar(0x80455A41)) { - _sprite4 = addSprite(new StaticSprite(_vm, 0x0101A624, 1100)); + _sprite4 = insertStaticSprite(0x0101A624, 1100); setRectList(0x004B5990); } else { - _sprite5 = addSprite(new StaticSprite(_vm, 0x080811A0, 100)); + _sprite5 = insertStaticSprite(0x080811A0, 100); setRectList(0x004B5980); } } else if (which == 1) { _klayman = new KmScene1308(_vm, this, 640, 440); setMessageList(0x004B57C8); if (getGlobalVar(0x80455A41)) { - _sprite4 = addSprite(new StaticSprite(_vm, 0x0101A624, 1100)); + _sprite4 = insertStaticSprite(0x0101A624, 1100); setRectList(0x004B5990); } else { - _sprite5 = addSprite(new StaticSprite(_vm, 0x080811A0, 100)); + _sprite5 = insertStaticSprite(0x080811A0, 100); setRectList(0x004B5980); } } else if (which == 2) { @@ -1903,10 +1903,10 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) setMessageList(0x004B58B0); if (getGlobalVar(0x80455A41)) { _sprite5 = addSprite(new Class592(_vm, this)); - _sprite4 = addSprite(new StaticSprite(_vm, 0x0101A624, 1100)); + _sprite4 = insertStaticSprite(0x0101A624, 1100); _sprite4->getSurface()->setVisible(false); } else { - _sprite5 = addSprite(new StaticSprite(_vm, 0x080811A0, 100)); + _sprite5 = insertStaticSprite(0x080811A0, 100); setRectList(0x004B5980); } } else { @@ -1915,10 +1915,10 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) sendMessage(_class549, 0x4808, 0); _sprite1->getSurface()->setVisible(false); if (getGlobalVar(0x80455A41)) { - _sprite4 = addSprite(new StaticSprite(_vm, 0x0101A624, 1100)); + _sprite4 = insertStaticSprite(0x0101A624, 1100); _klayman->getSurface()->setVisible(false); } else { - _sprite5 = addSprite(new StaticSprite(_vm, 0x080811A0, 100)); + _sprite5 = insertStaticSprite(0x080811A0, 100); _klayman->getSurface()->setVisible(false); } } diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp index 60e52794f7..5dc74787a1 100644 --- a/engines/neverhood/module1400.cpp +++ b/engines/neverhood/module1400.cpp @@ -769,11 +769,11 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which) _class527 = addSprite(new Class527(_vm, _class525)); } - _sprite3 = addSprite(new StaticSprite(_vm, 0xA82BA811, 1100)); - addSprite(new StaticSprite(_vm, 0x0A116C60, 1100)); + _sprite3 = insertStaticSprite(0xA82BA811, 1100); + insertStaticSprite(0x0A116C60, 1100); _ssButton = addSprite(new SsCommonButtonSprite(_vm, this, 0xB84B1100, 100, 0)); - _sprite1 = addSprite(new StaticSprite(_vm, 0x38EA100C, 1005)); - _sprite2 = addSprite(new StaticSprite(_vm, 0x98D0223C, 1200)); + _sprite1 = insertStaticSprite(0x38EA100C, 1005); + _sprite2 = insertStaticSprite(0x98D0223C, 1200); _sprite2->getSurface()->setVisible(false); if (which < 0) { @@ -1388,7 +1388,7 @@ Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule, int which) _mouseCursor = addSprite(new Mouse435(_vm, 0x4222100C, 20, 620)); _asMouse = addSprite(new AsScene1407Mouse(_vm, this)); - _ssResetButton = addSprite(new StaticSprite(_vm, 0x12006600, 100)); + _ssResetButton = insertStaticSprite(0x12006600, 100); _ssResetButton->getSurface()->setVisible(false); } @@ -1453,12 +1453,12 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which) _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x0A230219, NULL)); - _class401_1 = addSprite(new StaticSprite(_vm, 0x01102A33, 100)); + _class401_1 = insertStaticSprite(0x01102A33, 100); _class401_1->getSurface()->setVisible(false); - _class401_2 = addSprite(new StaticSprite(_vm, 0x04442520, 995)); + _class401_2 = insertStaticSprite(0x04442520, 995); - _class401_3 = addSprite(new StaticSprite(_vm, 0x08742271, 995)); + _class401_3 = insertStaticSprite(0x08742271, 995); _asTape1 = new AsScene1201Tape(_vm, this, 12, 1100, 201, 468, 0x9148A011); addSprite(_asTape1); @@ -1583,7 +1583,7 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_collisionMan->addSprite(_class545); } - _sprite1 = addSprite(new StaticSprite(_vm, 0x1900A1F8, 1100)); + _sprite1 = insertStaticSprite(0x1900A1F8, 1100); _asTape = addSprite(new AsScene1201Tape(_vm, this, 14, 1100, 281, 411, 0x9148A011)); _vm->_collisionMan->addSprite(_asTape); diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/module1700.cpp index b281b38464..30fe95297b 100644 --- a/engines/neverhood/module1700.cpp +++ b/engines/neverhood/module1700.cpp @@ -254,7 +254,7 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which) addSprite(new Class602(_vm, kScene1705FileHashes[getSubVar(0x0A4C0A9A, 1)], 1)); addSprite(new Class602(_vm, kScene1705FileHashes[getSubVar(0x0A4C0A9A, 2)], 2)); - _sprite = addSprite(new StaticSprite(_vm, 0x31313A22, 1100)); + _sprite = insertStaticSprite(0x31313A22, 1100); _class606 = addSprite(new Class606(_vm, this, 15, 1100, 238, 439, 0x02363852)); _vm->_collisionMan->addSprite(_class606); @@ -301,7 +301,7 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which) sendMessage(_klayman, 0x2000, 0); setMessageList(0x004B69F0); sendMessage(this, 0x2000, 0); - tempSprite = addSprite(new StaticSprite(_vm, 0x30303822, 1100)); + tempSprite = insertStaticSprite(0x30303822, 1100); _klayman->getSurface()->getClipRect().x1 = 0; _klayman->getSurface()->getClipRect().y1 = tempSprite->getSurface()->getDrawRect().y; _klayman->getSurface()->getClipRect().x2 = _sprite->getSurface()->getDrawRect().x + _sprite->getSurface()->getDrawRect().width; diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/module2000.cpp index 1af7799196..ecd4e705a3 100644 --- a/engines/neverhood/module2000.cpp +++ b/engines/neverhood/module2000.cpp @@ -139,7 +139,7 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which) _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x17240A6C, NULL)); - _class401 = addSprite(new StaticSprite(_vm, 0x0D641724, 1100)); + _class401 = insertStaticSprite(0x0D641724, 1100); if (which < 0) { _klayman = new KmScene2001(_vm, this, 300, 345); diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp index 2c819a459e..009895cb25 100644 --- a/engines/neverhood/module3000.cpp +++ b/engines/neverhood/module3000.cpp @@ -1000,7 +1000,7 @@ Scene3009::Scene3009(NeverhoodEngine *vm, Module *parentModule, int which) _smackerPlayer->setDrawPos(89, 37); _palette->usePalette(); - addSprite(new StaticSprite(_vm, 0x8540252C, 400)); + insertStaticSprite(0x8540252C, 400); for (int i = 0; i < 2; i++) { _ssSymbolEdges[i] = new SsScene3009SymbolEdges(_vm, i); -- cgit v1.2.3