libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAGA2: Rename enums in mission.h

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-10-29 00:38:48 +02:00
parent bafa530442
commit 933f52cfd4
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/saga2/mission.cpp
View File

@ -39,7 +39,7 @@ ActiveMission *ActiveMission::newMission(ObjectID genID, uint16 script) {
ActiveMission *ms = nullptr; ActiveMission *ms = nullptr;
for (i = 0; i < ARRAYSIZE(activeMissions); i++) { for (i = 0; i < ARRAYSIZE(activeMissions); i++) {
if (!(activeMissions[i]._data.missionFlags & inUse)) { if (!(activeMissions[i]._data.missionFlags & kInUse)) {
ms = &activeMissions[i]; ms = &activeMissions[i];
break; break;
} }
@ -50,7 +50,7 @@ ActiveMission *ActiveMission::newMission(ObjectID genID, uint16 script) {
ms->_data.missionID = i; ms->_data.missionID = i;
ms->_data.generatorID = genID; ms->_data.generatorID = genID;
ms->_data.missionScript = script; ms->_data.missionScript = script;
ms->_data.missionFlags |= inUse; ms->_data.missionFlags |= kInUse;
ms->_data.numKnowledgeIDs = ms->_data.numObjectIDs = 0; ms->_data.numKnowledgeIDs = ms->_data.numObjectIDs = 0;
@ -68,7 +68,7 @@ int ActiveMission::findMission(ObjectID genID) {
int i; int i;
for (i = 0; i < ARRAYSIZE(activeMissions); i++) { for (i = 0; i < ARRAYSIZE(activeMissions); i++) {
if (activeMissions[i]._data.missionFlags & inUse if (activeMissions[i]._data.missionFlags & kInUse
&& activeMissions[i]._data.generatorID == genID) { && activeMissions[i]._data.generatorID == genID) {
return i; return i;
} }
@ -255,7 +255,7 @@ void ActiveMission::cleanup() {
} }
_data.numKnowledgeIDs = _data.numObjectIDs = 0; _data.numKnowledgeIDs = _data.numObjectIDs = 0;
_data.missionFlags &= ~inUse; _data.missionFlags &= ~kInUse;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -265,7 +265,7 @@ void initMissions() {
int i; int i;
for (i = 0; i < ARRAYSIZE(activeMissions); i++) for (i = 0; i < ARRAYSIZE(activeMissions); i++)
activeMissions[i]._data.missionFlags &= ~inUse; activeMissions[i]._data.missionFlags &= ~kInUse;
} }
void saveMissions(Common::OutSaveFile *outS) { void saveMissions(Common::OutSaveFile *outS) {

2
engines/saga2/mission.h
View File

@ -44,7 +44,7 @@ class ActiveMission;
// Mission flags // Mission flags
enum missionFlags { enum missionFlags {
inUse = (1 << 0) // this mission struct in use kInUse = (1 << 0) // this mission struct in use
}; };
struct ActiveMissionData { struct ActiveMissionData {