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

fingolfin max at quendi.de
Thu Apr 28 15:56:53 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:
05bcfd512f TSAGE: Don't use NULL for an int parameter
a0fc266c82 MACOSX: Fix compilation


Commit: 05bcfd512f1415000241b3427fed689c0d3f9914
    https://github.com/scummvm/scummvm/commit/05bcfd512f1415000241b3427fed689c0d3f9914
Author: Max Horn (max at quendi.de)
Date: 2011-04-28T06:54:22-07:00

Commit Message:
TSAGE: Don't use NULL for an int parameter

Changed paths:
    engines/tsage/ringworld_scenes1.cpp



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 7886c51..e34973d 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -3001,7 +3001,7 @@ void Scene6100::Action5::dispatch() {
 			switch (scene->_hitCount++) {
 			case 1:
 				scene->_soundHandler.startSound(233);
-				scene->showMessage(0, NULL, 0);
+				scene->showMessage(NULL, 0, NULL);
 
 				if (!_globals->getFlag(76))
 					scene->_probe.setAction(&scene->_action2);
@@ -3009,7 +3009,7 @@ void Scene6100::Action5::dispatch() {
 
 			case 2:
 				scene->_soundHandler.startSound(234);
-				scene->showMessage(0, NULL, 0);
+				scene->showMessage(NULL, 0, NULL);
 
 				if (!_globals->getFlag(76))
 					scene->_probe.setAction(NULL);
@@ -3018,7 +3018,7 @@ void Scene6100::Action5::dispatch() {
 
 			default:
 				scene->_soundHandler.startSound(233);
-				scene->showMessage(0, NULL, 0);
+				scene->showMessage(NULL, 0, NULL);
 
 				if (!_globals->getFlag(76))
 					scene->_probe.setAction(&scene->_action1);


Commit: a0fc266c82f89fe09b410d3e2c75706d43efd5a4
    https://github.com/scummvm/scummvm/commit/a0fc266c82f89fe09b410d3e2c75706d43efd5a4
Author: Max Horn (max at quendi.de)
Date: 2011-04-28T06:55:41-07:00

Commit Message:
MACOSX: Fix compilation

Changed paths:
    backends/midi/coreaudio.cpp
    backends/midi/coremidi.cpp



diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp
index 0158cc4..52d32cb 100644
--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@@ -41,6 +41,8 @@
 
 
 #include "common/config-manager.h"
+#include "common/error.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"
diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index 9123c9b..87cd630 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -30,6 +30,8 @@
 #ifdef MACOSX
 
 #include "common/config-manager.h"
+#include "common/error.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"






More information about the Scummvm-git-logs mailing list