diff options
author | Joost Peters | 2003-03-24 10:55:58 +0000 |
---|---|---|
committer | Joost Peters | 2003-03-24 10:55:58 +0000 |
commit | 12c0a6834a4681981a0d0bbea3fbc38cec45924c (patch) | |
tree | b9f3dadb155229c4ec267b2b504a4bbf296648fa /sky | |
parent | eb31490e3933a3b5e3a02dc836777403ff13e69f (diff) | |
download | scummvm-rg350-12c0a6834a4681981a0d0bbea3fbc38cec45924c.tar.gz scummvm-rg350-12c0a6834a4681981a0d0bbea3fbc38cec45924c.tar.bz2 scummvm-rg350-12c0a6834a4681981a0d0bbea3fbc38cec45924c.zip |
Some more cleanup, loadFile now returns a uint8*/byte* so no casting is needed anymore.
svn-id: r6854
Diffstat (limited to 'sky')
-rw-r--r-- | sky/cd_intro.cpp | 124 | ||||
-rw-r--r-- | sky/disk.cpp | 18 | ||||
-rw-r--r-- | sky/intro.cpp | 16 | ||||
-rw-r--r-- | sky/screen.cpp | 2 | ||||
-rw-r--r-- | sky/sky.h | 6 |
5 files changed, 83 insertions, 83 deletions
diff --git a/sky/cd_intro.cpp b/sky/cd_intro.cpp index 2b9b8f2ee9..52d64f15c0 100644 --- a/sky/cd_intro.cpp +++ b/sky/cd_intro.cpp @@ -192,8 +192,8 @@ #define START_VOICE ( delay(200), _sound->playVoice(vocBuffer, loadedVocSize) ) #define START_BG ( _sound->playBgSound(bgVocBuffer, bgVocSize) ) -#define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = (byte *)loadFile(num, NULL), loadedVocSize = _lastLoadedFileSize ) -#define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = (byte *)loadFile(num, NULL), bgVocSize = _lastLoadedFileSize ) +#define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = loadFile(num, NULL), loadedVocSize = _lastLoadedFileSize ) +#define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = loadFile(num, NULL), bgVocSize = _lastLoadedFileSize ) #define WAIT_VOICE while (_sound->_voiceHandle != 0) { delay(50); } #define WAIT_SEQUENCE while (_tseqFrames != 0) { delay(50); } #define WAIT_RELATIVE(x) ( delay(20 * (x)) ) @@ -206,24 +206,24 @@ void SkyState::doCDIntro() { assert(_isCDVersion); - vocBuffer = (byte *)loadFile(cdv_00, NULL); + vocBuffer = loadFile(cdv_00, NULL); loadedVocSize = _lastLoadedFileSize; - _tempPal = (byte *)loadFile(cd_pal, NULL); - _workScreen = (byte *)loadFile(cd_1_log, NULL); + _tempPal = loadFile(cd_pal, NULL); + _workScreen = loadFile(cd_1_log, NULL); - cd2_seq_data_1 = (byte *)loadFile(cd_1, NULL); - bgVocBuffer = (byte *)loadFile(59499, NULL); + cd2_seq_data_1 = loadFile(cd_1, NULL); + bgVocBuffer = loadFile(59499, NULL); bgVocSize = _lastLoadedFileSize; delay(2000); //keep gibbons screen up for 2 seconds - fn_fade_down(0); //and fade out + fnFadeDown(0); //and fade out START_VOICE; START_BG; free (vocBuffer); - vocBuffer = (byte *)loadFile(cdv_01, NULL); + vocBuffer = loadFile(cdv_01, NULL); loadedVocSize = _lastLoadedFileSize; WAIT_VOICE; //wait for the voice to finish @@ -236,7 +236,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; START_VOICE; START_BG; - cd2_seq_data_2 = (byte *)loadFile(cd_2, NULL); //load seq 2 while 1 is playing + cd2_seq_data_2 = loadFile(cd_2, NULL); //load seq 2 while 1 is playing LOAD_NEW_VOICE(cdv_03); //WAIT_SEQUENCE; WAIT_VOICE; @@ -251,7 +251,7 @@ void SkyState::doCDIntro() { START_BG; free(cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_3, NULL); + cd2_seq_data_1 = loadFile(cd_3, NULL); LOAD_NEW_VOICE(cdv_05); WAIT_SEQUENCE; //2 @@ -269,7 +269,7 @@ void SkyState::doCDIntro() { START_BG; free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_5, NULL); + cd2_seq_data_2 = loadFile(cd_5, NULL); LOAD_NEW_VOICE(cdv_07); WAIT_SEQUENCE; //3 @@ -289,7 +289,7 @@ void SkyState::doCDIntro() { START_BG; free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_7, NULL); + cd2_seq_data_1 = loadFile(cd_7, NULL); LOAD_NEW_VOICE(cdv_10); WAIT_SEQUENCE; //5 @@ -300,16 +300,16 @@ void SkyState::doCDIntro() { START_BG; loadFile(cd_11_pal, _tempPal); - byte *workScreen2 = (byte *)loadFile(cd_11_log, NULL); //need an extra screen or else the sequence will get messed up + byte *workScreen2 = loadFile(cd_11_log, NULL); //need an extra screen or else the sequence will get messed up free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_11, NULL); + cd2_seq_data_2 = loadFile(cd_11, NULL); LOAD_NEW_VOICE(cdv_11); WAIT_VOICE; //10 START_VOICE; //11 START_BG; - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -329,7 +329,7 @@ void SkyState::doCDIntro() { START_BG; free(cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_13, NULL); + cd2_seq_data_1 = loadFile(cd_13, NULL); LOAD_NEW_VOICE(cdv_14); LOAD_NEW_BG(59498); @@ -350,7 +350,7 @@ void SkyState::doCDIntro() { START_VOICE; //15 START_BG; - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -362,7 +362,7 @@ void SkyState::doCDIntro() { loadFile(cd_17_log, workScreen2); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_17, NULL); + cd2_seq_data_2 = loadFile(cd_17, NULL); LOAD_NEW_VOICE(cdv_17); WAIT_VOICE; //16 @@ -389,7 +389,7 @@ void SkyState::doCDIntro() { WAIT_SEQUENCE; //17 WAIT_VOICE; //18 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -404,7 +404,7 @@ void SkyState::doCDIntro() { START_VOICE; //20 START_BG; - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -417,7 +417,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; //20 START_VOICE; //21 START_BG; - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -433,7 +433,7 @@ void SkyState::doCDIntro() { LOAD_NEW_VOICE(cdv_23); WAIT_VOICE; //22 START_VOICE; //23 - fn_fade_down(0); + fnFadeDown(0); loadFile(cd_23_pal, _tempPal); loadFile(cd_24_log, workScreen2); @@ -453,12 +453,12 @@ void SkyState::doCDIntro() { START_VOICE; //26 free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_27, NULL); + cd2_seq_data_1 = loadFile(cd_27, NULL); LOAD_NEW_VOICE(cdv_27); loadFile(cd_27_pal, _tempPal); loadFile(cd_27_log, workScreen2); WAIT_VOICE; //26 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -488,13 +488,13 @@ void SkyState::doCDIntro() { START_VOICE; //35 free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_35, NULL); + cd2_seq_data_2 = loadFile(cd_35, NULL); LOAD_NEW_VOICE(cdv_36); loadFile(cd_35_pal, _tempPal); loadFile(cd_35_log, workScreen2); WAIT_VOICE; //35 START_VOICE; //36 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -505,7 +505,7 @@ void SkyState::doCDIntro() { START_VOICE; //37 free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_37, NULL); + cd2_seq_data_1 = loadFile(cd_37, NULL); LOAD_NEW_VOICE(cdv_38); WAIT_SEQUENCE; //35 @@ -521,7 +521,7 @@ void SkyState::doCDIntro() { loadFile(cd_40_pal, _tempPal); loadFile(cd_40_log, workScreen2); WAIT_VOICE; //39 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -539,14 +539,14 @@ void SkyState::doCDIntro() { loadFile(cd_43_log, workScreen2); WAIT_VOICE; //42 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); START_VOICE; //43 free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_43, NULL); + cd2_seq_data_2 = loadFile(cd_43, NULL); WAIT_VOICE; //43 startTimerSequence(cd2_seq_data_2); LOAD_NEW_VOICE(cdv_45); @@ -554,12 +554,12 @@ void SkyState::doCDIntro() { loadFile(cd_45_log, workScreen2); WAIT_SEQUENCE; //43 START_VOICE; //45 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_45, NULL); + cd2_seq_data_1 = loadFile(cd_45, NULL); LOAD_NEW_VOICE(cdv_46); WAIT_VOICE; //45 startTimerSequence(cd2_seq_data_1); @@ -572,7 +572,7 @@ void SkyState::doCDIntro() { WAIT_SEQUENCE; //45 WAIT_VOICE; //46 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -582,13 +582,13 @@ void SkyState::doCDIntro() { loadFile(cd_48_log, workScreen2); WAIT_VOICE; //47 START_VOICE; //48 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_48, NULL); + cd2_seq_data_2 = loadFile(cd_48, NULL); LOAD_NEW_VOICE(cdv_49); WAIT_VOICE; //48 startTimerSequence(cd2_seq_data_2); @@ -597,7 +597,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; //49 START_VOICE; //50 free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_49, NULL); + cd2_seq_data_1 = loadFile(cd_49, NULL); LOAD_NEW_VOICE(cdv_51); WAIT_SEQUENCE; //48 WAIT_VOICE; //50 @@ -611,7 +611,7 @@ void SkyState::doCDIntro() { START_VOICE; //53 LOAD_NEW_VOICE(cdv_54); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_50, NULL); + cd2_seq_data_2 = loadFile(cd_50, NULL); WAIT_VOICE; //53 WAIT_SEQUENCE; //49 @@ -628,7 +628,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; //55 START_VOICE; //56 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -642,7 +642,7 @@ void SkyState::doCDIntro() { loadFile(cd_58_log, workScreen2); WAIT_VOICE; //57 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -651,7 +651,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; //48 START_VOICE; //59 free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_58, NULL); + cd2_seq_data_1 = loadFile(cd_58, NULL); WAIT_VOICE; //59 LOAD_NEW_VOICE(cdv_60); START_VOICE; //60 @@ -672,7 +672,7 @@ void SkyState::doCDIntro() { WAIT_SEQUENCE; //58 WAIT_VOICE; //64 START_VOICE; //65 - fn_fade_down(0); + fnFadeDown(0); LOAD_NEW_VOICE(cdv_66); loadFile(cd_66_pal, _tempPal); loadFile(cd_66_log, _workScreen); @@ -685,7 +685,7 @@ void SkyState::doCDIntro() { START_VOICE; //67 loadFile(cd_67_pal, _tempPal); loadFile(cd_67_log, workScreen2); - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -693,13 +693,13 @@ void SkyState::doCDIntro() { WAIT_VOICE; //67 START_VOICE; //68 free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_69, NULL); + cd2_seq_data_2 = loadFile(cd_69, NULL); LOAD_NEW_VOICE(cdv_69); loadFile(cd_69_pal, _tempPal); loadFile(cd_69_log, workScreen2); WAIT_VOICE; //68 START_VOICE; //69 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -709,7 +709,7 @@ void SkyState::doCDIntro() { START_VOICE; //70 LOAD_NEW_VOICE(cdv_71); WAIT_VOICE; //70 - fn_fade_down(0); + fnFadeDown(0); START_VOICE; //71 loadFile(cd_72_pal, _tempPal); loadFile(cd_72_log, _workScreen); @@ -723,7 +723,7 @@ void SkyState::doCDIntro() { loadFile(cd_73_log, _workScreen); LOAD_NEW_VOICE(cdv_73); WAIT_VOICE; //72 - fn_fade_down(0); + fnFadeDown(0); showScreen(); paletteFadeUp(_tempPal); START_VOICE; //73 @@ -735,8 +735,8 @@ void SkyState::doCDIntro() { START_VOICE; //75 loadFile(cd_76_pal, _tempPal); free (workScreen2); - workScreen2 = (byte *)loadFile(cd_76_log, NULL); - fn_fade_down(0); + workScreen2 = loadFile(cd_76_log, NULL); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -749,13 +749,13 @@ void SkyState::doCDIntro() { START_VOICE; //77 free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_100, NULL); + cd2_seq_data_1 = loadFile(cd_100, NULL); loadFile(cd_78_pal, _tempPal); free (workScreen2); - workScreen2 = (byte *)loadFile(cd_78_log, NULL); + workScreen2 = loadFile(cd_78_log, NULL); LOAD_NEW_VOICE(cdv_78); WAIT_VOICE; //77 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -777,7 +777,7 @@ void SkyState::doCDIntro() { WAIT_VOICE; //82 loadFile(cd_101_log, workScreen2); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_101, NULL); + cd2_seq_data_2 = loadFile(cd_101, NULL); WAIT_SEQUENCE; //100 COPY_SCREEN; showScreen(); @@ -793,9 +793,9 @@ void SkyState::doCDIntro() { WAIT_VOICE; //85 free (workScreen2); - workScreen2 = (byte *)loadFile(cd_102_log, NULL); + workScreen2 = loadFile(cd_102_log, NULL); free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_102, NULL); + cd2_seq_data_1 = loadFile(cd_102, NULL); WAIT_SEQUENCE; //101 COPY_SCREEN; showScreen(); @@ -804,11 +804,11 @@ void SkyState::doCDIntro() { LOAD_NEW_VOICE(cdv_87); loadFile(cd_103_pal, _tempPal); free (workScreen2); - workScreen2 = (byte *)loadFile(cd_103_log, NULL); + workScreen2 = loadFile(cd_103_log, NULL); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_103, NULL); + cd2_seq_data_2 = loadFile(cd_103, NULL); WAIT_SEQUENCE; //102 - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); @@ -817,19 +817,19 @@ void SkyState::doCDIntro() { START_VOICE; //87 loadFile(cd_104_pal, _tempPal); free (workScreen2); - workScreen2 = (byte *)loadFile(cd_104_log, NULL); + workScreen2 = loadFile(cd_104_log, NULL); free (cd2_seq_data_1); - cd2_seq_data_1 = (byte *)loadFile(cd_104, NULL); + cd2_seq_data_1 = loadFile(cd_104, NULL); WAIT_SEQUENCE; //103 //fn_start_music(2); - fn_fade_down(0); + fnFadeDown(0); COPY_SCREEN; showScreen(); paletteFadeUp(_tempPal); startTimerSequence(cd2_seq_data_1); free (cd2_seq_data_2); - cd2_seq_data_2 = (byte *)loadFile(cd_105, NULL); + cd2_seq_data_2 = loadFile(cd_105, NULL); WAIT_SEQUENCE; //104 startTimerSequence(cd2_seq_data_2); WAIT_SEQUENCE; //105 diff --git a/sky/disk.cpp b/sky/disk.cpp index 6fff6b1382..5571f9e705 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -75,7 +75,7 @@ void SkyState::initialiseDisk() { //load in file file_nr to address dest //if dest == NULL, then allocate memory for this file -uint16 *SkyState::loadFile(uint16 fileNr, uint8 *dest) { +uint8 *SkyState::loadFile(uint16 fileNr, uint8 *dest) { uint8 cflag; int32 bytesRead; @@ -89,7 +89,7 @@ uint16 *SkyState::loadFile(uint16 fileNr, uint8 *dest) { compFile = fileNr; debug(2, "load file %d,%d (%d)", (fileNr >> 11), (fileNr & 2047), fileNr); - filePtr = (uint8 *)getFileInfo(fileNr); + filePtr = getFileInfo(fileNr); if (filePtr == NULL) { printf("File %d not found!\n", fileNr); return NULL; @@ -163,7 +163,7 @@ uint16 *SkyState::loadFile(uint16 fileNr, uint8 *dest) { if (fixedDest == NULL) free(compDest); - return (uint16 *)fileDest; + return fileDest; } if (! (uint8)(fileFlags >> (22) & 0x1) ) { // include header? @@ -182,12 +182,12 @@ uint16 *SkyState::loadFile(uint16 fileNr, uint8 *dest) { } else debug(2, "but not with RNC! (?!)"); } else - return (uint16 *)fileDest; + return fileDest; - return (uint16 *)compDest; + return compDest; } -uint16 *SkyState::getFileInfo(uint16 fileNr) { +uint8 *SkyState::getFileInfo(uint16 fileNr) { uint16 i; uint16 *dnrTbl16Ptr = (uint16 *)dinnerTableArea; @@ -195,12 +195,12 @@ uint16 *SkyState::getFileInfo(uint16 fileNr) { for (i = 0; i < dinnerTableEntries; i++) { if (READ_LE_UINT16(dnrTbl16Ptr + (i * 4)) == fileNr) { debug(2, "file %d found!", fileNr); - return (dnrTbl16Ptr + (i * 4)); + return (uint8 *)(dnrTbl16Ptr + (i * 4)); } } // if file not found return NULL - return (uint16 *)NULL; + return (uint8 *)NULL; } void SkyState::dumpFile(uint16 fileNr) { @@ -208,7 +208,7 @@ void SkyState::dumpFile(uint16 fileNr) { File out; byte* filePtr; - filePtr = (byte *)loadFile(fileNr, NULL); + filePtr = loadFile(fileNr, NULL); sprintf(buf, "dumps/file-%d.dmp", fileNr); out.open(buf, "", 1); diff --git a/sky/intro.cpp b/sky/intro.cpp index 6d4bd115d3..3fe2c19811 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -218,11 +218,11 @@ uint32 *command_pointer = (uint32 *)zero_commands; void SkyState::initVirgin() { - _tempPal = (uint8 *)loadFile(60111, NULL); + _tempPal = loadFile(60111, NULL); if (_tempPal != NULL) setPalette(_tempPal); - _workScreen = (uint8 *)loadFile(60110, NULL); + _workScreen = loadFile(60110, NULL); if (_workScreen != NULL) showScreen(); @@ -234,8 +234,8 @@ void SkyState::initVirgin() { void SkyState::intro(void) { - _workScreen = (uint8 *)loadFile(60112, NULL); //while virgin screen is up, load rev screen - _tempPal = (uint8 *)loadFile(60113, NULL); + _workScreen = loadFile(60112, NULL); //while virgin screen is up, load rev screen + _tempPal = loadFile(60113, NULL); //loadSectionMusic(0); @@ -245,15 +245,15 @@ void SkyState::intro(void) { // fn_start_music(); delay(3000); //and another 3 seconds. - fn_fade_down(0); //remove virgin screen + fnFadeDown(0); //remove virgin screen showScreen(); paletteFadeUp(_tempPal); free (_tempPal); free (_workScreen); //while rev is up, load gibbons screen - _workScreen = (uint8 *)loadFile(60114, NULL); - _tempPal = (uint8 *)loadFile(60115, NULL); + _workScreen = loadFile(60114, NULL); + _tempPal = loadFile(60115, NULL); intro_text_space = (uint8 *)malloc(10000); intro_text_save = (uint8 *)malloc(10000); @@ -262,7 +262,7 @@ void SkyState::intro(void) { delay(8000); // keep revolution up for 8 seconds - fn_fade_down(0); + fnFadeDown(0); showScreen(); paletteFadeUp(_tempPal); diff --git a/sky/screen.cpp b/sky/screen.cpp index 6bad94504c..8e8c15b1ba 100644 --- a/sky/screen.cpp +++ b/sky/screen.cpp @@ -97,7 +97,7 @@ void SkyState::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0. //action = 0, simply fade out //action = 1, scroll left //action = 2, scroll right -void SkyState::fn_fade_down(uint8 action) { +void SkyState::fnFadeDown(uint8 action) { if (action) { @@ -92,12 +92,12 @@ protected: void initialiseScreen(); void initialiseGrids(); void setPalette(uint8 *pal); - void fn_fade_down(uint8 action); + void fnFadeDown(uint8 action); void palette_fadedown_helper(uint32 *pal, uint num); void paletteFadeUp(uint8 *pal); void palette_fadeup_helper(uint32 *realPal, uint32 *desiredPal, int num); - uint16 *loadFile(uint16 fileNr, uint8 *dest); - uint16 *getFileInfo(uint16 fileNr); + uint8 *loadFile(uint16 fileNr, uint8 *dest); + uint8 *getFileInfo(uint16 fileNr); void dumpFile(uint16 fileNr); void initVirgin(); void intro(); |