thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PRIVATE: Remove struct initializers

Browse source 
Older compilers don't like the = {} syntax.
This commit is contained in:
Matthew Duggan 2021-03-04 21:28:25 +09:00
parent a77181cdde
commit 5d0126057e
3 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
engines/private/funcs.cpp
View file

@ -123,7 +123,7 @@ void fQuit(ArgArray args) {
void fLoadGame(ArgArray args) { void fLoadGame(ArgArray args) {
// assert types // assert types
debugC(1, kPrivateDebugScript, "LoadGame(%s, %s)", args[0].u.str, args[2].u.sym->name->c_str()); debugC(1, kPrivateDebugScript, "LoadGame(%s, %s)", args[0].u.str, args[2].u.sym->name->c_str());
MaskInfo m = {}; MaskInfo m;
m.surf = g_private->loadMask(args[0].u.str, 0, 0, true); m.surf = g_private->loadMask(args[0].u.str, 0, 0, true);
m.cursor = *args[2].u.sym->name; m.cursor = *args[2].u.sym->name;
m.nextSetting = ""; m.nextSetting = "";
@ -139,7 +139,7 @@ void fLoadGame(ArgArray args) {
void fSaveGame(ArgArray args) { void fSaveGame(ArgArray args) {
// assert types // assert types
debugC(1, kPrivateDebugScript, "SaveGame(%s, %s)", args[0].u.str, args[1].u.sym->name->c_str()); debugC(1, kPrivateDebugScript, "SaveGame(%s, %s)", args[0].u.str, args[1].u.sym->name->c_str());
MaskInfo m = {}; MaskInfo m;
m.surf = g_private->loadMask(args[0].u.str, 0, 0, true); m.surf = g_private->loadMask(args[0].u.str, 0, 0, true);
m.cursor = *args[1].u.sym->name; m.cursor = *args[1].u.sym->name;
m.nextSetting = ""; m.nextSetting = "";
@ -207,7 +207,7 @@ void fDossierAdd(ArgArray args) {
assert (args.size() == 2); assert (args.size() == 2);
Common::String s1 = args[0].u.str; Common::String s1 = args[0].u.str;
Common::String s2 = args[1].u.str; Common::String s2 = args[1].u.str;
DossierInfo m = {}; DossierInfo m;
m.page1 = s1; m.page1 = s1;
if (s2 != "\"\"") { if (s2 != "\"\"") {
@ -234,7 +234,7 @@ void fDossierChgSheet(ArgArray args) {
void fDossierPrevSuspect(ArgArray args) { void fDossierPrevSuspect(ArgArray args) {
assert (args.size() == 3); assert (args.size() == 3);
Common::String s(args[0].u.str); Common::String s(args[0].u.str);
MaskInfo m = {}; MaskInfo m;
int x = args[1].u.val; int x = args[1].u.val;
int y = args[2].u.val; int y = args[2].u.val;
@ -251,7 +251,7 @@ void fDossierPrevSuspect(ArgArray args) {
void fDossierNextSuspect(ArgArray args) { void fDossierNextSuspect(ArgArray args) {
assert (args.size() == 3); assert (args.size() == 3);
Common::String s(args[0].u.str); Common::String s(args[0].u.str);
MaskInfo m = {}; MaskInfo m;
int x = args[1].u.val; int x = args[1].u.val;
int y = args[2].u.val; int y = args[2].u.val;
@ -302,7 +302,7 @@ void fInventory(ArgArray args) {
debugC(1, kPrivateDebugScript, "Inventory(...)"); debugC(1, kPrivateDebugScript, "Inventory(...)");
Common::String mask(b1.u.str); Common::String mask(b1.u.str);
if (mask != "\"\"") { if (mask != "\"\"") {
MaskInfo m = {}; MaskInfo m;
m.surf = g_private->loadMask(mask, 0, 0, true); m.surf = g_private->loadMask(mask, 0, 0, true);
if (e.type == NUM) if (e.type == NUM)
@ -362,7 +362,7 @@ void fExit(ArgArray args) {
// assert types // assert types
assert(args[2].type == RECT || args[2].type == NAME); assert(args[2].type == RECT || args[2].type == NAME);
debugC(1, kPrivateDebugScript, "Exit(%d %d %d)", args[0].type, args[1].type, args[2].type); //, args[0].u.str, args[1].u.sym->name->c_str(), "RECT"); debugC(1, kPrivateDebugScript, "Exit(%d %d %d)", args[0].type, args[1].type, args[2].type); //, args[0].u.str, args[1].u.sym->name->c_str(), "RECT");
ExitInfo e = {}; ExitInfo e;
if (args[0].type == NUM && args[0].u.val == 0) if (args[0].type == NUM && args[0].u.val == 0)
e.nextSetting = ""; e.nextSetting = "";
@ -533,7 +533,7 @@ void _fMask(ArgArray args, bool drawn) {
debugC(1, kPrivateDebugScript, "Mask(%s, %s, %s, %d, %d)", f, e, c->c_str(), x, y); debugC(1, kPrivateDebugScript, "Mask(%s, %s, %s, %d, %d)", f, e, c->c_str(), x, y);
const Common::String s(f); const Common::String s(f);
MaskInfo m = {}; MaskInfo m;
m.surf = g_private->loadMask(s, x, y, drawn); m.surf = g_private->loadMask(s, x, y, drawn);
m.nextSetting = e; m.nextSetting = e;
m.cursor = *c; m.cursor = *c;
@ -567,7 +567,7 @@ static void fAddSound(Common::String sound, const char *t, Symbol *flag = NULL,
return; return;
g_private->_playedPhoneClips.setVal(sound, true); g_private->_playedPhoneClips.setVal(sound, true);
PhoneInfo p = {}; PhoneInfo p;
p.sound = sound; p.sound = sound;
p.flag = flag; p.flag = flag;
p.val = val; p.val = val;
@ -616,7 +616,7 @@ void fSoundArea(ArgArray args) {
debugC(1, kPrivateDebugScript, "SoundArea(%s, %s, ..)", args[0].u.str, n.c_str()); debugC(1, kPrivateDebugScript, "SoundArea(%s, %s, ..)", args[0].u.str, n.c_str());
Common::String s = args[0].u.str; Common::String s = args[0].u.str;
MaskInfo m = {}; MaskInfo m;
if (n == "kAMRadio") { if (n == "kAMRadio") {
m.surf = g_private->loadMask(s, 0, 0, true); m.surf = g_private->loadMask(s, 0, 0, true);
m.cursor = *args[2].u.sym->name; m.cursor = *args[2].u.sym->name;

35
engines/private/private.cpp
View file

@ -73,8 +73,8 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
_repeatedMovieExit = ""; _repeatedMovieExit = "";
// Save and load // Save and load
_saveGameMask = {}; _saveGameMask.clear();
_loadGameMask = {}; _loadGameMask.clear();
// Interface // Interface
_framePath = "inface/general/inface2.bmp"; _framePath = "inface/general/inface2.bmp";
@ -90,9 +90,9 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
_noStopSounds = false; _noStopSounds = false;
// Radios and phone // Radios and phone
_policeRadioArea = {}; _policeRadioArea.clear();
_AMRadioArea = {}; _AMRadioArea.clear();
_phoneArea = {}; _phoneArea.clear();
// TODO: use this as a default sound for radio // TODO: use this as a default sound for radio
_infaceRadioPath = "inface/radio/"; _infaceRadioPath = "inface/radio/";
_phonePrefix = "inface/telephon/"; _phonePrefix = "inface/telephon/";
@ -101,8 +101,8 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
// Dossiers // Dossiers
_dossierPage = 0; _dossierPage = 0;
_dossierSuspect = 0; _dossierSuspect = 0;
_dossierNextSuspectMask = {}; _dossierNextSuspectMask.clear();
_dossierPrevSuspectMask = {}; _dossierPrevSuspectMask.clear();
// Diary // Diary
_diaryLocPrefix = "inface/diary/loclist/"; _diaryLocPrefix = "inface/diary/loclist/";
@ -300,37 +300,37 @@ void PrivateEngine::clearAreas() {
if (_loadGameMask.surf) if (_loadGameMask.surf)
_loadGameMask.surf->free(); _loadGameMask.surf->free();
delete _loadGameMask.surf; delete _loadGameMask.surf;
_loadGameMask = {}; _loadGameMask.clear();
if (_saveGameMask.surf) if (_saveGameMask.surf)
_saveGameMask.surf->free(); _saveGameMask.surf->free();
delete _saveGameMask.surf; delete _saveGameMask.surf;
_saveGameMask = {}; _saveGameMask.clear();
if (_policeRadioArea.surf) if (_policeRadioArea.surf)
_policeRadioArea.surf->free(); _policeRadioArea.surf->free();
delete _policeRadioArea.surf; delete _policeRadioArea.surf;
_policeRadioArea = {}; _policeRadioArea.clear();
if (_AMRadioArea.surf) if (_AMRadioArea.surf)
_AMRadioArea.surf->free(); _AMRadioArea.surf->free();
delete _AMRadioArea.surf; delete _AMRadioArea.surf;
_AMRadioArea = {}; _AMRadioArea.clear();
if (_phoneArea.surf) if (_phoneArea.surf)
_phoneArea.surf->free(); _phoneArea.surf->free();
delete _phoneArea.surf; delete _phoneArea.surf;
_phoneArea = {}; _phoneArea.clear();
if (_dossierNextSuspectMask.surf) if (_dossierNextSuspectMask.surf)
_dossierNextSuspectMask.surf->free(); _dossierNextSuspectMask.surf->free();
delete _dossierNextSuspectMask.surf; delete _dossierNextSuspectMask.surf;
_dossierNextSuspectMask = {}; _dossierNextSuspectMask.clear();
if (_dossierPrevSuspectMask.surf) if (_dossierPrevSuspectMask.surf)
_dossierPrevSuspectMask.surf->free(); _dossierPrevSuspectMask.surf->free();
delete _dossierPrevSuspectMask.surf; delete _dossierPrevSuspectMask.surf;
_dossierPrevSuspectMask = {}; _dossierPrevSuspectMask.clear();
} }
void PrivateEngine::startPoliceBust() { void PrivateEngine::startPoliceBust() {
@ -590,9 +590,10 @@ void PrivateEngine::loadDossier() {
loadImage(m.page1, x, y); loadImage(m.page1, x, y);
} else if (_dossierPage == 1) { } else if (_dossierPage == 1) {
loadImage(m.page2, x, y); loadImage(m.page2, x, y);
} else } else {
assert(0); assert(0);
} }
}
bool PrivateEngine::selectDossierNextSuspect(Common::Point mousePos) { bool PrivateEngine::selectDossierNextSuspect(Common::Point mousePos) {
if (_dossierNextSuspectMask.surf == NULL) if (_dossierNextSuspectMask.surf == NULL)
@ -709,7 +710,7 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
// Dossiers // Dossiers
size = stream->readUint32LE(); size = stream->readUint32LE();
DossierInfo m = {}; DossierInfo m;
for (uint32 i = 0; i < size; ++i) { for (uint32 i = 0; i < size; ++i) {
m.page1 = stream->readString(); m.page1 = stream->readString();
m.page2 = stream->readString(); m.page2 = stream->readString();
@ -733,7 +734,7 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
size = stream->readUint32LE(); size = stream->readUint32LE();
_phone.clear(); _phone.clear();
PhoneInfo p = {}; PhoneInfo p;
for (uint32 j = 0; j < size; ++j) { for (uint32 j = 0; j < size; ++j) {
p.sound = stream->readString(); p.sound = stream->readString();
p.flag = maps.variables.getVal(stream->readString()); p.flag = maps.variables.getVal(stream->readString());

9
engines/private/private.h
View file

@ -93,6 +93,15 @@ typedef struct MaskInfo {
Symbol *flag1; Symbol *flag1;
Symbol *flag2; Symbol *flag2;
Common::String cursor; Common::String cursor;
void clear() {
surf = nullptr;
flag1 = nullptr;
flag2 = nullptr;
nextSetting.clear();
cursor.clear();
point = Common::Point();
}
} MaskInfo; } MaskInfo;
typedef struct PhoneInfo { typedef struct PhoneInfo {