[Scummvm-cvs-logs] SF.net SVN: scummvm:[45528] scummvm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Oct 30 10:50:31 CET 2009
Revision: 45528
http://scummvm.svn.sourceforge.net/scummvm/?rev=45528&view=rev
Author: fingolfin
Date: 2009-10-30 09:50:31 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Fixed Terry Pratchett's name in the credits
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/AUTHORS
scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp
scummvm/branches/branch-1-0-0/gui/credits.h
scummvm/branches/branch-1-0-0/tools/credits.pl
scummvm/trunk/AUTHORS
scummvm/trunk/gui/credits.h
scummvm/trunk/tools/credits.pl
Modified: scummvm/branches/branch-1-0-0/AUTHORS
===================================================================
--- scummvm/branches/branch-1-0-0/AUTHORS 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/branches/branch-1-0-0/AUTHORS 2009-10-30 09:50:31 UTC (rev 45528)
@@ -428,6 +428,6 @@
Alan Bridgman, Simon Woodroffe and everyone at Adventure Soft for sharing
the source code of some of their games with us.
- John Young, Colin Smythe and especially Terry Patchett himself for sharing
- the source code of Discworld I & II with us.
+ John Young, Colin Smythe and especially Terry Pratchett himself for
+ sharing the source code of Discworld I & II with us.
Modified: scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp 2009-10-30 09:50:31 UTC (rev 45528)
@@ -330,14 +330,15 @@
if (_vm->_mixer->isSoundHandleActive(*handle))
return RDERR_FXALREADYOPEN;
- Common::MemoryReadStream *stream = new Common::MemoryReadStream(data, len);
- int rate, size;
- byte flags;
-
if (Sword2Engine::isPsx()) {
+ Common::MemoryReadStream *stream = new Common::MemoryReadStream(data, len);
_vm->_mixer->playInputStream(soundType, handle, new Audio::VagStream(stream, loop), -1, vol, pan, true, false, isReverseStereo());
} else {
- if (!Audio::loadWAVFromStream(*stream, size, rate, flags)) {
+ Common::MemoryReadStream stream(data, len);
+ int rate, size;
+ byte flags;
+
+ if (!Audio::loadWAVFromStream(stream, size, rate, flags)) {
warning("playFX: Not a valid WAV file");
return RDERR_INVALIDWAV;
}
@@ -348,7 +349,7 @@
if (loop)
flags |= Audio::Mixer::FLAG_LOOP;
- _vm->_mixer->playRaw(soundType, handle, data + stream->pos(), size, rate, flags, -1, vol, pan, 0, 0);
+ _vm->_mixer->playRaw(soundType, handle, data + stream.pos(), size, rate, flags, -1, vol, pan, 0, 0);
}
return RD_OK;
Modified: scummvm/branches/branch-1-0-0/gui/credits.h
===================================================================
--- scummvm/branches/branch-1-0-0/gui/credits.h 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/branches/branch-1-0-0/gui/credits.h 2009-10-30 09:50:31 UTC (rev 45528)
@@ -516,7 +516,7 @@
"C0""",
"C0""Alan Bridgman, Simon Woodroffe and everyone at Adventure Soft for sharing the source code of some of their games with us.",
"C0""",
-"C0""John Young, Colin Smythe and especially Terry Patchett himself for sharing the source code of Discworld I & II with us.",
+"C0""John Young, Colin Smythe and especially Terry Pratchett himself for sharing the source code of Discworld I & II with us.",
"C0""",
"",
};
Modified: scummvm/branches/branch-1-0-0/tools/credits.pl
===================================================================
--- scummvm/branches/branch-1-0-0/tools/credits.pl 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/branches/branch-1-0-0/tools/credits.pl 2009-10-30 09:50:31 UTC (rev 45528)
@@ -951,7 +951,7 @@
"sharing the source code of some of their games with us.");
add_paragraph(
- "John Young, Colin Smythe and especially Terry Patchett himself for ".
+ "John Young, Colin Smythe and especially Terry Pratchett himself for ".
"sharing the source code of Discworld I & II with us.");
end_section();
Modified: scummvm/trunk/AUTHORS
===================================================================
--- scummvm/trunk/AUTHORS 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/trunk/AUTHORS 2009-10-30 09:50:31 UTC (rev 45528)
@@ -432,6 +432,6 @@
Alan Bridgman, Simon Woodroffe and everyone at Adventure Soft for sharing
the source code of some of their games with us.
- John Young, Colin Smythe and especially Terry Patchett himself for sharing
- the source code of Discworld I & II with us.
+ John Young, Colin Smythe and especially Terry Pratchett himself for
+ sharing the source code of Discworld I & II with us.
Modified: scummvm/trunk/gui/credits.h
===================================================================
--- scummvm/trunk/gui/credits.h 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/trunk/gui/credits.h 2009-10-30 09:50:31 UTC (rev 45528)
@@ -520,7 +520,7 @@
"C0""",
"C0""Alan Bridgman, Simon Woodroffe and everyone at Adventure Soft for sharing the source code of some of their games with us.",
"C0""",
-"C0""John Young, Colin Smythe and especially Terry Patchett himself for sharing the source code of Discworld I & II with us.",
+"C0""John Young, Colin Smythe and especially Terry Pratchett himself for sharing the source code of Discworld I & II with us.",
"C0""",
"",
};
Modified: scummvm/trunk/tools/credits.pl
===================================================================
--- scummvm/trunk/tools/credits.pl 2009-10-30 09:26:14 UTC (rev 45527)
+++ scummvm/trunk/tools/credits.pl 2009-10-30 09:50:31 UTC (rev 45528)
@@ -961,7 +961,7 @@
"sharing the source code of some of their games with us.");
add_paragraph(
- "John Young, Colin Smythe and especially Terry Patchett himself for ".
+ "John Young, Colin Smythe and especially Terry Pratchett himself for ".
"sharing the source code of Discworld I & II with us.");
end_section();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list