[Scummvm-cvs-logs] scummvm master -> ea79336ac90e12fe53242cfd9153db9d7087ca0f

athrxx athrxx at scummvm.org
Tue Mar 22 15:58:45 CET 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:
92f922aabe SCUMM FM-TOWNS: cleanup (thx LordHoto)
ea79336ac9 Merge branch 'master' of https://github.com/scummvm/scummvm


Commit: 92f922aabe5811fcf595697bc1316aa57b4c9b66
    https://github.com/scummvm/scummvm/commit/92f922aabe5811fcf595697bc1316aa57b4c9b66
Author: athrxx (athrxx at scummvm.org)
Date: 2011-03-22T07:53:43-07:00

Commit Message:
SCUMM FM-TOWNS: cleanup (thx LordHoto)

Changed paths:
    engines/scumm/gfx.cpp



diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 9efddc6..0db77a1 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1283,10 +1283,8 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) {
 		) {
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 		if (_game.platform == Common::kPlatformFMTowns) {
-			if (color == 254) {
-				color = color;
+			if (color == 254)
 				towns_setupPalCycleField(x, y, x2, y2);
-			}
 		} else
 #endif
 		{


Commit: ea79336ac90e12fe53242cfd9153db9d7087ca0f
    https://github.com/scummvm/scummvm/commit/ea79336ac90e12fe53242cfd9153db9d7087ca0f
Author: athrxx (athrxx at scummvm.org)
Date: 2011-03-22T07:55:17-07:00

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

Changed paths:
  A dists/android/README.Android
  R engines/mohawk/myst_vars.cpp
  R engines/mohawk/myst_vars.h
    NEWS
    backends/graphics/opengl/opengl-graphics.cpp
    backends/graphics/opengl/opengl-graphics.h
    backends/graphics/openglsdl/openglsdl-graphics.cpp
    backends/platform/android/android.cpp
    backends/platform/android/android.h
    backends/platform/android/android.mk
    backends/platform/android/events.cpp
    configure
    engines/agi/preagi.cpp
    engines/agos/agos.cpp
    engines/cine/cine.cpp
    engines/cine/cine.h
    engines/cruise/cruise.cpp
    engines/cruise/sound.cpp
    engines/draci/draci.cpp
    engines/draci/sound.cpp
    engines/drascula/drascula.cpp
    engines/engine.cpp
    engines/engine.h
    engines/gob/detection_tables.h
    engines/gob/gob.cpp
    engines/groovie/groovie.cpp
    engines/hugo/display.cpp
    engines/hugo/file.cpp
    engines/hugo/file_v1d.cpp
    engines/hugo/file_v2w.cpp
    engines/hugo/hugo.cpp
    engines/hugo/hugo.h
    engines/hugo/intro.cpp
    engines/hugo/mouse.cpp
    engines/hugo/object.cpp
    engines/hugo/parser.cpp
    engines/hugo/parser_v1d.cpp
    engines/hugo/parser_v1w.cpp
    engines/hugo/parser_v2d.cpp
    engines/hugo/parser_v3d.cpp
    engines/hugo/schedule.cpp
    engines/hugo/util.cpp
    engines/hugo/util.h
    engines/lastexpress/lastexpress.cpp
    engines/lure/lure.cpp
    engines/m4/m4.cpp
    engines/made/made.cpp
    engines/mohawk/mohawk.cpp
    engines/mohawk/riven.cpp
    engines/mohawk/riven.h
    engines/mohawk/riven_external.cpp
    engines/mohawk/riven_external.h
    engines/mohawk/riven_saveload.cpp
    engines/mohawk/video.cpp
    engines/mohawk/video.h
    engines/parallaction/parallaction.cpp
    engines/queen/queen.cpp
    engines/queen/sound.cpp
    engines/saga/music.cpp
    engines/saga/saga.cpp
    engines/saga/sound.cpp
    engines/sci/console.cpp
    engines/sci/console.h
    engines/sci/detection_tables.h
    engines/sci/engine/gc.cpp
    engines/sci/engine/gc.h
    engines/sci/graphics/animate.cpp
    engines/sci/graphics/animate.h
    engines/sci/graphics/paint16.h
    engines/sci/graphics/ports.cpp
    engines/sci/graphics/ports.h
    engines/sci/sci.h
    engines/scumm/scumm.cpp
    engines/sky/sky.cpp
    engines/sky/sky.h
    engines/sword1/sword1.cpp
    engines/sword2/sword2.cpp
    engines/sword25/gfx/graphicengine_script.cpp
    engines/sword25/math/geometry_script.cpp
    engines/sword25/script/luabindhelper.cpp
    engines/sword25/script/luabindhelper.h
    engines/sword25/sword25.cpp
    engines/sword25/util/lua/lmathlib.cpp
    engines/touche/touche.cpp
    engines/tucker/detection.cpp
    engines/tucker/tucker.cpp
    engines/tucker/tucker.h
    video/qt_decoder.h
    video/video_decoder.h









More information about the Scummvm-git-logs mailing list