From c925f452e740dbd1e4d9d48dd2ff814aa9cdc6ee Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Wed, 1 Dec 2004 15:23:05 +0000
Subject: (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

---
 os/beos/bemidi.cpp            |  55 ------------------------------------------
 os/macos/Crash_Log_Opener.sit | Bin 16831 -> 0 bytes
 unix.c                        |  11 ++++++---
 3 files changed, 7 insertions(+), 59 deletions(-)
 delete mode 100644 os/beos/bemidi.cpp
 delete mode 100644 os/macos/Crash_Log_Opener.sit

diff --git a/os/beos/bemidi.cpp b/os/beos/bemidi.cpp
deleted file mode 100644
index d0f41d865..000000000
--- a/os/beos/bemidi.cpp
+++ /dev/null
@@ -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__
diff --git a/os/macos/Crash_Log_Opener.sit b/os/macos/Crash_Log_Opener.sit
deleted file mode 100644
index 29cf89c3a..000000000
Binary files a/os/macos/Crash_Log_Opener.sit and /dev/null differ
diff --git a/unix.c b/unix.c
index 9d1736df4..c29008129 100644
--- a/unix.c
+++ b/unix.c
@@ -419,11 +419,14 @@ void ShowInfo(const char *str)
 
 void ShowOSErrorBox(const char *buf)
 {
-	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");
+	// 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);
 #endif
 }
 
-- 
cgit v1.2.3-70-g09d2