diff options
author | Strangerke | 2016-10-24 23:58:16 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-01-25 22:42:03 +0100 |
commit | 399b1d8c8eb37431e6504d5902a2f029eebb7551 (patch) | |
tree | 2cd160495d30b0e1aa9962e38869e2689b87e97d /engines | |
parent | 5abf6770b77bd30d214b46933181e092d9619fd5 (diff) | |
download | scummvm-rg350-399b1d8c8eb37431e6504d5902a2f029eebb7551.tar.gz scummvm-rg350-399b1d8c8eb37431e6504d5902a2f029eebb7551.tar.bz2 scummvm-rg350-399b1d8c8eb37431e6504d5902a2f029eebb7551.zip |
CRYO: Remove several useless CryoLib functions
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cryo/cryolib.cpp | 68 | ||||
-rw-r--r-- | engines/cryo/cryolib.h | 17 | ||||
-rw-r--r-- | engines/cryo/eden.cpp | 13 |
3 files changed, 18 insertions, 80 deletions
diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp index bc1c4e8fc1..8989cba0ca 100644 --- a/engines/cryo/cryolib.cpp +++ b/engines/cryo/cryolib.cpp @@ -131,38 +131,43 @@ uint16 gIntervalLast, gIntervalFirst, gIntervalSet; int16 gMacintize = 0; color_t black_palette[256]; color_t last_palette[256]; + void CLPalette_Init() { - int16 i; - for (i = 0; i < 256; i++) + for (int16 i = 0; i < 256; i++) black_palette[i].r = black_palette[i].g = black_palette[i].b = 0; } + void CLPalette_SetLastPalette(color_t *palette, int16 first, int16 count) { - int16 i; - for (i = first; i < first + count; i++) + for (int16 i = first; i < first + count; i++) last_palette[i] = palette[i]; } + void CLPalette_GetLastPalette(color_t *palette) { - int16 i; - for (i = 0; i < 256; i++) + for (int16 i = 0; i < 256; i++) palette[i] = last_palette[i]; } + void CLPalette_SetRGBColor(color_t *palette, uint16 index, color3_t *rgb) { palette[index].r = rgb->r; palette[index].g = rgb->g; palette[index].b = rgb->b; palette[index].a = 0; } + void CLPalette_Macintize(int16 macintize) { gMacintize = macintize; } + void CLPalette_SetInterval(uint16 first, uint16 last) { gIntervalFirst = first; gIntervalSet = 1; gIntervalLast = last; } + void CLPalette_DeactivateInterval() { gIntervalSet = 0; } + void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count) { if (gMacintize) { palette[0].r = palette[0].g = palette[0].b = 0xFFFF; @@ -187,9 +192,11 @@ void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count) CLPalette_SetLastPalette(palette, first, count); } + void CLPalette_BeBlack() { CLPalette_Send2Screen(black_palette, 0, 256); } + void CLPalette_BeSystem() { } @@ -213,14 +220,17 @@ void CLBlitter_CopyViewRect(View *view1, View *view2, Common::Rect *rect1, Commo *d++ = *s++; } } + void CLBlitter_Send2ScreenNextCopy(color_t *palette, uint16 first, uint16 count) { pNewPalette = palette; useNewPalette = 1; newPaletteFirst = first; newPaletteCount = count; } + void CLBlitter_OneBlackFlash() { } + void CLBlitter_CopyView2ViewSimpleSize(byte *src, int16 srcw, int16 srcp, int16 srch, byte *dst, int16 dstw, int16 dstp, int16 dsth) { for (int16 y = 0; y < srch; y++) { @@ -358,14 +368,6 @@ uint16 CLMouse_IsDown() { } ///// CLFile -void CLFile_SetFilter(int a3, int a4, int a5, int a6, int a7) { -} - -void CLFile_SetFinderInfos(void *fs, int a4, int a5) { -} - -void CLFile_GetFullPath(void *a3, char *a4) { -} void CLFile_MakeStruct(int a3, int a4, const char *name, filespec_t *fs) { strcpy(fs->name, name); @@ -481,21 +483,6 @@ void CLTimer_Done() { } ///// CRYOLib -void CRYOLib_InstallExitPatch() { -} - -void CRYOLib_RemoveExitPatch() { -} - -void CRYOLib_Init() { -} - -void CRYOLib_Done() { -} - -void CRYOLib_MinimalInit() { -} - void CRYOLib_ManagersInit() { CLTimer_Init(); CLScreenView_Init(); @@ -505,29 +492,6 @@ void CRYOLib_ManagersDone() { CLTimer_Done(); } -void CRYOLib_SetDebugMode(int16 enable) { -} - -void CRYOLib_InstallEmergencyExit(void(*proc)()) { -} - -void CRYOLib_SetupEnvironment() { -} - -void CRYOLib_RestoreEnvironment() { -} - -void CRYOLib_TestConfig() { -} - -///// CLComputer -int16 CLComputer_Has68030() { - return 0; -} -int16 CLComputer_Has68040() { - return 0; -} - ///// CLDesktop void CLDesktop_TestOpenFileAtStartup() { } diff --git a/engines/cryo/cryolib.h b/engines/cryo/cryolib.h index 028f71c29b..679be87d27 100644 --- a/engines/cryo/cryolib.h +++ b/engines/cryo/cryolib.h @@ -215,9 +215,6 @@ void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count); void CLPalette_BeBlack(); void CLPalette_BeSystem(); -void CLFile_SetFilter(int a3, int a4, int a5, int a6, int a7); -void CLFile_SetFinderInfos(void *fs, int a4, int a5); -void CLFile_GetFullPath(void *a3, char *a4); void CLFile_MakeStruct(int a3, int a4, const char *name, filespec_t *fs); void CLFile_Create(filespec_t *fs); void CLFile_Open(filespec_t *fs, int16 mode, file_t &handle); @@ -260,21 +257,9 @@ void CLView_CenterIn(View *parent, View *child); void CLScreenView_Init(); void CLScreenView_CenterIn(View *view); -void CRYOLib_InstallExitPatch(); -void CRYOLib_RemoveExitPatch(); -void CRYOLib_Init(); -void CRYOLib_Done(); -void CRYOLib_MinimalInit(); void CRYOLib_ManagersInit(); void CRYOLib_ManagersDone(); -void CRYOLib_SetDebugMode(int16 enable); -void CRYOLib_InstallEmergencyExit(void(*proc)()); -void CRYOLib_SetupEnvironment(); -void CRYOLib_RestoreEnvironment(); -void CRYOLib_TestConfig(); - -int16 CLComputer_Has68030(); -int16 CLComputer_Has68040(); + void CLDesktop_TestOpenFileAtStartup(); diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 077d268caf..7a6ff1182b 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -5599,22 +5599,14 @@ void EdenGame::run() { invIconsCount = (g_ed->getPlatform() == Common::kPlatformMacintosh) ? 9 : 11; roomIconsBase = invIconsBase + invIconsCount; - CRYOLib_Init(); - CRYOLib_InstallExitPatch(); - CRYOLib_SetDebugMode(0); word_378CE = 0; - CRYOLib_MinimalInit(); - CRYOLib_TestConfig(); CRYOLib_ManagersInit(); - CLFile_SetFilter(1, 'EDNS', 0, 0, 0); - // CRYOLib_InstallEmergencyExit(EmergencyExit); - CRYOLib_SetupEnvironment(); CLHNM_SetupSound(5, 0x2000, 8, 11025 * 65536.0 , 0); CLHNM_SetForceZero2Black(true); CLHNM_SetupTimer(12.5); voiceSound = CLSoundRaw_New(0, 11025 * 65536.0, 8, 0); hnmsound_ch = CLHNM_GetSoundChannel(); - CLSound_SetWantsDesigned(1); + CLSound_SetWantsDesigned(1); // CHECKME: Used? _musicChannel = new CSoundChannel(g_ed->_mixer, 11025, false); _voiceChannel = new CSoundChannel(g_ed->_mixer, 11025, false); @@ -5665,10 +5657,7 @@ void EdenGame::run() { fadetoblack(4); closebigfile(); freebuf(); - CRYOLib_RestoreEnvironment(); CRYOLib_ManagersDone(); - CRYOLib_Done(); - CRYOLib_RemoveExitPatch(); } void EdenGame::edmain() { |