[Scummvm-cvs-logs] scummvm master -> b384bb4a861b08dbbb42b14019f5b991a52a1b0f
Littleboy
littleboy22 at gmail.com
Fri Jun 3 00:32:53 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
be7064c25e LASTEXPRESS: Remove unused LastExpressEngine::errorString()
b384bb4a86 LASTEXPRESS: Replace sprintf() usage with Common::String::format()
Commit: be7064c25ed2702457ea8c3e84a1a8a7f397c5c5
https://github.com/scummvm/scummvm/commit/be7064c25ed2702457ea8c3e84a1a8a7f397c5c5
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-02T15:22:59-07:00
Commit Message:
LASTEXPRESS: Remove unused LastExpressEngine::errorString()
Changed paths:
engines/lastexpress/lastexpress.cpp
engines/lastexpress/lastexpress.h
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index d195fcf..6fdd184 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -314,8 +314,4 @@ bool LastExpressEngine::hasFeature(EngineFeature f) const {
return (f == kSupportsRTL);
}
-void LastExpressEngine::errorString(const char *buf_input, char *buf_output, int buf_output_size) {
- snprintf(buf_output, (uint)buf_output_size, "%s", buf_input);
-}
-
} // End of namespace LastExpress
diff --git a/engines/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h
index 270ab65..d78bba3 100644
--- a/engines/lastexpress/lastexpress.h
+++ b/engines/lastexpress/lastexpress.h
@@ -71,7 +71,6 @@ class LastExpressEngine : public Engine {
protected:
// Engine APIs
Common::Error run();
- virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
virtual bool hasFeature(EngineFeature f) const;
virtual Debugger *getDebugger() { return _debugger; }
Commit: b384bb4a861b08dbbb42b14019f5b991a52a1b0f
https://github.com/scummvm/scummvm/commit/b384bb4a861b08dbbb42b14019f5b991a52a1b0f
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-02T15:26:37-07:00
Commit Message:
LASTEXPRESS: Replace sprintf() usage with Common::String::format()
Changed paths:
engines/lastexpress/game/sound.cpp
diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp
index 81ed974..63efd18 100644
--- a/engines/lastexpress/game/sound.cpp
+++ b/engines/lastexpress/game/sound.cpp
@@ -821,12 +821,8 @@ void SoundManager::playSoundEvent(EntityIndex entity, byte action, byte a3) {
break;
}
- if (_action) {
- sprintf((char *)&filename, "LIB%03d.SND", _action);
-
- if (flag)
- playSoundWithSubtitles((char*)&filename, flag, kEntityPlayer, a3);
- }
+ if (_action && flag)
+ playSoundWithSubtitles(Common::String::format("LIB%03d.SND", _action), flag, kEntityPlayer, a3);
}
void SoundManager::playSteam(CityIndex index) {
@@ -885,10 +881,8 @@ void SoundManager::playFightSound(byte action, byte a4) {
break;
}
- if (_action) {
- sprintf((char *)&filename, "LIB%03d.SND", _action);
- playSound(kEntityTrain, (char*)&filename, kFlagDefault, a4);
- }
+ if (_action)
+ playSound(kEntityTrain, Common::String::format("LIB%03d.SND", _action), kFlagDefault, a4);
}
void SoundManager::playDialog(EntityIndex entity, EntityIndex entityDialog, FlagType flag, byte a4) {
More information about the Scummvm-git-logs
mailing list