[Scummvm-git-logs] scummvm master -> 5d0126057e34a741a06245e8b9a7bf8705f0515a
mduggan
mgithub at guarana.org
Thu Mar 4 12:29:03 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5d0126057e PRIVATE: Remove struct initializers
Commit: 5d0126057e34a741a06245e8b9a7bf8705f0515a
https://github.com/scummvm/scummvm/commit/5d0126057e34a741a06245e8b9a7bf8705f0515a
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-03-04T21:28:25+09:00
Commit Message:
PRIVATE: Remove struct initializers
Older compilers don't like the = {} syntax.
Changed paths:
engines/private/funcs.cpp
engines/private/private.cpp
engines/private/private.h
diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index 9a12c1795f..017dfef517 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -123,7 +123,7 @@ void fQuit(ArgArray args) {
void fLoadGame(ArgArray args) {
// assert types
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.cursor = *args[2].u.sym->name;
m.nextSetting = "";
@@ -139,7 +139,7 @@ void fLoadGame(ArgArray args) {
void fSaveGame(ArgArray args) {
// assert types
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.cursor = *args[1].u.sym->name;
m.nextSetting = "";
@@ -207,7 +207,7 @@ void fDossierAdd(ArgArray args) {
assert (args.size() == 2);
Common::String s1 = args[0].u.str;
Common::String s2 = args[1].u.str;
- DossierInfo m = {};
+ DossierInfo m;
m.page1 = s1;
if (s2 != "\"\"") {
@@ -234,7 +234,7 @@ void fDossierChgSheet(ArgArray args) {
void fDossierPrevSuspect(ArgArray args) {
assert (args.size() == 3);
Common::String s(args[0].u.str);
- MaskInfo m = {};
+ MaskInfo m;
int x = args[1].u.val;
int y = args[2].u.val;
@@ -251,7 +251,7 @@ void fDossierPrevSuspect(ArgArray args) {
void fDossierNextSuspect(ArgArray args) {
assert (args.size() == 3);
Common::String s(args[0].u.str);
- MaskInfo m = {};
+ MaskInfo m;
int x = args[1].u.val;
int y = args[2].u.val;
@@ -302,7 +302,7 @@ void fInventory(ArgArray args) {
debugC(1, kPrivateDebugScript, "Inventory(...)");
Common::String mask(b1.u.str);
if (mask != "\"\"") {
- MaskInfo m = {};
+ MaskInfo m;
m.surf = g_private->loadMask(mask, 0, 0, true);
if (e.type == NUM)
@@ -362,7 +362,7 @@ void fExit(ArgArray args) {
// assert types
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");
- ExitInfo e = {};
+ ExitInfo e;
if (args[0].type == NUM && args[0].u.val == 0)
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);
const Common::String s(f);
- MaskInfo m = {};
+ MaskInfo m;
m.surf = g_private->loadMask(s, x, y, drawn);
m.nextSetting = e;
m.cursor = *c;
@@ -567,7 +567,7 @@ static void fAddSound(Common::String sound, const char *t, Symbol *flag = NULL,
return;
g_private->_playedPhoneClips.setVal(sound, true);
- PhoneInfo p = {};
+ PhoneInfo p;
p.sound = sound;
p.flag = flag;
p.val = val;
@@ -616,7 +616,7 @@ void fSoundArea(ArgArray args) {
debugC(1, kPrivateDebugScript, "SoundArea(%s, %s, ..)", args[0].u.str, n.c_str());
Common::String s = args[0].u.str;
- MaskInfo m = {};
+ MaskInfo m;
if (n == "kAMRadio") {
m.surf = g_private->loadMask(s, 0, 0, true);
m.cursor = *args[2].u.sym->name;
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 55cd0fd914..da0a41bbbe 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -73,8 +73,8 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
_repeatedMovieExit = "";
// Save and load
- _saveGameMask = {};
- _loadGameMask = {};
+ _saveGameMask.clear();
+ _loadGameMask.clear();
// Interface
_framePath = "inface/general/inface2.bmp";
@@ -90,9 +90,9 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
_noStopSounds = false;
// Radios and phone
- _policeRadioArea = {};
- _AMRadioArea = {};
- _phoneArea = {};
+ _policeRadioArea.clear();
+ _AMRadioArea.clear();
+ _phoneArea.clear();
// TODO: use this as a default sound for radio
_infaceRadioPath = "inface/radio/";
_phonePrefix = "inface/telephon/";
@@ -101,8 +101,8 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
// Dossiers
_dossierPage = 0;
_dossierSuspect = 0;
- _dossierNextSuspectMask = {};
- _dossierPrevSuspectMask = {};
+ _dossierNextSuspectMask.clear();
+ _dossierPrevSuspectMask.clear();
// Diary
_diaryLocPrefix = "inface/diary/loclist/";
@@ -300,37 +300,37 @@ void PrivateEngine::clearAreas() {
if (_loadGameMask.surf)
_loadGameMask.surf->free();
delete _loadGameMask.surf;
- _loadGameMask = {};
+ _loadGameMask.clear();
if (_saveGameMask.surf)
_saveGameMask.surf->free();
delete _saveGameMask.surf;
- _saveGameMask = {};
+ _saveGameMask.clear();
if (_policeRadioArea.surf)
_policeRadioArea.surf->free();
delete _policeRadioArea.surf;
- _policeRadioArea = {};
+ _policeRadioArea.clear();
if (_AMRadioArea.surf)
_AMRadioArea.surf->free();
delete _AMRadioArea.surf;
- _AMRadioArea = {};
+ _AMRadioArea.clear();
if (_phoneArea.surf)
_phoneArea.surf->free();
delete _phoneArea.surf;
- _phoneArea = {};
+ _phoneArea.clear();
if (_dossierNextSuspectMask.surf)
_dossierNextSuspectMask.surf->free();
delete _dossierNextSuspectMask.surf;
- _dossierNextSuspectMask = {};
+ _dossierNextSuspectMask.clear();
if (_dossierPrevSuspectMask.surf)
_dossierPrevSuspectMask.surf->free();
delete _dossierPrevSuspectMask.surf;
- _dossierPrevSuspectMask = {};
+ _dossierPrevSuspectMask.clear();
}
void PrivateEngine::startPoliceBust() {
@@ -590,8 +590,9 @@ void PrivateEngine::loadDossier() {
loadImage(m.page1, x, y);
} else if (_dossierPage == 1) {
loadImage(m.page2, x, y);
- } else
+ } else {
assert(0);
+ }
}
bool PrivateEngine::selectDossierNextSuspect(Common::Point mousePos) {
@@ -709,7 +710,7 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
// Dossiers
size = stream->readUint32LE();
- DossierInfo m = {};
+ DossierInfo m;
for (uint32 i = 0; i < size; ++i) {
m.page1 = stream->readString();
m.page2 = stream->readString();
@@ -733,7 +734,7 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
size = stream->readUint32LE();
_phone.clear();
- PhoneInfo p = {};
+ PhoneInfo p;
for (uint32 j = 0; j < size; ++j) {
p.sound = stream->readString();
p.flag = maps.variables.getVal(stream->readString());
diff --git a/engines/private/private.h b/engines/private/private.h
index a7a402edca..a962c00d39 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -93,6 +93,15 @@ typedef struct MaskInfo {
Symbol *flag1;
Symbol *flag2;
Common::String cursor;
+
+ void clear() {
+ surf = nullptr;
+ flag1 = nullptr;
+ flag2 = nullptr;
+ nextSetting.clear();
+ cursor.clear();
+ point = Common::Point();
+ }
} MaskInfo;
typedef struct PhoneInfo {
More information about the Scummvm-git-logs
mailing list