Skip to content

Commit

Permalink
NEVERHOOD: Remove Scene::_surfaceFlag which also is obsolete now
Browse files Browse the repository at this point in the history
  • Loading branch information
@johndoe123 @wjp
johndoe123 authored and wjp committed May 8, 2013
1 parent a238f57 commit a6e9475
Show file tree
Hide file tree
Showing 22 changed files with 1 addition and 99 deletions.
2 changes: 0 additions & 2 deletions engines/neverhood/diskplayerscene.cpp
View file
Expand Up @@ -334,8 +334,6 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int

int availableDisksCount = 0;

_surfaceFlag = true;

setBackground(0x8A000044);
setPalette(kDiskplayerPaletteFileHashes[paletteIndex]);

Expand Down
9 changes: 0 additions & 9 deletions engines/neverhood/module1000.cpp
View file
Expand Up @@ -339,7 +339,6 @@ Scene1001::Scene1001(NeverhoodEngine *vm, Module *parentModule, int which)
SetMessageHandler(&Scene1001::handleMessage);

setHitRects(0x004B4860);
_surfaceFlag = false;
setBackground(0x4086520E);
setPalette(0x4086520E);
insertMouse433(0x6520A400);
Expand Down Expand Up @@ -1279,8 +1278,6 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which)

setHitRects(0x004B4138);

_surfaceFlag = true;

setBackground(0x12C23307);
setPalette(0x12C23307);

Expand Down Expand Up @@ -1530,8 +1527,6 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam &param, Entit
StaticScene::StaticScene(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash)
: Scene(vm, parentModule, true) {

_surfaceFlag = false;

SetMessageHandler(&StaticScene::handleMessage);

setBackground(backgroundFileHash);
Expand Down Expand Up @@ -1588,8 +1583,6 @@ Scene1004::Scene1004(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite;

_surfaceFlag = true;

SetUpdateHandler(&Scene1004::update);
SetMessageHandler(&Scene1004::handleMessage);

Expand Down Expand Up @@ -1687,8 +1680,6 @@ Scene1005::Scene1005(NeverhoodEngine *vm, Module *parentModule, int which)

SetMessageHandler(&Scene1005::handleMessage);

_surfaceFlag = true;

if (getGlobalVar(V_ENTRANCE_OPEN)) {
setBackground(0x2800E011);
setPalette(0x2800E011);
Expand Down
2 changes: 0 additions & 2 deletions engines/neverhood/module1100.cpp
View file
Expand Up @@ -452,7 +452,6 @@ Scene1105::Scene1105(NeverhoodEngine *vm, Module *parentModule, int which)

_vm->gameModule()->initScene1405Vars();

_surfaceFlag = true;
SetUpdateHandler(&Scene1105::update);
SetMessageHandler(&Scene1105::handleMessage);

Expand Down Expand Up @@ -668,7 +667,6 @@ void Scene1105::update() {
Scene1109::Scene1109(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, which) {

_surfaceFlag = true;
SetMessageHandler(&Scene1109::handleMessage);

setBackground(0x8449E02F);
Expand Down
4 changes: 0 additions & 4 deletions engines/neverhood/module1200.cpp
View file
Expand Up @@ -726,8 +726,6 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which)

setHitRects(0x004AEBD0);

_surfaceFlag = true;

if (!getSubVar(VA_IS_PUZZLE_INIT, 0xE8058B52)) {
setSubVar(VA_IS_PUZZLE_INIT, 0xE8058B52, 1);
for (uint32 index = 0; index < 18; index++) {
Expand Down Expand Up @@ -1091,8 +1089,6 @@ Scene1202::Scene1202(NeverhoodEngine *vm, Module *parentModule, int which)
SetMessageHandler(&Scene1202::handleMessage);
SetUpdateHandler(&Scene1202::update);

_surfaceFlag = true;

setBackground(0x60210ED5);

setPalette(0x60210ED5);
Expand Down
6 changes: 0 additions & 6 deletions engines/neverhood/module1300.cpp
View file
Expand Up @@ -630,7 +630,6 @@ void AsScene1303Balloon::stPopBalloon() {
Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true) {

_surfaceFlag = true;
SetMessageHandler(&Scene1303::handleMessage);
setRectList(0x004AF9E8);

Expand Down Expand Up @@ -694,7 +693,6 @@ uint32 AsScene1304Needle::handleMessage(int messageNum, const MessageParam &para
Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true) {

_surfaceFlag = true;
SetMessageHandler(&Scene1304::handleMessage);
setRectList(0x004B91A8);

Expand Down Expand Up @@ -761,7 +759,6 @@ uint32 Scene1304::handleMessage(int messageNum, const MessageParam &param, Entit
Scene1305::Scene1305(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true) {

_surfaceFlag = true;
SetMessageHandler(&Scene1305::handleMessage);
setRectList(0x004B6E98);

Expand Down Expand Up @@ -876,7 +873,6 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
setGlobalVar(V_KEY3_LOCATION, 4);

_surfaceFlag = true;
SetMessageHandler(&Scene1306::handleMessage);

setBackground(0x05303114);
Expand Down Expand Up @@ -1275,7 +1271,6 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule, int which)
_keyHoleRects[i].y2 = pt.y + 15;
}

_surfaceFlag = true;
SetMessageHandler(&Scene1307::handleMessage);
SetUpdateHandler(&Scene1307::update);

Expand Down Expand Up @@ -1575,7 +1570,6 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)

_vm->gameModule()->initScene1307Vars();

_surfaceFlag = true;
SetMessageHandler(&Scene1308::handleMessage);

setBackground(0x41024202);
Expand Down
6 changes: 0 additions & 6 deletions engines/neverhood/module1400.cpp
View file
Expand Up @@ -647,7 +647,6 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
SetMessageHandler(&Scene1401::handleMessage);
SetUpdateHandler(&Scene1401::update);
setRectList(0x004B6758);
_surfaceFlag = true;

setBackground(0x08221FA5);
setPalette(0x08221FA5);
Expand Down Expand Up @@ -1243,8 +1242,6 @@ void AsScene1407Mouse::stArriveAtHole() {
Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true), _puzzleSolvedCountdown(0), _resetButtonCountdown(0) {

_surfaceFlag = true;

SetMessageHandler(&Scene1407::handleMessage);
SetUpdateHandler(&Scene1407::update);

Expand Down Expand Up @@ -1307,7 +1304,6 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which)
SetMessageHandler(&Scene1403::handleMessage);

setRectList(0x004B1FF8);
_surfaceFlag = true;

setBackground(0x2110A234);
setPalette(0x2110A234);
Expand Down Expand Up @@ -1418,7 +1414,6 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which)
setGlobalVar(V_KEY3_LOCATION, 5);

SetMessageHandler(&Scene1404::handleMessage);
_surfaceFlag = true;

setRectList(0x004B8D80);

Expand Down Expand Up @@ -1590,7 +1585,6 @@ Scene1405::Scene1405(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true), _selectFirstTile(true), _tilesLeft(48), _countdown(0) {

_vm->gameModule()->initScene1405Vars();
_surfaceFlag = true;

setBackground(0x0C0C007D);
setPalette(0x0C0C007D);
Expand Down
2 changes: 0 additions & 2 deletions engines/neverhood/module1500.cpp
View file
Expand Up @@ -88,8 +88,6 @@ Scene1501::Scene1501(NeverhoodEngine *vm, Module *parentModule, uint32 backgroun
SetUpdateHandler(&Scene1501::update);
SetMessageHandler(&Scene1501::handleMessage);

_surfaceFlag = true;

setBackground(backgroundFileHash);

setPalette();
Expand Down
2 changes: 0 additions & 2 deletions engines/neverhood/module1600.cpp
View file
Expand Up @@ -1076,7 +1076,6 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which)

setGlobalVar(V_CAR_DELTA_X, 1);

_surfaceFlag = true;
SetMessageHandler(&Scene1608::hmLowerFloor);

_asKey = insertSprite<AsCommonKey>(this, 1, 1100, 198, 220);
Expand Down Expand Up @@ -1396,7 +1395,6 @@ Scene1609::Scene1609(NeverhoodEngine *vm, Module *parentModule, int which)
// TODO _vm->gameModule()->initScene3011Vars();
_noisySymbolIndex = getGlobalVar(V_NOISY_SYMBOL_INDEX);

_surfaceFlag = true;
SetMessageHandler(&Scene1609::handleMessage);
SetUpdateHandler(&Scene1609::update);

Expand Down
2 changes: 0 additions & 2 deletions engines/neverhood/module1700.cpp
View file
Expand Up @@ -194,8 +194,6 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which)

setHitRects(0x004B69D8);

_surfaceFlag = true;

setBackground(0x03118226);

setPalette(0x03118226);
Expand Down
3 changes: 0 additions & 3 deletions engines/neverhood/module1900.cpp
View file
Expand Up @@ -91,8 +91,6 @@ Scene1901::Scene1901(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite;

_surfaceFlag = true;

setRectList(0x004B34C8);

setBackground(0x01303227);
Expand Down Expand Up @@ -559,7 +557,6 @@ Scene1907::Scene1907(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true), _currMovingSymbolIndex(0), _pluggedInCount(0),
_moveDownCountdown(0), _moveUpCountdown(0), _countdown3(0), _hasPlugInFailed(false) {

_surfaceFlag = true;
setBackground(0x20628E05);
setPalette(0x20628E05);

Expand Down
1 change: 0 additions & 1 deletion engines/neverhood/module2000.cpp
View file
Expand Up @@ -100,7 +100,6 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite;

_surfaceFlag = true;
SetMessageHandler(&Scene2001::handleMessage);

setBackground(0xA6417244);
Expand Down
1 change: 0 additions & 1 deletion engines/neverhood/module2100.cpp
View file
Expand Up @@ -203,7 +203,6 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite;

_surfaceFlag = true;
SetMessageHandler(&Scene2101::handleMessage);
SetUpdateHandler(&Scene2101::update);

Expand Down
10 changes: 0 additions & 10 deletions engines/neverhood/module2200.cpp
View file
Expand Up @@ -508,7 +508,6 @@ Scene2201::Scene2201(NeverhoodEngine *vm, Module *parentModule, int which)
// TODO _vm->gameModule()->initScene2201Vars();
}

_surfaceFlag = true;
SetMessageHandler(&Scene2201::handleMessage);
SetUpdateHandler(&Scene2201::update);

Expand Down Expand Up @@ -892,8 +891,6 @@ Scene2202::Scene2202(NeverhoodEngine *vm, Module *parentModule, int which)
SetMessageHandler(&Scene2202::handleMessage);
SetUpdateHandler(&Scene2202::update);

_surfaceFlag = true;

setBackground(0x08100A0C);
setPalette(0x08100A0C);
addEntity(_palette);
Expand Down Expand Up @@ -1115,7 +1112,6 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which)
setGlobalVar(V_KEY3_LOCATION, 1);

SetMessageHandler(&Scene2203::handleMessage);
_surfaceFlag = true;

setBackground(0x82C80334);
setPalette(0x82C80334);
Expand Down Expand Up @@ -1268,7 +1264,6 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which)
SetUpdateHandler(&Scene2205::update);

setHitRects(0x004B0620);
_surfaceFlag = true;

if (getGlobalVar(V_LIGHTS_ON)) {
_isLightOn = true;
Expand Down Expand Up @@ -1520,7 +1515,6 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which)

SetUpdateHandler(&Scene::update);
SetMessageHandler(&Scene2206::handleMessage);
_surfaceFlag = true;

if (getGlobalVar(V_LIGHTS_ON)) {
fileHash = 0x41983216;
Expand Down Expand Up @@ -2016,7 +2010,6 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which)

SetMessageHandler(&Scene2207::handleMessage);
SetUpdateHandler(&Scene2207::update);
_surfaceFlag = true;

insertKlayman<KmScene2207>(0, 0);
_klayman->setRepl(64, 0);
Expand Down Expand Up @@ -2405,7 +2398,6 @@ static const uint32 kScene2242MessageListIds1[] = {
Scene2242::Scene2242(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true), _isKlaymanInLight(false) {

_surfaceFlag = true;
SetMessageHandler(&Scene2242::handleMessage);
SetUpdateHandler(&Scene2242::update);

Expand Down Expand Up @@ -2525,7 +2517,6 @@ HallOfRecordsScene::HallOfRecordsScene(NeverhoodEngine *vm, Module *parentModule

_sceneInfo140 = _vm->_staticData->getSceneInfo140Item(sceneInfo140Id);

_surfaceFlag = true;
SetMessageHandler(&HallOfRecordsScene::handleMessage);
SetUpdateHandler(&Scene::update);

Expand Down Expand Up @@ -2617,7 +2608,6 @@ Scene2247::Scene2247(NeverhoodEngine *vm, Module *parentModule, int which)
//DEBUG
setGlobalVar(V_LIGHTS_ON, 1);

_surfaceFlag = true;
SetMessageHandler(&Scene2247::handleMessage);
SetUpdateHandler(&Scene::update);

Expand Down
4 changes: 0 additions & 4 deletions engines/neverhood/module2400.cpp
View file
Expand Up @@ -392,7 +392,6 @@ Scene2401::Scene2401(NeverhoodEngine *vm, Module *parentModule, int which)
setGlobalVar(V_WATER_RUNNING, 1); //DEBUG! Enables water
setGlobalVar(V_HAS_TEST_TUBE, 1); //DEBUG! Gives the test tube

_surfaceFlag = true;
SetMessageHandler(&Scene2401::handleMessage);
SetUpdateHandler(&Scene2401::update);

Expand Down Expand Up @@ -721,7 +720,6 @@ Scene2402::Scene2402(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite;

_surfaceFlag = true;
SetMessageHandler(&Scene2402::handleMessage);
SetUpdateHandler(&Scene2402::update);

Expand Down Expand Up @@ -825,7 +823,6 @@ Scene2403::Scene2403(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *tempSprite1, *tempSprite2, *tempSprite3;

_surfaceFlag = true;
SetMessageHandler(&Scene2403::handleMessage);
setBackground(0x0C05060C);
setPalette(0x0C05060C);
Expand Down Expand Up @@ -922,7 +919,6 @@ Scene2406::Scene2406(NeverhoodEngine *vm, Module *parentModule, int which)
if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
setGlobalVar(V_KEY3_LOCATION, 2);

_surfaceFlag = true;
SetMessageHandler(&Scene2406::handleMessage);

setRectList(0x004B78C8);
Expand Down
2 changes: 0 additions & 2 deletions engines/neverhood/module2500.cpp
View file
Expand Up @@ -227,7 +227,6 @@ Scene2501::Scene2501(NeverhoodEngine *vm, Module *parentModule, int which)

setGlobalVar(V_CAR_DELTA_X, 1);
SetUpdateHandler(&Scene2501::update);
_surfaceFlag = true;
setBackground(0x1B8E8115);
setPalette(0x1B8E8115);
_palette->addPalette(0x00128842, 65, 31, 65);
Expand Down Expand Up @@ -551,7 +550,6 @@ Scene2504::Scene2504(NeverhoodEngine *vm, Module *parentModule, int which)

Sprite *ssButton;

_surfaceFlag = true;
setBackground(0x90791B80);
setPalette(0x90791B80);
ssButton = insertSprite<SsScene2504Button>();
Expand Down
1 change: 0 additions & 1 deletion engines/neverhood/module2600.cpp
View file
Expand Up @@ -306,7 +306,6 @@ uint32 AsScene2609Water::handleMessage(int messageNum, const MessageParam &param
Scene2609::Scene2609(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule, true), _isBusy(false) {

_surfaceFlag = true;
setBackground(0x51409A16);
setPalette(0x51409A16);
_asWater = insertSprite<AsScene2609Water>();
Expand Down

0 comments on commit a6e9475

Please sign in to comment.