[Scummvm-cvs-logs] scummvm master -> 354e7d05888c69f1af9778ecd065ffc02505fa4b

lskovlun lskovlun at sprogklog.dk
Wed Mar 9 20:20:44 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:
a55a211ddc SCI32: Reroute kSave(5) to kGetSaveFiles(). Any differences to pre-SCI32
354e7d0588 Merge branch 'master' of github.com:scummvm/scummvm


Commit: a55a211ddc270e8f9f292874b1a8e5881b572294
    https://github.com/scummvm/scummvm/commit/a55a211ddc270e8f9f292874b1a8e5881b572294
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2011-03-09T11:18:34-08:00

Commit Message:
SCI32: Reroute kSave(5) to kGetSaveFiles(). Any differences to pre-SCI32
kGetSaveFiles() should be worked out there.

Changed paths:
    engines/sci/engine/kfile.cpp



diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 4518276..82522a6 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -1163,9 +1163,7 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) {
 	case 2:
 		return kGetSaveDir(s, argc - 1, argv + 1);
 	case 5:
-		// TODO
-		// 3 parameters: game ID, a string and an array
-		return s->r_acc;
+		return kGetSaveFiles(s, argc - 1, argv + 1);
 	case 8:
 		// TODO
 		// This is a timer callback, with 1 parameter: the timer object


Commit: 354e7d05888c69f1af9778ecd065ffc02505fa4b
    https://github.com/scummvm/scummvm/commit/354e7d05888c69f1af9778ecd065ffc02505fa4b
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2011-03-09T11:19:50-08:00

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

Changed paths:
    backends/events/wincesdl/wincesdl-events.cpp
    backends/events/wincesdl/wincesdl-events.h
    backends/platform/wince/CEActionsPocket.cpp
    backends/platform/wince/CEActionsSmartphone.cpp
    backends/platform/wince/CEDevice.cpp
    backends/platform/wince/CEException.cpp
    backends/platform/wince/CELauncherDialog.cpp
    backends/platform/wince/CEgui/GUIElement.cpp
    backends/platform/wince/CEgui/ItemAction.cpp
    backends/platform/wince/CEgui/ItemSwitch.cpp
    backends/platform/wince/CEgui/Panel.cpp
    backends/platform/wince/CEgui/Panel.h
    backends/platform/wince/CEgui/PanelItem.h
    backends/platform/wince/CEgui/PanelKeyboard.cpp
    backends/platform/wince/CEgui/SDL_ImageResource.cpp
    backends/platform/wince/CEgui/SDL_ImageResource.h
    backends/platform/wince/CEgui/ToolbarHandler.cpp
    backends/platform/wince/CEgui/ToolbarHandler.h
    backends/platform/wince/CEkeys/EventsBuffer.cpp
    backends/platform/wince/CEkeys/EventsBuffer.h
    backends/platform/wince/missing/io.h
    backends/platform/wince/missing/missing.cpp
    backends/platform/wince/missing/time.h
    backends/platform/wince/portdefs.h
    backends/platform/wince/wince-sdl.cpp
    backends/platform/wince/wince-sdl.h
    engines/mohawk/graphics.cpp
    engines/mohawk/graphics.h
    engines/mohawk/riven_external.cpp
    engines/mohawk/riven_external.h
    engines/sci/engine/kevent.cpp
    engines/sci/event.cpp
    engines/sci/event.h
    engines/sci/graphics/menu.cpp
    engines/sci/graphics/view.cpp









More information about the Scummvm-git-logs mailing list