[Scummvm-cvs-logs] SF.net SVN: scummvm:[36300] scummvm/branches/branch-0-13-0
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Fri Feb 13 11:06:28 CET 2009
Revision: 36300
http://scummvm.svn.sourceforge.net/scummvm/?rev=36300&view=rev
Author: Kirben
Date: 2009-02-13 10:06:27 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
Revert talkspeed changes, while still only using the game specific talkspeed setting (if it exists). And clarify the talkspeed differences between games in the README.
Modified Paths:
--------------
scummvm/branches/branch-0-13-0/README
scummvm/branches/branch-0-13-0/engines/scumm/input.cpp
scummvm/branches/branch-0-13-0/engines/scumm/script.cpp
scummvm/branches/branch-0-13-0/engines/scumm/script_v8.cpp
scummvm/branches/branch-0-13-0/engines/scumm/scumm.cpp
scummvm/branches/branch-0-13-0/engines/scumm/scumm.h
Modified: scummvm/branches/branch-0-13-0/README
===================================================================
--- scummvm/branches/branch-0-13-0/README 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/README 2009-02-13 10:06:27 UTC (rev 36300)
@@ -836,7 +836,8 @@
Steel Sky and Flight of the Amazon Queen
--copy-protection Enable copy protection in games, when
ScummVM disables it by default.
- --talkspeed=NUM Set talk speed for games (default: 60)
+ --talkspeed=NUM Set talk delay for SCUMM games, or talk speed for
+ other games (default: 60)
--demo-mode Start demo mode of Maniac Mansion (Classic version)
--tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games
(default: 100)
@@ -1748,7 +1749,8 @@
jp, zh, kr, se, gb, hb, cz, ru)
speech_mute bool If true, speech is muted
subtitles bool Set to true to enable subtitles.
- talkspeed number Text speed
+ talkspeed number Text delay in SCUMM games, or text speed in
+ other games.
fullscreen bool Fullscreen mode
aspect_ratio bool Enable aspect ratio correction
Modified: scummvm/branches/branch-0-13-0/engines/scumm/input.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/input.cpp 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/engines/scumm/input.cpp 2009-02-13 10:06:27 UTC (rev 36300)
@@ -518,7 +518,7 @@
_defaultTalkDelay = 9 - runDialog(dlg);
// Save the new talkspeed value to ConfMan
- setTalkDelay(_defaultTalkDelay);
+ setTalkSpeed(_defaultTalkDelay);
if (VAR_CHARINC != 0xFF)
VAR(VAR_CHARINC) = _defaultTalkDelay;
Modified: scummvm/branches/branch-0-13-0/engines/scumm/script.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/script.cpp 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/engines/scumm/script.cpp 2009-02-13 10:06:27 UTC (rev 36300)
@@ -628,10 +628,10 @@
// look at the target specific settings, assuming that any global
// value is likely to be bogus. See also bug #2251765.
if (ConfMan.hasKey("talkspeed", _targetName)) {
- value = getTalkDelay();
+ value = getTalkSpeed();
} else {
// Save the new talkspeed value to ConfMan
- setTalkDelay(value);
+ setTalkSpeed(value);
}
}
Modified: scummvm/branches/branch-0-13-0/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/script_v8.cpp 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/engines/scumm/script_v8.cpp 2009-02-13 10:06:27 UTC (rev 36300)
@@ -429,10 +429,10 @@
// look at the target specific settings, assuming that any global
// value is likely to be bogus. See also bug #2251765.
if (ConfMan.hasKey("talkspeed", _targetName)) {
- value = getTalkDelay();
+ value = getTalkSpeed();
} else {
// Save the new talkspeed value to ConfMan
- setTalkDelay(value);
+ setTalkSpeed(value);
}
}
Modified: scummvm/branches/branch-0-13-0/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/scumm.cpp 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/engines/scumm/scumm.cpp 2009-02-13 10:06:27 UTC (rev 36300)
@@ -1707,18 +1707,18 @@
VAR(VAR_VOICE_MODE) = _voiceMode;
if (ConfMan.hasKey("talkspeed", _targetName)) {
- _defaultTalkDelay = getTalkDelay();
+ _defaultTalkDelay = getTalkSpeed();
if (VAR_CHARINC != 0xFF)
VAR(VAR_CHARINC) = _defaultTalkDelay;
}
}
-void ScummEngine::setTalkDelay(int talkdelay) {
- ConfMan.setInt("talkspeed", ((9 - talkdelay) * 255 + 9 / 2) / 9);
+void ScummEngine::setTalkSpeed(int talkspeed) {
+ ConfMan.setInt("talkspeed", (talkspeed * 255 + 9 / 2) / 9);
}
-int ScummEngine::getTalkDelay() {
- return 9 - (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
+int ScummEngine::getTalkSpeed() {
+ return (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
}
Modified: scummvm/branches/branch-0-13-0/engines/scumm/scumm.h
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/scumm.h 2009-02-13 10:04:17 UTC (rev 36299)
+++ scummvm/branches/branch-0-13-0/engines/scumm/scumm.h 2009-02-13 10:06:27 UTC (rev 36300)
@@ -474,8 +474,8 @@
virtual void loadLanguageBundle() {}
void loadCJKFont();
void setupMusic(int midi);
- void setTalkDelay(int talkdelay);
- int getTalkDelay();
+ void setTalkSpeed(int talkspeed);
+ int getTalkSpeed();
// Scumm main loop & helper functions.
virtual void scummLoop(int delta);
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