libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 04:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

CRYO: Replace file_t by Common::File

Browse Source
This commit is contained in:
Strangerke 2016-12-05 22:44:24 -08:00 committed by Eugene Sandulenko
parent 1e1e90f8ec
commit e76e4c8136
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/cryo/cryolib.cpp
View File

@ -350,7 +350,7 @@ uint16 CLMouse_IsDown() {
}
///// CLFile
void CLFile_Write(file_t &handle, void *buffer, int32 *size) {
void CLFile_Write(Common::File &handle, void *buffer, int32 *size) {
assert(0);
}

4
engines/cryo/cryolib.h
View File

@ -120,7 +120,7 @@ typedef struct HNMHeader HNMHeader;
struct hnm_t {
int _frameNum;
int ff_4;
file_t *_file;
Common::File *_file;
HNMHeader _header;
byte *tmpBuffer[2];
byte *finalBuffer;
@ -204,7 +204,7 @@ void CLPalette_DeactivateInterval();
void CLPalette_Send2Screen(struct color_t *palette, uint16 first, uint16 count);
void CLPalette_BeSystem();
void CLFile_Write(file_t &handle, void *buffer, int32 *size);
void CLFile_Write(Common::File &handle, void *buffer, int32 *size);
void CLSound_PrepareSample(sound_t *sound, int16 mode);
void CLSound_SetWantsDesigned(int16 designed);

4
engines/cryo/eden.cpp
View File

@ -8023,7 +8023,7 @@ void EdenGame::phase560() {
//// saveload.c
void EdenGame::savegame(char *name) {
// filespec_t fs;
// file_t handle;
// Common::File handle;
int32 size;
// CLFile_MakeStruct(0, 0, name, &fs);
// CLFile_Create(&fs);
@ -8121,7 +8121,7 @@ void EdenGame::loadrestart() {
void EdenGame::loadgame(char *name) {
// filespec_t fs;
// file_t handle;
// Common::File handle;
// CLFile_MakeStruct(0, 0, name, &fs);
// CLFile_Open(&fs, 3, handle);

2
engines/cryo/eden.h
View File

@ -613,7 +613,7 @@ private:
color_t newPalette[256];
Common::Rect rect_dst, rect_src;
void *voiceSamplesBuffer; //TODO: sound sample buffer
file_t h_bigfile;
Common::File h_bigfile;
byte info_list[16];
bool needToFade;
byte lastMusicNum;

2
engines/cryo/platdefs.h
View File

@ -28,8 +28,6 @@
namespace Cryo {
typedef Common::File file_t;
#if 1
const int subtitles_x_margin = 16; //PC
const int subtitles_x_scr_margin = 16;

2
engines/cryo/video.cpp
View File

@ -74,7 +74,7 @@ hnm_t *HnmPlayer::resetInternals() {
}
// Original name: CLHNM_SetFile
void HnmPlayer::setFile(hnm_t *hnm, file_t *file) {
void HnmPlayer::setFile(hnm_t *hnm, Common::File *file) {
hnm->_file = file;
}

2
engines/cryo/video.h
View File

@ -97,7 +97,7 @@ public:
void setFinalBuffer(hnm_t *hnm, byte *buffer);
int getFrameNum(hnm_t *hnm);
hnm_t *resetInternals();
void setFile(hnm_t *hnm, file_t *file);
void setFile(hnm_t *hnm, Common::File *file);
soundchannel_t *getSoundChannel();
};