Merge commit '146d231d90b19e2a0edcabff1c4eb9ca44e053e7' into master-merge

[xonotic/netradiant.git] / contrib / bobtoolz / ctfToolz-GTK.cpp

diff --git a/contrib/bobtoolz/ctfToolz-GTK.cpp b/contrib/bobtoolz/ctfToolz-GTK.cpp
index 218ec1950fb2885c450bd55e99a60130975ed4a0..c4b6c6d511b869a461ae0010866a59fbb431dbde 100644 (file)
--- a/contrib/bobtoolz/ctfToolz-GTK.cpp
+++ b/contrib/bobtoolz/ctfToolz-GTK.cpp
@@ -24,116 +24,82 @@
 
 #include "dialogs/dialogs-gtk.h"
 
+#define PLUGIN_NAME "ctfTools"
+#define CMD_ABOUT = "About..."
+
 // Radiant function table
 _QERFuncTable_1 g_FuncTable;
 _QERAppBSPFrontendTable g_BSPTable;             // for map name
 
-BOOL g_bBSPInitDone = FALSE;
-
-// plugin name
-static const char *PLUGIN_NAME = "ctfToolz";
+BOOL g_bBSPInitDone                 = FALSE;
 
 // commands in the menu
-static const char *PLUGIN_COMMANDS = "About...,Colour Changer...,Swap Light Colours,Change Angles 180,Swap Spawn Points";
+static const char *PLUGIN_COMMANDS = ABOUT_CMD ",Colour Changer...,Swap Light Colours,Change Angles 180,Swap Spawn Points";
 
 // globals
-GtkWidget *g_pRadiantWnd = NULL;
-
-static const char *PLUGIN_ABOUT = "ctfToolz for NetRadiant\n"
-        "by djbob\n"
-        "http://www.planetquake.com/toolz\n\n";
-
-extern "C" LPVOID WINAPI
-
-QERPlug_GetFuncTable()
-{
-    return &g_FuncTable;
-}
-
-extern "C" LPCSTR WINAPI
-QERPlug_Init( HMODULE
-hApp,
-GtkWidget *pMainWidget
-){
-g_pRadiantWnd = pMainWidget;
-memset( &g_FuncTable,
-0, sizeof( _QERFuncTable_1 ));
-g_FuncTable.
-m_fVersion = QER_PLUG_VERSION;
-g_FuncTable.
-m_nSize = sizeof(_QERFuncTable_1);
-
-return "ctfToolz for GTKradiant";
-}
-
-extern "C" LPCSTR WINAPI
+GtkWidget *main_window = NULL;
 
-QERPlug_GetName()
-{
-    return (char *) PLUGIN_NAME;
+extern "C" LPVOID WINAPI QERPlug_GetFuncTable(){
+       return &g_FuncTable;
 }
 
-extern "C" LPCSTR WINAPI
+extern "C" LPCSTR WINAPI QERPlug_Init( HMODULE hApp, GtkWidget* pMainWidget ){
+       main_window = pMainWidget;
+       memset( &g_FuncTable, 0, sizeof( _QERFuncTable_1 ) );
+       g_FuncTable.m_fVersion = QER_PLUG_VERSION;
+       g_FuncTable.m_nSize = sizeof( _QERFuncTable_1 );
 
-QERPlug_GetCommandList()
-{
-    return (char *) PLUGIN_COMMANDS;
+       return "ctfToolz for GTKradiant";
 }
 
-extern "C" void WINAPI
-QERPlug_Dispatch( LPCSTR
-p,
-vec3_t vMin, vec3_t
-vMax,
-bool bSingleBrush
-){
-LoadLists();
-
-if ( !g_bBSPInitDone ) {
-g_BSPTable.
-m_nSize = sizeof(_QERAppBSPFrontendTable);
-if ( g_FuncTable.
-m_pfnRequestInterface( QERAppBSPFrontendTable_GUID,
-static_cast
-<LPVOID>( &g_BSPTable )
-)) {
-g_bBSPInitDone = TRUE;
-}
-else
-{
-Sys_ERROR( "_QERAppBSPFrontendTable interface request failed\n" );
-return;
-}
+extern "C" LPCSTR WINAPI QERPlug_GetName(){
+       return (char*)PLUGIN_NAME;
 }
 
-if ( !
-strcmp( p,
-"About..." )) {
-DoMessageBox( PLUGIN_ABOUT,
-"About", IDOK );
+extern "C" LPCSTR WINAPI QERPlug_GetCommandList(){
+       return (char*)PLUGIN_COMMANDS;
 }
-else if ( !
-strcmp( p,
-"Colour Changer..." )) {
-DoCTFColourChanger();
 
-}
-else if ( !
-strcmp( p,
-"Swap Light Colours" )) {
-DoSwapLights();
-
-}
-else if ( !
-strcmp( p,
-"Change Angles 180" )) {
-DoChangeAngles();
-
-}
-else if ( !
-strcmp( p,
-"Swap Spawn Points" )) {
-DoSwapSpawns();
-
-}
+extern "C" void WINAPI QERPlug_Dispatch( LPCSTR p, vec3_t vMin, vec3_t vMax, bool bSingleBrush ){
+       LoadLists();
+
+       if ( !g_bBSPInitDone ) {
+               g_BSPTable.m_nSize = sizeof( _QERAppBSPFrontendTable );
+               if ( g_FuncTable.m_pfnRequestInterface( QERAppBSPFrontendTable_GUID, static_cast<LPVOID>( &g_BSPTable ) ) ) {
+                       g_bBSPInitDone = TRUE;
+               }
+               else
+               {
+                       Sys_ERROR( "_QERAppBSPFrontendTable interface request failed\n" );
+                       return;
+               }
+       }
+
+       if ( !strcmp( p, CMD_ABOUT ) ) {
+               const char *label_text =
+                       PLUGIN_NAME for " RADIANT_NAME "\n\n"
+                       "Written by djbob\n\n"
+//                     20190605 dead link
+//                     "http://www.planetquake.com/toolz\n\n"
+                       "Built against "
+                       RADIANT_NAME " " RADIANT_VERSION "\n"
+                       __DATE__;
+
+               GlobalRadiant().m_pfnMessageBox( main_window, label_text,
+                                                                               "About " PLUGIN_NAME,
+                                                                               eMB_OK,
+                                                                               eMB_ICONDEFAULT );
+       }
+       else if ( !strcmp( p, "Colour Changer..." ) ) {
+               DoCTFColourChanger();
+       }
+       else if ( !strcmp( p, "Swap Light Colours" ) ) {
+               DoSwapLights();
+       }
+       else if ( !strcmp( p, "Change Angles 180" ) ) {
+               DoChangeAngles();
+       }
+       else if ( !strcmp( p, "Swap Spawn Points" ) ) {
+               DoSwapSpawns();
+       }
 }