[Scummvm-git-logs] scummvm master -> 28345d7eb3ed14a25e72160ab17f4d17c57b2756

sev- sev at scummvm.org
Mon Oct 31 15:07:52 CET 2016


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:
f8388db32b JANITORIAL: Typos
28345d7eb3 Merge pull request #860 from a-detiste/master


Commit: f8388db32b26b1ca9ef109e1c0d83a04c052d9b5
    https://github.com/scummvm/scummvm/commit/f8388db32b26b1ca9ef109e1c0d83a04c052d9b5
Author: Alexandre Detiste (alexandre.detiste at gmail.com)
Date: 2016-10-31T09:56:43+01:00

Commit Message:
JANITORIAL: Typos

I've not fixed this one, maybe it's on purpose:

RELASE -> RELEASE

engines/mads/staticres.cpp:const char *const kGameReleaseTitleStr =
"GAME RELASE VERSION INFO";

Changed paths:
    engines/kyra/timer.cpp
    engines/lab/console.cpp
    engines/scumm/sound.cpp
    graphics/fonts/bdf.cpp



diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index edca3ef..97e989e 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -90,7 +90,7 @@ void TimerManager::reset() {
 void TimerManager::addTimer(uint8 id, TimerFunc *func, int countdown, bool enabled) {
 	Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
 	if (timer != _timers.end()) {
-		warning("Adding allready existing timer %d", id);
+		warning("Adding already existing timer %d", id);
 		return;
 	}
 
diff --git a/engines/lab/console.cpp b/engines/lab/console.cpp
index 20b1f56..a90c260 100644
--- a/engines/lab/console.cpp
+++ b/engines/lab/console.cpp
@@ -81,7 +81,7 @@ bool Console::Cmd_DumpSceneResources(int argc, const char **argv) {
 		"ResetBuffer", "SpecialCmd", "CShowMessage", "PlaySoundNoWait"
 	};
 
-	debugPrintf("Room mesage: %s\n", roomData->_roomMsg.c_str());
+	debugPrintf("Room message: %s\n", roomData->_roomMsg.c_str());
 	debugPrintf("Transition: %s (%d)\n", transitions[roomData->_transitionType], roomData->_transitionType);
 
 	debugPrintf("Script:\n");
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index a62092f..98958a3 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -359,7 +359,7 @@ void Sound::playSound(int soundID) {
 			_currentCDSound = soundID;
 		} else {
 			// All other sound types are ignored
-			warning("Scumm::Sound::playSound: encountered audio resoure with chunk type 'SOUN' and sound type %d", type);
+			warning("Scumm::Sound::playSound: encountered audio resource with chunk type 'SOUN' and sound type %d", type);
 		}
 	}
 	else if ((_vm->_game.platform == Common::kPlatformMacintosh) && (_vm->_game.id == GID_INDY3) && READ_BE_UINT16(ptr + 8) == 0x1C) {
diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index 6049f9a..fec5392 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -702,7 +702,7 @@ BdfFont *BdfFont::loadFromCache(Common::SeekableReadStream &stream) {
 
 BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) {
 	if (!src) {
-		warning("Emtpy font reference in scale font");
+		warning("Empty font reference in scale font");
 		return NULL;
 	}
 


Commit: 28345d7eb3ed14a25e72160ab17f4d17c57b2756
    https://github.com/scummvm/scummvm/commit/28345d7eb3ed14a25e72160ab17f4d17c57b2756
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-31T07:07:49-07:00

Commit Message:
Merge pull request #860 from a-detiste/master

JANITORIAL: Typos found by lintian

Changed paths:
    engines/kyra/timer.cpp
    engines/lab/console.cpp
    engines/scumm/sound.cpp
    graphics/fonts/bdf.cpp








More information about the Scummvm-git-logs mailing list