[Scummvm-cvs-logs] scummvm master -> 765540a5fd58238c51ea50f96e5a5940dbbf88ef
salty-horse
ori at avtalion.name
Sat Feb 26 19:27:25 CET 2011
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:
765540a5fd GOB: Avoid hiding overloaded virtual methods
Commit: 765540a5fd58238c51ea50f96e5a5940dbbf88ef
https://github.com/scummvm/scummvm/commit/765540a5fd58238c51ea50f96e5a5940dbbf88ef
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-02-26T10:25:44-08:00
Commit Message:
GOB: Avoid hiding overloaded virtual methods
Changed paths:
engines/gob/save/saveload.h
engines/gob/save/saveload_inca2.cpp
engines/gob/save/saveload_v3.cpp
engines/gob/sound/bgatmosphere.cpp
engines/gob/sound/bgatmosphere.h
engines/gob/sound/sound.cpp
diff --git a/engines/gob/save/saveload.h b/engines/gob/save/saveload.h
index c231c1d..dc1c184 100644
--- a/engines/gob/save/saveload.h
+++ b/engines/gob/save/saveload.h
@@ -305,7 +305,7 @@ protected:
int getSlot(int32 offset) const;
int getSlotRemainder(int32 offset) const;
- void buildIndex(byte *buffer) const;
+ void buildScreenshotIndex(byte *buffer) const;
protected:
uint32 _shotSize;
@@ -430,7 +430,7 @@ protected:
int getSlot(int32 offset) const;
int getSlotRemainder(int32 offset) const;
- void buildIndex(byte *buffer) const;
+ void buildScreenshotIndex(byte *buffer) const;
};
File *_file;
diff --git a/engines/gob/save/saveload_inca2.cpp b/engines/gob/save/saveload_inca2.cpp
index 68c76c3..5fa1b69 100644
--- a/engines/gob/save/saveload_inca2.cpp
+++ b/engines/gob/save/saveload_inca2.cpp
@@ -260,7 +260,7 @@ int SaveLoad_Inca2::ScreenshotHandler::File::getSlotRemainder(int32 offset) cons
return (offset - 80) % 15168;
}
-void SaveLoad_Inca2::ScreenshotHandler::File::buildIndex(byte *buffer) const {
+void SaveLoad_Inca2::ScreenshotHandler::File::buildScreenshotIndex(byte *buffer) const {
Common::SaveFileManager *saveMan = g_system->getSavefileManager();
Common::InSaveFile *in;
@@ -306,7 +306,7 @@ bool SaveLoad_Inca2::ScreenshotHandler::load(int16 dataVar, int32 size, int32 of
}
// Create/Fake the index
- _file->buildIndex(_index + 40);
+ _file->buildScreenshotIndex(_index + 40);
_vm->_inter->_variables->copyFrom(dataVar, _index + offset, size);
diff --git a/engines/gob/save/saveload_v3.cpp b/engines/gob/save/saveload_v3.cpp
index 098b8e1..39edddb 100644
--- a/engines/gob/save/saveload_v3.cpp
+++ b/engines/gob/save/saveload_v3.cpp
@@ -367,7 +367,7 @@ int SaveLoad_v3::ScreenshotHandler::File::getSlotRemainder(int32 offset) const {
return ((offset - _shotIndexSize) % _shotSize);
}
-void SaveLoad_v3::ScreenshotHandler::File::buildIndex(byte *buffer) const {
+void SaveLoad_v3::ScreenshotHandler::File::buildScreenshotIndex(byte *buffer) const {
Common::SaveFileManager *saveMan = g_system->getSavefileManager();
Common::InSaveFile *in;
@@ -418,12 +418,12 @@ bool SaveLoad_v3::ScreenshotHandler::load(int16 dataVar, int32 size, int32 offse
if (_sShotType == kScreenshotTypeGob3) {
// Create/Fake the index
- _file->buildIndex(_index + 40);
+ _file->buildScreenshotIndex(_index + 40);
// The last 10 bytes are 0
memset(_index + 70, 0, 10);
} else if (_sShotType == kScreenshotTypeLost) {
// Create/Fake the index
- _file->buildIndex(_index);
+ _file->buildScreenshotIndex(_index);
// The last byte is 0
_index[30] = 0;
}
diff --git a/engines/gob/sound/bgatmosphere.cpp b/engines/gob/sound/bgatmosphere.cpp
index f0977aa..8850a72 100644
--- a/engines/gob/sound/bgatmosphere.cpp
+++ b/engines/gob/sound/bgatmosphere.cpp
@@ -47,7 +47,7 @@ BackgroundAtmosphere::~BackgroundAtmosphere() {
queueClear();
}
-void BackgroundAtmosphere::play() {
+void BackgroundAtmosphere::playBA() {
Common::StackLock slock(_mutex);
_queuePos = -1;
@@ -59,7 +59,7 @@ void BackgroundAtmosphere::play() {
SoundMixer::play(*_queue[_queuePos], 1, 0);
}
-void BackgroundAtmosphere::stop() {
+void BackgroundAtmosphere::stopBA() {
SoundMixer::stop(0);
}
diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h
index 71a2263..7e58c0b 100644
--- a/engines/gob/sound/bgatmosphere.h
+++ b/engines/gob/sound/bgatmosphere.h
@@ -46,8 +46,8 @@ public:
BackgroundAtmosphere(Audio::Mixer &mixer);
~BackgroundAtmosphere();
- void play();
- void stop();
+ void playBA();
+ void stopBA();
void setPlayMode(PlayMode mode);
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 5950388..1aa63eb 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -648,7 +648,7 @@ void Sound::bgPlay(const char *file, SoundType type) {
debugC(1, kDebugSound, "BackgroundAtmosphere: Playing \"%s\"", file);
- _bgatmos->stop();
+ _bgatmos->stopBA();
_bgatmos->queueClear();
SoundDesc *sndDesc = new SoundDesc;
@@ -658,7 +658,7 @@ void Sound::bgPlay(const char *file, SoundType type) {
}
_bgatmos->queueSample(*sndDesc);
- _bgatmos->play();
+ _bgatmos->playBA();
}
void Sound::bgPlay(const char *base, const char *ext, SoundType type, int count) {
@@ -667,7 +667,7 @@ void Sound::bgPlay(const char *base, const char *ext, SoundType type, int count)
debugC(1, kDebugSound, "BackgroundAtmosphere: Playing \"%s\" (%d)", base, count);
- _bgatmos->stop();
+ _bgatmos->stopBA();
_bgatmos->queueClear();
int length = strlen(base) + 7;
@@ -684,7 +684,7 @@ void Sound::bgPlay(const char *base, const char *ext, SoundType type, int count)
delete sndDesc;
}
- _bgatmos->play();
+ _bgatmos->playBA();
}
void Sound::bgStop() {
@@ -693,7 +693,7 @@ void Sound::bgStop() {
debugC(1, kDebugSound, "BackgroundAtmosphere: Stopping playback");
- _bgatmos->stop();
+ _bgatmos->stopBA();
_bgatmos->queueClear();
}
More information about the Scummvm-git-logs
mailing list