(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

3 files changed, 23 insertions, 11 deletions

diff --git a/src/os/macosx/macos.h b/src/os/macosx/macos.h
index b8a6cd511..ba33ce602 100644
--- a/src/os/macosx/macos.h
+++ b/src/os/macosx/macos.h
@@ -11,9 +11,15 @@
  * the function then adds text that tells the user to update and then report the bug if it's present in the newest version
  * It also quits in a nice way since we call it when we know something happened that will crash OpenTTD (like a needed pointer turns out to be NULL or similar)
  */
-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 );
-void ShowMacErrorDialog(const char *error);
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+	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 );
+	void ShowMacErrorDialog(const char *error);
+#ifdef __cplusplus
+}
+#endif //__cplusplus
 
 // 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.
diff --git a/src/os/macosx/macos.m b/src/os/macosx/macos.m
index 59801fce0..33f296325 100644
--- a/src/os/macosx/macos.m
+++ b/src/os/macosx/macos.m
@@ -8,11 +8,7 @@
 #include <mach/machine.h>
 #include <stdio.h>
 #include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../newgrf.h"
-#include "../../gfx.h"
 #include "../../macros.h"
-#include "../../string.h"
 
 #ifndef CPU_SUBTYPE_POWERPC_970
 #define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100)
@@ -26,6 +22,8 @@
  * To insure that the crosscompiler still works, let him try any changes before they are committed
  */
 
+void ToggleFullScreen(bool fs);
+
 static char *GetOSString(void)
 {
 	static char buffer[175];
@@ -74,7 +72,7 @@ static char *GetOSString(void)
 	}
 
 	// make a list of used newgrf files
-	if (_first_grffile != NULL) {
+/*	if (_first_grffile != NULL) {
 		char* n = newgrf;
 		const GRFFile* file;
 
@@ -82,9 +80,9 @@ static char *GetOSString(void)
 			n = strecpy(n, " ", lastof(newgrf));
 			n = strecpy(n, file->filename, lastof(newgrf));
 		}
-	} else {
+	} else {*/
 		sprintf(newgrf, "none");
-	}
+//	}
 
 	snprintf(
 		buffer, lengthof(buffer),
diff --git a/src/os/macosx/splash.h b/src/os/macosx/splash.h
index 39880562d..1bc4fa53c 100644
--- a/src/os/macosx/splash.h
+++ b/src/os/macosx/splash.h
@@ -5,6 +5,14 @@
 
 #define SPLASH_IMAGE_FILE		"splash.png"
 
-void DisplaySplashImage(void);
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+	void DisplaySplashImage(void);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
 
 #endif