aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-16 12:54:12 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-16 12:54:12 +0000
commitbe1063ce192df92901f72c426b157d0b82998b7a (patch)
tree7acf0cb1275daac62df7d5b4916d4d2836602c16 /code
parenta7ef60763b39a909910522cc7dc420c21887ec94 (diff)
downloadioquake3-aero-be1063ce192df92901f72c426b157d0b82998b7a.tar.gz
ioquake3-aero-be1063ce192df92901f72c426b157d0b82998b7a.zip
Cleanups for the Mac error dialog, after a code review from tma.
- Don't expose the function in sys_local.h (it would be static if we could). - Don't call it Sys_Cocoa_*; it'd be nonsense with q3a's naming conventions. git-svn-id: svn://svn.icculus.org/quake3/trunk@1631 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/sys/sys_cocoa.m2
-rw-r--r--code/sys/sys_local.h1
-rw-r--r--code/sys/sys_unix.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/code/sys/sys_cocoa.m b/code/sys/sys_cocoa.m
index 7efa615..cfc754d 100644
--- a/code/sys/sys_cocoa.m
+++ b/code/sys/sys_cocoa.m
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#import <Cocoa/Cocoa.h>
-void Sys_Cocoa_MsgBox( const char *text )
+void Cocoa_MsgBox( const char *text )
{
NSRunInformationalAlertPanel(@"ioquake3",
[NSString stringWithUTF8String:text],
diff --git a/code/sys/sys_local.h b/code/sys/sys_local.h
index 09d0cc0..6174876 100644
--- a/code/sys/sys_local.h
+++ b/code/sys/sys_local.h
@@ -46,7 +46,6 @@ unsigned int CON_LogRead( char *out, unsigned int outSize );
#ifdef MACOS_X
char *Sys_StripAppBundle( char *pwd );
-void Sys_Cocoa_MsgBox( const char *text );
#endif
void Sys_GLimpSafeInit( void );
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 641770c..5ed0721 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -511,8 +511,10 @@ void Sys_ErrorDialog( const char *error )
Sys_Print( va( "%s\n", error ) );
#if defined(MACOS_X) && !DEDICATED
+ /* This function has to be in a separate file, compiled as Objective-C. */
+ extern void Cocoa_MsgBox( const char *text );
if (!com_dedicated || !com_dedicated->integer)
- Sys_Cocoa_MsgBox(error);
+ Cocoa_MsgBox(error);
#endif
/* make sure the write path for the crashlog exists... */