mirror of https://github.com/OpenTTD/OpenTTD
(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.cpprelease/0.4.5
parent
2fc6077a68
commit
c925f452e7
|
@ -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 not shown.
11
unix.c
11
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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue