diff options
| author | Bertrand Augereau | 2011-11-16 12:43:19 +0100 |
|---|---|---|
| committer | Bertrand Augereau | 2011-11-16 12:43:19 +0100 |
| commit | ec14d38cf15c1a2fa100a198d36b3b41444b01bc (patch) | |
| tree | 2ebb597c688ad575bf118719d1e47ddbefcec949 /engines | |
| parent | 4acd90ac1fa57805217210fd8ea788aae7efb29d (diff) | |
| download | scummvm-rg350-ec14d38cf15c1a2fa100a198d36b3b41444b01bc.tar.gz scummvm-rg350-ec14d38cf15c1a2fa100a198d36b3b41444b01bc.tar.bz2 scummvm-rg350-ec14d38cf15c1a2fa100a198d36b3b41444b01bc.zip | |
DREAMWEB: Cleaning in the rain init code
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 6 | ||||
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 8 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index ba315f2051..2c87e7db06 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -16221,7 +16221,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_adjustleft: adjustleft(); break; case addr_adjustright: adjustright(); break; case addr_reminders: reminders(); break; - case addr_initrain: initrain(); break; case addr_backobject: backobject(); break; case addr_liftnoise: liftnoise(); break; case addr_random: random(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 8ff6bbe2fa..18a840b812 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -541,7 +541,6 @@ public: static const uint16 addr_random = 0xc17c; static const uint16 addr_liftnoise = 0xc178; static const uint16 addr_backobject = 0xc170; - static const uint16 addr_initrain = 0xc160; static const uint16 addr_reminders = 0xc15c; static const uint16 addr_adjustright = 0xc158; static const uint16 addr_adjustleft = 0xc154; @@ -650,12 +649,11 @@ public: static const uint16 offset_speechfilename = 0x13eb; static const uint16 offset_rootdir = 0x0b8c; static const uint16 offset_gameerror3 = 0x1003; - static const uint16 offset_rainlocations = 0x0459; + static const uint16 offset_facelist = 0x0451; static const uint16 offset_diarylist = 0x0e9c; static const uint16 offset_decidelist = 0x13c1; static const uint16 offset_symbollist = 0x0e5e; static const uint16 offset_folderlist = 0x0e34; - static const uint16 offset_facelist = 0x0451; static const uint16 offset_operand1 = 0x0b7e; static const uint16 offset_keypadlist = 0x0d9a; static const uint16 kStartvars = 0; @@ -1512,7 +1510,7 @@ public: void placefreeobject(); void allpalette(); //void loopchannel0(); - void initrain(); + //void initrain(); void showleftpage(); void rockstar(); void adjustright(); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 625d3a37d1..34b0729535 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -894,14 +894,6 @@ void DreamGenContext::addtopeoplelist(ReelRoutine *routine) { data.word(kListpos) += sizeof(People); } -void DreamGenContext::splitintolines() { - uint8 x = cl; - uint8 y = ch; - Rain *rain = (Rain *)es.ptr(di, 0); - Rain *newRain = splitintolines(x, y, rain); - di += (newRain - rain) * sizeof(Rain); -} - Rain *DreamGenContext::splitintolines(uint8 x, uint8 y, Rain *rain) { do { // Look for line start diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 31086d7b20..da21d415f5 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -253,6 +253,6 @@ void showwatch(); void roomname(); void transfertext(); - void splitintolines(); + void initrain(); Rain *splitintolines(uint8 x, uint8 y, Rain *rain); |