Skip to content

Commit

Permalink
LILLIPUT: Rename fading functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Strangerke authored and sev- committed Mar 28, 2018
1 parent c4dc1e3 commit c304967
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
18 changes: 10 additions & 8 deletions engines/lilliput/script.cpp
Expand Up @@ -437,10 +437,10 @@ void LilliputScript::handleOpcodeType2(int curWord) {
OC_sub182EC();
break;
case 0x43:
OC_unkPaletteFunction_1();
OC_PaletteFadeOut();
break;
case 0x44:
OC_unkPaletteFunction_2();
OC_PaletteFadeIn();
break;
case 0x45:
OC_loadAndDisplayCUBESx_GFX();
Expand Down Expand Up @@ -1664,7 +1664,8 @@ void LilliputScript::OC_sub18260() {
void LilliputScript::OC_sub182EC() {
warning("OC_sub182EC");
}
void LilliputScript::OC_unkPaletteFunction_1() {

void LilliputScript::OC_PaletteFadeOut() {
sub1863B();
byte palette[768];
for (int fade = 256; fade >= 0; fade -= 8) {
Expand All @@ -1676,7 +1677,8 @@ void LilliputScript::OC_unkPaletteFunction_1() {
_vm->_system->delayMillis(20);
}
}
void LilliputScript::OC_unkPaletteFunction_2() {

void LilliputScript::OC_PaletteFadeIn() {

byte palette[768];
for (int fade = 8; fade <= 256; fade += 8) {
Expand Down Expand Up @@ -1788,13 +1790,13 @@ void LilliputScript::OC_displayVGAFile() {
debugC(1, kDebugScript, "OC_displayVGAFile()");

_byte12A09 = 1;
OC_unkPaletteFunction_1();
OC_PaletteFadeOut();
int curWord = _currScript->readUint16LE();
int index = _vm->_rulesChunk3[curWord];
Common::String fileName = Common::String((const char *)&_vm->_rulesChunk4[index]);
_word1881B = -1;
_vm->displayVGAFile(fileName);
OC_unkPaletteFunction_2();
OC_PaletteFadeOut();
}

void LilliputScript::OC_sub184D7() {
Expand Down Expand Up @@ -1836,14 +1838,14 @@ void LilliputScript::OC_displayTitleScreen() {
void LilliputScript::OC_sub1853B() {
debugC(1, kDebugScript, "OC_sub1853B()");

OC_unkPaletteFunction_1();
OC_PaletteFadeOut();
_byte16F08 = 0;
_byte15FFA = 0;
sub130B6();

_vm->displayFunction12();

OC_unkPaletteFunction_2();
OC_PaletteFadeIn();
_byte12A09 = 0;

_vm->_soundHandler->contentFct5();
Expand Down
4 changes: 2 additions & 2 deletions engines/lilliput/script.h
Expand Up @@ -228,8 +228,8 @@ class LilliputScript {
void OC_sub18252();
void OC_sub18260();
void OC_sub182EC();
void OC_unkPaletteFunction_1();
void OC_unkPaletteFunction_2();
void OC_PaletteFadeOut();
void OC_PaletteFadeIn();
void OC_loadAndDisplayCUBESx_GFX();
void OC_sub1834C();
void OC_sub18359();
Expand Down

0 comments on commit c304967

Please sign in to comment.