[Scummvm-cvs-logs] scummvm master -> 01c527749295c838b2079f9c95fbab7fb18edc56

athrxx athrxx at scummvm.org
Mon May 16 18:10:38 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:
5fd257d3cc SCUMM: fix regression
01c5277492 Merge branch 'master' of https://github.com/scummvm/scummvm


Commit: 5fd257d3cccdb2800493237665eb1106f44fabab
    https://github.com/scummvm/scummvm/commit/5fd257d3cccdb2800493237665eb1106f44fabab
Author: athrxx (athrxx at scummvm.org)
Date: 2011-05-16T09:04:40-07:00

Commit Message:
SCUMM: fix regression

Changed paths:
    engines/scumm/imuse/imuse.cpp



diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 797d274..fe23b88 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -926,7 +926,7 @@ void IMuseInternal::sequencer_timers(MidiDriver *midi) {
 }
 
 void IMuseInternal::handle_marker(uint id, byte data) {
-	if (_queue_adding && _queue_sound == id && data == _queue_marker)
+	if ((_queue_end == _queue_pos) || (_queue_adding && _queue_sound == id && data == _queue_marker))
 		return;
 
 	uint16 *p = _cmd_queue[_queue_end].array;


Commit: 01c527749295c838b2079f9c95fbab7fb18edc56
    https://github.com/scummvm/scummvm/commit/01c527749295c838b2079f9c95fbab7fb18edc56
Author: athrxx (athrxx at scummvm.org)
Date: 2011-05-16T09:05:00-07:00

Commit Message:
Merge branch 'master' of https://github.com/scummvm/scummvm

Changed paths:
  A doc/translations/README-de.txt
  A doc/translations/README-fr.txt
  A doc/translations/README-translation_template.txt
    AUTHORS
    audio/mixer.cpp
    audio/mixer_intern.h
    backends/platform/iphone/iphone_video.m
    common/array.h
    devtools/credits.pl
    engines/agi/detection.cpp
    engines/cine/detection.cpp
    engines/cruise/detection.cpp
    engines/draci/detection.cpp
    engines/drascula/detection.cpp
    engines/gob/detection.cpp
    engines/groovie/detection.cpp
    engines/hugo/detection.cpp
    engines/kyra/detection.cpp
    engines/lastexpress/detection.cpp
    engines/lure/detection.cpp
    engines/m4/detection.cpp
    engines/made/detection.cpp
    engines/mohawk/detection.cpp
    engines/parallaction/detection.cpp
    engines/saga/detection.cpp
    engines/sci/detection.cpp
    engines/scumm/detection.cpp
    engines/sword25/detection.cpp
    engines/teenagent/detection.cpp
    engines/tinsel/detection.cpp
    engines/toon/detection.cpp
    engines/touche/detection.cpp
    engines/tsage/core.cpp
    engines/tsage/detection.cpp
    engines/tsage/events.cpp
    engines/tsage/graphics.cpp
    engines/tsage/ringworld_demo.cpp
    engines/tsage/ringworld_demo.h
    engines/tsage/ringworld_logic.cpp
    engines/tsage/ringworld_logic.h
    engines/tsage/ringworld_scenes2.cpp
    engines/tsage/scenes.h
    engines/tsage/staticres.cpp
    engines/tsage/staticres.h
    engines/tucker/detection.cpp
    gui/credits.h
    gui/options.cpp
    test/common/array.h
    test/module.mk









More information about the Scummvm-git-logs mailing list