From 5d63bef6a25a990603444026a8cb033108410019 Mon Sep 17 00:00:00 2001 From: johndoe123 Date: Fri, 16 Sep 2011 13:38:19 +0000 Subject: NEVERHOOD: Use setBackground --- engines/neverhood/module1000.cpp | 12 ++++++------ engines/neverhood/module1200.cpp | 6 +++--- engines/neverhood/module1300.cpp | 10 +++++----- engines/neverhood/module1400.cpp | 10 +++++----- engines/neverhood/module1500.cpp | 2 +- engines/neverhood/module1700.cpp | 2 +- engines/neverhood/module2000.cpp | 2 +- engines/neverhood/module2200.cpp | 28 ++++++++++++++-------------- engines/neverhood/module3000.cpp | 6 +++--- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp index 7c3c3ba138..1e5b0765ea 100644 --- a/engines/neverhood/module1000.cpp +++ b/engines/neverhood/module1000.cpp @@ -403,7 +403,7 @@ Scene1001::Scene1001(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_collisionMan->setHitRects(0x004B4860); _surfaceFlag = false; - _background = addBackground(new DirtyBackground(_vm, 0x4086520E, 0, 0)); + setBackground(0x4086520E); _palette = new Palette(_vm, 0x4086520E); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x6520A400, NULL)); @@ -1406,7 +1406,7 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x12C23307, 0, 0)); + setBackground(0x12C23307); _palette = new Palette(_vm, 0x12C23307); _palette->usePalette(); @@ -1686,7 +1686,7 @@ Class152::Class152(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundF SetMessageHandler(&Class152::handleMessage); - _background = addBackground(new DirtyBackground(_vm, backgroundFileHash, 0, 0)); + setBackground(backgroundFileHash); _palette = new Palette(_vm, backgroundFileHash); _palette->usePalette(); _mouseCursor = addSprite(new Mouse435(_vm, cursorFileHash, 20, 620)); @@ -1748,7 +1748,7 @@ Scene1004::Scene1004(NeverhoodEngine *vm, Module *parentModule, int which) SetUpdateHandler(&Scene1004::update); SetMessageHandler(&Scene1004::handleMessage); - _background = addBackground(new DirtyBackground(_vm, 0x50C03005, 0, 0)); + setBackground(0x50C03005); if (getGlobalVar(0x0D0A14D10)) { palette2 = new Palette2(_vm, 0xA30BA329); @@ -1850,13 +1850,13 @@ Scene1005::Scene1005(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; if (getGlobalVar(0xD0A14D10)) { - _background = addBackground(new DirtyBackground(_vm, 0x2800E011, 0, 0)); + setBackground(0x2800E011); _palette = new Palette(_vm, 0x2800E011); _palette->usePalette(); insertStaticSprite(0x492D5AD7, 100); _mouseCursor = addSprite(new Mouse435(_vm, 0x0E015288, 20, 620)); } else { - _background = addBackground(new DirtyBackground(_vm, 0x8870A546, 0, 0)); + setBackground(0x8870A546); _palette = new Palette(_vm, 0x8870A546); _palette->usePalette(); insertStaticSprite(0x40D1E0A9, 100); diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp index 212fc874c6..a12f1cca09 100644 --- a/engines/neverhood/module1200.cpp +++ b/engines/neverhood/module1200.cpp @@ -878,12 +878,12 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) _klayman->setRepl(64, 0); if (getGlobalVar(0x0A310817) && !getGlobalVar(0x0A18CA33)) { - _background = addBackground(new DirtyBackground(_vm, 0x4019A2C4, 0, 0)); + setBackground(0x4019A2C4); _palette = new Palette(_vm, 0x4019A2C4); _palette->usePalette(); _asRightDoor = NULL; } else { - _background = addBackground(new DirtyBackground(_vm, 0x40206EC5, 0, 0)); + setBackground(0x40206EC5); _palette = new Palette(_vm, 0x40206EC5); _palette->usePalette(); _asRightDoor = addSprite(new AsScene1201RightDoor(_vm, _klayman, which == 2)); @@ -1188,7 +1188,7 @@ Scene1202::Scene1202(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x60210ED5, 0, 0)); + setBackground(0x60210ED5); palette2 = new Palette2(_vm, 0x60210ED5); palette2->usePalette(); diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp index 8085eb681c..46597e0b78 100644 --- a/engines/neverhood/module1300.cpp +++ b/engines/neverhood/module1300.cpp @@ -639,7 +639,7 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_collisionMan->setHitRects(0x004B0858); setRectList(0x004B0A38); - _background = addBackground(new DirtyBackground(_vm, 0x420643C4, 0, 0)); + setBackground(0x420643C4); _palette = new Palette(_vm, 0x420643C4); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x643C0428, NULL)); @@ -1007,7 +1007,7 @@ Scene1305::Scene1305(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene1305::handleMessage); setRectList(0x004B6E98); - _background = addBackground(new DirtyBackground(_vm, 0x28801B64, 0, 0)); + setBackground(0x28801B64); _palette = new Palette(_vm, 0x28801B64); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x01B60280, NULL)); @@ -1123,7 +1123,7 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; SetMessageHandler(&Scene1306::handleMessage); - _background = addBackground(new DirtyBackground(_vm, 0x05303114, 0, 0)); + setBackground(0x05303114); _palette = new Palette(_vm, 0x05303114); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x0311005B, NULL)); @@ -1529,7 +1529,7 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene1307::handleMessage); SetUpdateHandler(&Scene1307::update); - _background = addBackground(new DirtyBackground(_vm, 0xA8006200, 0, 0)); + setBackground(0xA8006200); _palette = new Palette(_vm, 0xA8006200); _palette->usePalette(); addEntity(_palette); @@ -1848,7 +1848,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; SetMessageHandler(&Scene1308::handleMessage); - _background = addBackground(new DirtyBackground(_vm, 0x41024202, 0, 0)); + setBackground(0x41024202); _palette = new Palette(_vm, 0x41024202); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x24206418, NULL)); diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp index b4f07447d1..4dac2a76be 100644 --- a/engines/neverhood/module1400.cpp +++ b/engines/neverhood/module1400.cpp @@ -756,7 +756,7 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B6758); _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x08221FA5, 0, 0)); + setBackground(0x08221FA5); _palette = new Palette(_vm, 0x08221FA5); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x21FA108A, NULL)); @@ -1380,7 +1380,7 @@ Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene1407::handleMessage); SetUpdateHandler(&Scene1407::update); - _background = addBackground(new DirtyBackground(_vm, 0x00442225, 0, 0)); + setBackground(0x00442225); _palette = new Palette(_vm, 0x00442225); _palette->usePalette(); _mouseCursor = addSprite(new Mouse435(_vm, 0x4222100C, 20, 620)); @@ -1446,7 +1446,7 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B1FF8); _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x2110A234, 0, 0)); + setBackground(0x2110A234); _palette = new Palette(_vm, 0x2110A234); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x0A230219, NULL)); @@ -1569,7 +1569,7 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B8D80); - _background = addBackground(new DirtyBackground(_vm, 0xAC0B006F, 0, 0)); + setBackground(0xAC0B006F); _palette = new Palette(_vm, 0xAC0B006F); _palette->addPalette(0x00801510, 0, 65, 0); _palette->usePalette(); @@ -1784,7 +1784,7 @@ Scene1405::Scene1405(NeverhoodEngine *vm, Module *parentModule, int which) _vm->gameModule()->initScene1405Vars(); _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x0C0C007D, 0, 0)); + setBackground(0x0C0C007D); _palette = new Palette(_vm, 0x0C0C007D); _palette->usePalette(); _mouseCursor = addSprite(new Mouse435(_vm, 0xC00790C8, 20, 620)); diff --git a/engines/neverhood/module1500.cpp b/engines/neverhood/module1500.cpp index 40b15b3622..a014844e87 100644 --- a/engines/neverhood/module1500.cpp +++ b/engines/neverhood/module1500.cpp @@ -118,7 +118,7 @@ Scene1501::Scene1501(NeverhoodEngine *vm, Module *parentModule, uint32 backgroun _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, backgroundFileHash, 0, 0)); + setBackground(backgroundFileHash); palette2 = new Palette2(_vm); palette2->usePalette(); diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/module1700.cpp index 43a30f9b22..a36d35816e 100644 --- a/engines/neverhood/module1700.cpp +++ b/engines/neverhood/module1700.cpp @@ -239,7 +239,7 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x03118226, 0, 0)); + setBackground(0x03118226); palette2 = new Palette2(_vm, 0x03118226); palette2->addPalette(0x91D3A391, 0, 64, 0); diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/module2000.cpp index bca54eb1f0..2b6a647885 100644 --- a/engines/neverhood/module2000.cpp +++ b/engines/neverhood/module2000.cpp @@ -134,7 +134,7 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; SetMessageHandler(&Scene2001::handleMessage); - _background = addBackground(new DirtyBackground(_vm, 0xA6417244, 0, 0)); + setBackground(0xA6417244); _palette = new Palette(_vm, 0xA6417244); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x17240A6C, NULL)); diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp index 27fb21ac6f..62aec282c7 100644 --- a/engines/neverhood/module2200.cpp +++ b/engines/neverhood/module2200.cpp @@ -1507,7 +1507,7 @@ Scene2201::Scene2201(NeverhoodEngine *vm, Module *parentModule, int which) loadDataResource(0x04104242); loadHitRectList(); - _background = addBackground(new DirtyBackground(_vm, 0x40008208, 0, 0)); + setBackground(0x40008208); _palette = new Palette(_vm, 0x40008208); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x0820C408, NULL)); @@ -1892,7 +1892,7 @@ Scene2202::Scene2202(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x08100A0C, 0, 0)); + setBackground(0x08100A0C); palette2 = new Palette2(_vm, 0x08100A0C); _palette = palette2; _palette->usePalette(); @@ -2123,7 +2123,7 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene2203::handleMessage); _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x82C80334, 0, 0)); + setBackground(0x82C80334); _palette = new Palette(_vm, 0x82C80334); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x80330824, NULL)); @@ -2288,7 +2288,7 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(0x4D080E54)) { _isLightOn = true; - _background = addBackground(new DirtyBackground(_vm, 0x0008028D, 0, 0)); + setBackground(0x0008028D); palette2 = new Palette2(_vm, 0x0008028D); _palette = palette2; _palette->usePalette(); @@ -2298,7 +2298,7 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which) addSprite(_ssLightSwitch); } else { _isLightOn = false; - _background = addBackground(new DirtyBackground(_vm, 0xD00A028D, 0, 0)); + setBackground(0xD00A028D); palette2 = new Palette2(_vm, 0xD00A028D); _palette = palette2; _palette->usePalette(); @@ -2587,7 +2587,7 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which) _class604->getSurface()->getClipRect().x2 = _sprite3->getSurface()->getDrawRect().x + _sprite3->getSurface()->getDrawRect().width; _class604->getSurface()->getClipRect().y2 = _sprite1->getSurface()->getDrawRect().y + _sprite1->getSurface()->getDrawRect().height; - _background = addBackground(new DirtyBackground(_vm, fileHash, 0, 0)); + setBackground(fileHash); palette2 = new Palette2(_vm, fileHash); _palette = palette2; @@ -3074,7 +3074,7 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(0x4D080E54)) { - _background = addBackground(new DirtyBackground(_vm, 0x88C00241, 0, 0)); + setBackground(0x88C00241); _palette = new Palette(_vm, 0x88C00241); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x00245884, NULL)); @@ -3116,7 +3116,7 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which) setGlobalVar(0x81890D14, 1); - _background = addBackground(new DirtyBackground(_vm, 0x05C02A55, 0, 0)); + setBackground(0x05C02A55); _palette = new Palette(_vm, 0x05C02A55); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x02A51054, NULL)); @@ -3492,13 +3492,13 @@ Scene2242::Scene2242(NeverhoodEngine *vm, Module *parentModule, int which) SetUpdateHandler(&Scene2242::update); if (getGlobalVar(0x4D080E54)) { - _background = addBackground(new DirtyBackground(_vm, 0x11840E24, 0, 0)); + setBackground(0x11840E24); _palette = new Palette(_vm, 0x11840E24); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x40E20110, NULL)); setRectList(0x004B3DC8); } else { - _background = addBackground(new DirtyBackground(_vm, 0x25848E24, 0, 0)); + setBackground(0x25848E24); palette2 = new Palette2(_vm, 0x25848E24); _palette = palette2; _palette->usePalette(); @@ -3631,13 +3631,13 @@ HallOfRecordsScene::HallOfRecordsScene(NeverhoodEngine *vm, Module *parentModule if (!getGlobalVar(0x4D080E54) && _sceneInfo140->bgFilename2) { setRectList(0x004B2BF8); - _background = addBackground(new DirtyBackground(_vm, _sceneInfo140->bgFilename2, 0, 0)); + setBackground(_sceneInfo140->bgFilename2); _palette = new Palette(_vm, _sceneInfo140->bgFilename2); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x14320138, NULL)); } else { setRectList(0x004B2BB8); - _background = addBackground(new DirtyBackground(_vm, _sceneInfo140->bgFilename1, 0, 0)); + setBackground(_sceneInfo140->bgFilename1); _palette = new Palette(_vm, _sceneInfo140->bgFilename1); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x63A40028, NULL)); @@ -3728,13 +3728,13 @@ Scene2247::Scene2247(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(0x4D080E54)) { setRectList(0x004B5588); - _background = addBackground(new DirtyBackground(_vm, 0x40339414, 0, 0)); + setBackground(0x40339414); _palette = new Palette(_vm, 0x40339414); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x3941040B, NULL)); } else { setRectList(0x004B55C8); - _background = addBackground(new DirtyBackground(_vm, 0x071963E5, 0, 0)); + setBackground(0x071963E5); _palette = new Palette(_vm, 0x071963E5); _palette->usePalette(); _mouseCursor = addSprite(new Mouse433(_vm, 0x14320138, NULL)); diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp index 009895cb25..cc617a3fbc 100644 --- a/engines/neverhood/module3000.cpp +++ b/engines/neverhood/module3000.cpp @@ -971,7 +971,7 @@ Scene3009::Scene3009(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_screen->clear(); - _background = addBackground(new DirtyBackground(_vm, 0xD000420C, 0, 0)); + setBackground(0xD000420C); _palette = new Palette(_vm, 0xD000420C); _mouseCursor = addSprite(new Mouse435(_vm, 0x04208D08, 20, 620)); @@ -1470,7 +1470,7 @@ Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which) _surfaceFlag = true; - _background = addBackground(new DirtyBackground(_vm, 0x80802626, 0, 0)); + setBackground(0x80802626); _palette = new Palette(_vm, 0x80802626); _palette->usePalette(); @@ -1724,7 +1724,7 @@ Scene3011::Scene3011(NeverhoodEngine *vm, Module *parentModule, int which) // TODO _vm->gameModule()->initScene3011Vars(); _index1 = getGlobalVar(0x2414C2F2); - _background = addBackground(new DirtyBackground(_vm, 0x92124A04, 0, 0)); + setBackground(0x92124A04); palette2 = new Palette2(_vm, 0xA4070114); addEntity(palette2); -- cgit v1.2.3