mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-27 08:29:11 +00:00
(svn r2741) -Feature: [OSX] added a window to display asserts on OSX (Tobin)
This commit is contained in:
@@ -2,5 +2,18 @@
|
||||
#define MACOS_H
|
||||
|
||||
void ShowMacDialog ( const char *title, const char *message, const char *buttonLabel );
|
||||
void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression );
|
||||
|
||||
#endif /* MACOS_H */
|
||||
// Since MacOS X users will never see an assert unless they started the game from a terminal
|
||||
// we're using a custom assert(e) macro.
|
||||
#undef assert
|
||||
|
||||
#ifdef NDEBUG
|
||||
#define assert(e) ((void)0)
|
||||
#else
|
||||
|
||||
#define assert(e) \
|
||||
(__builtin_expect(!(e), 0) ? ShowMacAssertDialog ( __func__, __FILE__, __LINE__, #e ): (void)0 )
|
||||
#endif
|
||||
|
||||
#endif /* MACOS_H */
|
||||
|
@@ -13,3 +13,14 @@ void ShowMacDialog ( const char *title, const char *message, const char *buttonL
|
||||
NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil);
|
||||
}
|
||||
|
||||
void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression )
|
||||
{
|
||||
const char *buffer =
|
||||
[[NSString stringWithFormat:@"An assertion has failed and OpenTTD must quit.\n%s in %s (line %d)\n\"%s\"\n\nYou should report this error the OpenTTD developers if you think you found a bug.",
|
||||
function, file, line, expression] cStringUsingEncoding:NSASCIIStringEncoding];
|
||||
NSLog(@"%s", buffer);
|
||||
ShowMacDialog( "Assertion Failed", buffer, "Quit" );
|
||||
|
||||
// abort so that a debugger has a chance to notice
|
||||
abort();
|
||||
}
|
||||
|
Reference in New Issue
Block a user