libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DM: Fix compilation with MSVC9, some light renaming

Browse Source
This commit is contained in:
Strangerke 2016-07-26 10:37:12 +02:00 committed by Bendegúz Nagy
parent 698eb12770
commit 133404c635
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engines/dm/loadsave.cpp
View File

@ -49,13 +49,19 @@ LoadgameResponse DMEngine::f435_loadgame(int16 slot) {
Common::InSaveFile *file = nullptr;
struct {
int16 _g528_saveFormat = 0;
int16 saveAndPlayChoice = 0;
int32 _g525_gameId = 0;
int16 _g527_platform = 0;
uint16 _g526_dungeonId = 0;
int16 _saveFormat;
int16 _saveAndPlayChoice;
int32 _gameId;
int16 _platform;
uint16 _dungeonId;
} dmSaveHeader;
dmSaveHeader._saveFormat = 0;
dmSaveHeader._saveAndPlayChoice = 0;
dmSaveHeader._gameId = 0;
dmSaveHeader._platform = 0;
dmSaveHeader._dungeonId = 0;
if (!_g298_newGame) {
fileName = getSavefileName(slot);
saveFileManager = _system->getSavefileManager();
@ -85,13 +91,13 @@ LoadgameResponse DMEngine::f435_loadgame(int16 slot) {
warning(false, "MISSING CODE: missing check for matching format and platform in save in f435_loadgame");
dmSaveHeader._g528_saveFormat = file->readSint16BE();
dmSaveHeader.saveAndPlayChoice = file->readSint16BE();
dmSaveHeader._g525_gameId = file->readSint32BE();
dmSaveHeader._g527_platform = file->readSint16BE();
dmSaveHeader._g526_dungeonId = file->readUint16BE();
dmSaveHeader._saveFormat = file->readSint16BE();
dmSaveHeader._saveAndPlayChoice = file->readSint16BE();
dmSaveHeader._gameId = file->readSint32BE();
dmSaveHeader._platform = file->readSint16BE();
dmSaveHeader._dungeonId = file->readUint16BE();
_g525_gameId = dmSaveHeader._g525_gameId;
_g525_gameId = dmSaveHeader._gameId;
_g313_gameTime = file->readSint32BE();
// G0349_ul_LastRandomNumber = L1371_s_GlobalData.LastRandomNumber;
@ -143,9 +149,9 @@ LoadgameResponse DMEngine::f435_loadgame(int16 slot) {
F0436_STARTEND_FadeToPalette(_vm->_displayMan->_g347_paletteTopAndBottomScreen);
}*/
} else {
_g528_saveFormat = dmSaveHeader._g528_saveFormat;
_g527_platform = dmSaveHeader._g527_platform;
_g526_dungeonId = dmSaveHeader._g526_dungeonId;
_g528_saveFormat = dmSaveHeader._saveFormat;
_g527_platform = dmSaveHeader._platform;
_g526_dungeonId = dmSaveHeader._dungeonId;
_g524_restartGameAllowed = true;
warning(false, "MISSING CDOE: F0427_DIALOG_Draw in f435_loadgame");

2
engines/dm/loadsave.h
View File

@ -32,8 +32,6 @@
namespace DM {
;
class LoadsaveMan {
DMEngine *_vm;
public: