(svn r869) Mac: finally made asserts open the console, so people should be able to see what went wrong even if they opened the game in the GUI
deleted the wrongly moved bemidi.cpp
--- a/os/beos/bemidi.cpp Wed Dec 01 11:50:20 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#ifdef __BEOS__
-
-#include "stdafx.h"
-#include "ttd.h"
-#include "hal.h"
-
-// BeOS System Includes
-#include <MidiSynthFile.h>
-
-BMidiSynthFile midiSynthFile;
-
-static char *bemidi_start(char **parm)
-{
- return NULL;
-}
-
-static void bemidi_stop(void)
-{
- midiSynthFile.UnloadFile();
-}
-
-static void bemidi_play_song(const char *filename)
-{
- bemidi_stop();
- entry_ref midiRef;
- get_ref_for_path(filename, &midiRef);
- midiSynthFile.LoadFile(&midiRef);
- midiSynthFile.Start();
-}
-
-static void bemidi_stop_song(void)
-{
- midiSynthFile.UnloadFile();
-}
-
-static bool bemidi_is_playing(void)
-{
- return !midiSynthFile.IsFinished();
-}
-
-static void bemidi_set_volume(byte vol)
-{
- fprintf(stderr, "BeMidi: Set volume not implemented\n");
-}
-
-const HalMusicDriver _bemidi_music_driver = {
- bemidi_start,
- bemidi_stop,
- bemidi_play_song,
- bemidi_stop_song,
- bemidi_is_playing,
- bemidi_set_volume,
-};
-
-#endif // __BEOS__
Binary file os/macos/Crash_Log_Opener.sit has changed
--- a/unix.c Wed Dec 01 11:50:20 2004 +0000
+++ b/unix.c Wed Dec 01 15:23:05 2004 +0000
@@ -419,11 +419,14 @@
void ShowOSErrorBox(const char *buf)
{
+#if defined(__APPLE__)
+ // this creates an error in the console and then opens the console.
+ // Colourcodes are not used in the console, so they are skipped here
+ fprintf(stderr, "Error: %s", buf);
+ system("/Applications/Utilities/Console.app/Contents/MacOS/Console");
+#else
+ // all systems, but OSX
fprintf(stderr, "\033[1;31mError: %s\033[0;39m\n", buf);
-
-#if defined(__APPLE__)
- // this opens the crash log opener script
- system("./Crash_Log_Opener.app");
#endif
}