[Scummvm-git-logs] scummvm master -> 6d8d398cf751eb9fe2242ce259a08418c041a6d6
sev-
sev at scummvm.org
Sat Feb 4 15:17:26 CET 2017
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
04a2a8ba27 GRAPHICS: Hid noisy debug messages in MacText
e15f2e7d2d DIRECTOR: Hid font test under debug channel
6d8d398cf7 DIRECTOR: Implemented pausing/continuing of playback
Commit: 04a2a8ba27a0078480ae99ce67450912e13888de
https://github.com/scummvm/scummvm/commit/04a2a8ba27a0078480ae99ce67450912e13888de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-04T15:17:13+01:00
Commit Message:
GRAPHICS: Hid noisy debug messages in MacText
Changed paths:
graphics/macgui/mactext.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 7c22c81..66a041e 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -80,6 +80,7 @@ void MacText::splitString(Common::String &str) {
MacFontRun previousFormatting;
while (*s) {
+#if DEBUG
for (uint i = 0; i < _textLines.size(); i++) {
debugN(7, "%2d ", i);
@@ -88,6 +89,7 @@ void MacText::splitString(Common::String &str) {
debug(7, " --> %c %d, '%s'", (*s > 0x20 ? *s : ' '), (byte)*s, tmp.c_str());
}
+#endif
if (*s == '\001') {
s++;
Commit: e15f2e7d2dfa37a0a8b13cde2b464cddc52bad12
https://github.com/scummvm/scummvm/commit/e15f2e7d2dfa37a0a8b13cde2b464cddc52bad12
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-04T15:17:13+01:00
Commit Message:
DIRECTOR: Hid font test under debug channel
Changed paths:
engines/director/director.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 3e95d6b..958ed9c 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -119,8 +119,10 @@ Common::Error DirectorEngine::run() {
_mainArchive = nullptr;
_currentScore = nullptr;
- testFontScaling();
- testFonts();
+ if (debugChannelSet(-1, kDebugText)) {
+ testFontScaling();
+ testFonts();
+ }
_lingo->runTests();
Commit: 6d8d398cf751eb9fe2242ce259a08418c041a6d6
https://github.com/scummvm/scummvm/commit/6d8d398cf751eb9fe2242ce259a08418c041a6d6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-04T15:17:13+01:00
Commit Message:
DIRECTOR: Implemented pausing/continuing of playback
Changed paths:
engines/director/director.cpp
engines/director/director.h
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-funcs.cpp
engines/director/score.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 958ed9c..9417538 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -86,6 +86,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
_key = 0;
_keyCode = 0;
_machineType = 9; // Macintosh IIci
+ _playbackPaused = false;
}
DirectorEngine::~DirectorEngine() {
diff --git a/engines/director/director.h b/engines/director/director.h
index 8d5f6b5..9277abf 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -107,6 +107,7 @@ public:
unsigned char _key;
int _keyCode;
int _machineType;
+ bool _playbackPaused;
protected:
virtual Common::Error run();
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index cf044f2..3f0f5e4 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -681,11 +681,11 @@ void Lingo::b_xFactoryList(int nargs) {
// Control
///////////////////
void Lingo::b_abort(int nargs) {
- warning("STUB: b_continue");
+ warning("STUB: b_abort");
}
void Lingo::b_continue(int nargs) {
- warning("STUB: b_continue");
+ g_director->_playbackPaused = false;
}
void Lingo::b_dontPassEvent(int nargs) {
@@ -709,7 +709,9 @@ void Lingo::b_do(int nargs) {
}
void Lingo::b_pause(int nargs) {
- warning("STUB: b_pause");
+ g_director->_playbackPaused = true;
+
+ g_lingo->pushVoid(); // Fake value
}
void Lingo::b_playAccel(int nargs) {
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 140549b..ef19293 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -169,6 +169,8 @@ void Lingo::func_mciwait(Common::String &s) {
}
void Lingo::func_goto(Datum &frame, Datum &movie) {
+ g_director->_playbackPaused = false;
+
if (movie.type != VOID) {
movie.toString();
@@ -221,7 +223,7 @@ void Lingo::func_gotonext() {
_vm->_currentScore->gotoNext();
}
-
+
void Lingo::func_gotoprevious() {
if (!_vm->_currentScore)
return;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 1e97916..deff766 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -994,8 +994,11 @@ void Score::update() {
}
}
- _currentFrame++;
- if (_currentFrame >= _frames.size()) return;
+ if (!g_director->_playbackPaused)
+ _currentFrame++;
+
+ if (_currentFrame >= _frames.size())
+ return;
_frames[_currentFrame]->prepareFrame(this);
// Stage is drawn between the prepareFrame and enterFrame events (Lingo in a Nutshell)
@@ -1030,6 +1033,7 @@ void Score::update() {
}
}
}
+
_nextFrameTime = g_system->getMillis() + (float)_currentFrameRate / 60 * 1000;
}
More information about the Scummvm-git-logs
mailing list