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

SAGA2: Move some globaL variables to Saga2Engine

Browse Source
This commit is contained in:
a/ 2021-08-22 06:12:34 +09:00
parent f32624c8f2
commit 06de8af3f6
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/saga2/floating.cpp
View File

@ -609,8 +609,6 @@ void FloatingWindow::close(void) {
bool checkTileAreaPort(void);
extern bool userControlsSetup;
void updateWindowSection(const Rect16 &r) {
gPixelMap tempMap;
gPort tempPort;
@ -679,7 +677,7 @@ void updateWindowSection(const Rect16 &r) {
// For each window, both background and float, that overlaps
// the clip, draw the window's imagery
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
for (Common::List<gWindow *>::iterator it = g_vm->_toolBase->bottomWindowIterator(); it != g_vm->_toolBase->topWindowIterator(); --it)
(*it)->drawClipped(tempPort, offset, clip);
}

56
engines/saga2/intrface.cpp
View File

@ -239,14 +239,6 @@ APPFUNC(cmdMassInd);
APPFUNC(cmdBulkInd);
APPFUNC(cmdManaInd);
/* ===================================================================== *
Globals
* ===================================================================== */
static bool indivControlsFlag = false;
bool userControlsSetup = false;
/* ===================================================================== *
User control metrics
* ===================================================================== */
@ -1350,7 +1342,7 @@ void CHealthIndicator::updateStar(GfxCompImage *starCtl, int32 bro, int32 baseVi
}
void CHealthIndicator::update(void) {
if (indivControlsFlag) {
if (g_vm->_indivControlsFlag) {
// get the stats for the selected brother
int16 baseVitality = g_vm->_playerList[translatePanID(uiIndiv)]->getBaseStats().vitality;
int16 currVitality = g_vm->_playerList[translatePanID(uiIndiv)]->getEffStats()->vitality;
@ -1705,21 +1697,21 @@ void SetupUserControls(void) {
//The controls need to be enabled but undrawn at startup
//if ( displayEnabled() )
// userControlsSetup = true;
// g_vm->_userControlsSetup = true;
updateAllUserControls();
}
void enableUserControls(void) {
userControlsSetup = true;
g_vm->_userControlsSetup = true;
}
void disableUserControls(void) {
userControlsSetup = false;
g_vm->_userControlsSetup = false;
}
// defines the cleanup for ALL user interface controls
void CleanupUserControls(void) {
userControlsSetup = false;
g_vm->_userControlsSetup = false;
CleanupButtonImages();
}
@ -1850,7 +1842,7 @@ uint16 getBulkRatio(GameObject *obj, uint16 &maxRatio, bool bReturnMaxRatio = tr
void updateReadyContainers(void) {
// if in individual mode
if (indivControlsFlag) {
if (g_vm->_indivControlsFlag) {
indivCviewTop->invalidate();
indivCviewBot->invalidate();
} else if (TrioCviews[getCenterActorPlayerID()]) {
@ -1864,7 +1856,7 @@ void setEnchantmentDisplay(void) {
// sets the individual brother control state buttons
void setIndivBtns(uint16 brotherID) { // top = 0, mid = 1, bot = 2
indivControlsFlag = true;
g_vm->_indivControlsFlag = true;
// set the indiv bro
indivBrother = brotherID;
@ -1904,7 +1896,7 @@ void setIndivBtns(uint16 brotherID) { // top = 0, mid = 1, bot = 2
// sets the trio brothers control state buttons
void setTrioBtns(void) {
indivControlsFlag = false;
g_vm->_indivControlsFlag = false;
// reset any value that might have changed in idividual mode
centerBtns[indivBrother]->select(indivCenterBtn->isSelected());
@ -1934,7 +1926,7 @@ void setControlPanelsToTrioMode(void) {
}
void toggleIndivMode(void) {
if (indivControlsFlag) setControlPanelsToTrioMode();
if (g_vm->_indivControlsFlag) setControlPanelsToTrioMode();
else setControlPanelsToIndividualMode(getCenterActorPlayerID());
}
@ -1956,7 +1948,7 @@ uint16 translatePanID(uint16 panID) {
}
void updateBrotherPortrait(uint16 brotherID, int16 pType) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
Portrait->set(brotherID, (PortraitType)pType);
if (brotherID == indivBrother)
@ -1965,7 +1957,7 @@ void updateBrotherPortrait(uint16 brotherID, int16 pType) {
}
void updateBrotherAggressionButton(uint16 brotherID, bool aggressive) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
aggressBtns[brotherID]->select(aggressive);
aggressBtns[brotherID]->ghost(isBrotherDead(brotherID));
@ -1980,7 +1972,7 @@ void updateBrotherAggressionButton(uint16 brotherID, bool aggressive) {
}
void updateBrotherBandingButton(uint16 brotherID, bool banded) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
bandingBtns[brotherID]->select(banded);
bandingBtns[brotherID]->ghost(isBrotherDead(brotherID));
@ -1992,7 +1984,7 @@ void updateBrotherBandingButton(uint16 brotherID, bool banded) {
}
void updateBrotherRadioButtons(uint16 brotherID) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
bool jul = (uiJulian == brotherID);
bool phi = (uiPhillip == brotherID);
bool kev = (uiKevin == brotherID);
@ -2020,13 +2012,13 @@ void updateBrotherRadioButtons(uint16 brotherID) {
indivCenterBtn->ghost(isBrotherDead(brotherID));
}
if (indivControlsFlag)
if (g_vm->_indivControlsFlag)
setControlPanelsToIndividualMode(brotherID);
}
}
void updateBrotherArmor(uint16 brotherID) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
armorInd[brotherID]->setValue(brotherID);
armorInd[brotherID]->ghost(isBrotherDead(brotherID));
@ -2039,11 +2031,11 @@ void updateBrotherArmor(uint16 brotherID) {
void updateAllUserControls(void) {
if (displayEnabled()) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
uint16 centerBrotherID = getCenterActorPlayerID(),
brotherID;
if (indivControlsFlag)
if (g_vm->_indivControlsFlag)
setControlPanelsToIndividualMode(indivBrother);
else
setControlPanelsToTrioMode();
@ -2073,7 +2065,7 @@ void updateAllUserControls(void) {
}
void updateBrotherControls(PlayerActorID brotherID) {
if (userControlsSetup) {
if (g_vm->_userControlsSetup) {
bool dead = isBrotherDead(brotherID);
updateBrotherRadioButtons(getCenterActorPlayerID());
@ -2567,11 +2559,11 @@ APPFUNC(cmdManaInd) {
}
bool isIndivMode(void) {
return indivControlsFlag;
return g_vm->_indivControlsFlag;
}
void initUIState(void) {
indivControlsFlag = false;
g_vm->_indivControlsFlag = false;
indivBrother = 0;
//updateAllUserControls();
@ -2583,21 +2575,21 @@ void saveUIState(Common::OutSaveFile *outS) {
outS->write("UIST", 4);
CHUNK_BEGIN;
out->writeUint16LE(indivControlsFlag);
out->writeUint16LE(g_vm->_indivControlsFlag);
out->writeUint16LE(indivBrother);
CHUNK_END;
debugC(3, kDebugSaveload, "... indivControlsFlag = %d", indivControlsFlag);
debugC(3, kDebugSaveload, "..._indivControlsFlag = %d", g_vm->_indivControlsFlag);
debugC(3, kDebugSaveload, "... indivBrother = %d", indivBrother);
}
void loadUIState(Common::InSaveFile *in) {
debugC(2, kDebugSaveload, "Loading UIState");
indivControlsFlag = in->readUint16LE();
g_vm->_indivControlsFlag = in->readUint16LE();
indivBrother = in->readUint16LE();
debugC(3, kDebugSaveload, "... indivControlsFlag = %d", indivControlsFlag);
debugC(3, kDebugSaveload, "... _indivControlsFlag = %d", g_vm->_indivControlsFlag);
debugC(3, kDebugSaveload, "... indivBrother = %d", indivBrother);
updateAllUserControls();

4
engines/saga2/saga2.cpp
View File

@ -85,6 +85,10 @@ Saga2Engine::Saga2Engine(OSystem *syst)
_teleportOnClick = false;
_teleportOnMap = false;
_indivControlsFlag = false;
_userControlsSetup = false;
_fadeDepth = 1;
SearchMan.addSubDirectoryMatching(gameDataDir, "res");
SearchMan.addSubDirectoryMatching(gameDataDir, "dos/drivers"); // For Miles Sound files
SearchMan.addSubDirectoryMatching(gameDataDir, "drivers");

5
engines/saga2/saga2.h
View File

@ -190,6 +190,11 @@ public:
bool _showPosition;
bool _showStats;
bool _indivControlsFlag;
bool _userControlsSetup;
int _fadeDepth;
private:
Video::SmackerDecoder *_smkDecoder;
int _videoX, _videoY;

5
engines/saga2/transit.cpp
View File

@ -105,7 +105,6 @@ void SystemEventLoop(void);
//-----------------------------------------------------------------------
// Fade to black
static int fadeDepth = 1;
void clearTileAreaPort(void);
void reDrawScreen(void) ;
void updateMainDisplay(void);
@ -119,7 +118,7 @@ void disableUserControls(void);
void enableUserControls(void);
void fadeDown(void) {
if (fadeDepth++ == 0) {
if (g_vm->_fadeDepth++ == 0) {
beginFade(darkPalette, 20);
while (updatePalette());
clearTileAreaPort();
@ -132,7 +131,7 @@ void fadeDown(void) {
// Fade to many colors
void fadeUp(void) {
if (--fadeDepth == 0) {
if (--g_vm->_fadeDepth == 0) {
enableUserControls();
updateMainDisplay();
drawMainDisplay();