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

SLUDGE: Rename KillAll to Kill in RegionManager

Browse Source
This commit is contained in:
Simei Yin 2018-04-15 00:33:01 +02:00
parent c348bb01b6
commit b575aac25a
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sludge/builtin.cpp
View File

@ -1428,7 +1428,7 @@ builtIn(showBoxes) {
builtIn(removeAllScreenRegions) {
UNUSEDALL
g_sludge->_regionMan->killAll();
g_sludge->_regionMan->kill();
return BR_CONTINUE;
}

2
engines/sludge/freeze.cpp
View File

@ -136,7 +136,7 @@ void GraphicsManager::unfreeze(bool killImage) {
killAllPeople();
allPeople = _frozenStuff->allPeople;
g_sludge->_regionMan->killAll();
g_sludge->_regionMan->kill();
g_sludge->_regionMan->resotre(_frozenStuff);
killLightMap();

2
engines/sludge/loadsave.cpp
View File

@ -504,7 +504,7 @@ bool loadGame(const Common::String &fname) {
g_sludge->_txtMan->loadFont(ssgVersion, fp);
killAllPeople();
g_sludge->_regionMan->killAll();
g_sludge->_regionMan->kill();
int camerX = fp->readUint16BE();
int camerY = fp->readUint16BE();

7
engines/sludge/region.cpp
View File

@ -41,9 +41,8 @@ RegionManager::RegionManager(SludgeEngine *vm)
_overRegion = nullptr;
}
RegionManager::~RegionManager()
{
RegionManager::~RegionManager() {
kill();
}
void RegionManager::showBoxes() {
@ -123,7 +122,7 @@ void RegionManager::loadRegions(Common::SeekableReadStream *stream) {
*pointy = NULL;
}
void RegionManager::killAll() {
void RegionManager::kill() {
ScreenRegion *killRegion;
while (_allScreenRegions) {
killRegion = _allScreenRegions;

2
engines/sludge/region.h
View File

@ -39,7 +39,7 @@ public:
~RegionManager();
// Kill
void killAll();
void kill();
// Add & remove region
bool addScreenRegion(int x1, int y1, int x2, int y2, int, int, int, int objectNum);

2
engines/sludge/sludger.cpp
View File

@ -183,7 +183,7 @@ void initSludge() {
void killSludge() {
killAllFunctions();
killAllPeople();
g_sludge->_regionMan->killAll();
g_sludge->_regionMan->kill();
setFloorNull();
g_sludge->_speechMan->kill();
g_sludge->_languageMan->kill();