Changeset 297

Timestamp:

07/05/08 05:21:36 (5 months ago)

Author:

mattn

Message:

* removed a lot of HACKs for several games by merging the enginepath_win32, enginepath_linux and enginepath_macos from 1.5
to 1.6 (default for everything is quake3)
* removed the hacks for q2.game and heretic2.game (just check whether the game config value quake2 is set - TODO: game
dialog needs update - quake2 option should be given)

Files:

• GtkRadiant/trunk/radiant/groupdialog.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/preferences.cpp (modified) (5 diffs)
• GtkRadiant/trunk/radiant/preferences.h (modified) (1 diff)
• GtkRadiant/trunk/radiant/surfaceplugin.cpp (modified) (7 diffs)
• GtkRadiant/trunk/radiant/watchbsp.cpp (modified) (12 diffs)

GtkRadiant/trunk/radiant/groupdialog.cpp

@@ -1341 +1341 @@
-              }
-
- || ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" )
+
-                                        GtkWidget *check = gtk_check_button_new_with_label (_("!Easy"));
-                                        gtk_widget_show (check);

GtkRadiant/trunk/radiant/preferences.cpp

@@ -695 +695 @@
-*/
-
+#if defined(WIN32)
+#define ENGINE_ATTRIBUTE "engine_win32"
+#define MP_ENGINE_ATTRIBUTE "mp_engine_win32"
+#elif defined(__linux__) || defined (__FreeBSD__)
+#define ENGINE_ATTRIBUTE "engine_linux"
+#define MP_ENGINE_ATTRIBUTE "mp_engine_linux"
+#elif defined(__APPLE__)
+#define ENGINE_ATTRIBUTE "engine_macos"
+#define MP_ENGINE_ATTRIBUTE "mp_engine_macos"
+#else
+#error "unsupported platform"
+#endif
+
+
+#if defined(WIN32)
+#define ENGINEPATH_ATTRIBUTE "enginepath_win32"
+#elif defined(__linux__) || defined (__FreeBSD__)
+#define ENGINEPATH_ATTRIBUTE "enginepath_linux"
+#elif defined(__APPLE__)
+#define ENGINEPATH_ATTRIBUTE "enginepath_macos"
+#else
+#error "unknown platform"
+#endif
+
+
-CGameDescription::CGameDescription(xmlDocPtr pDoc, const Str &GameFile)
-{
@@ -711 +736 @@
-  prop = (char*)xmlGetProp( pNode, (xmlChar*)"gametools" );
-  if ( prop == NULL ) {
-  
+
-  }
-  {
@@ -785 +810 @@
-  }
-
-
-  prop = (char*)xmlGetProp(pNode, (const xmlChar *)"enginepath"
-
-
+
+       prop = (char*)xmlGetProp(pNode, (const xmlChar*)ENGINE_ATTRIBUTE
+
+
-#ifdef _WIN32
-
-
-
+
+
+
+
+
-#endif
-    xmlFree( prop );
-        prop = NULL;
-    // process seperators
-    for ( p = full; *p != '\0'; p++ ) {
-          if ( *p == '\\' ) {
-            *p = '/';
-          }
-        }
-
-
-
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#if defined (__linux__) || defined (__APPLE__)
@@ -2885 +2930 @@
-    mLocalPrefs.GetPref(TEXTURE_KEY,            &m_bTextureWindow,              TRUE);
-  }
- || ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" )
+
-  {
-    // BSP monitoring is implemented in Quake2 and Heretic2 tools
@@ -3328 +3373 @@
-        fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
-        fprintf( fg, "  name=\"%s\"\n", m_strName.GetBuffer() );
-enginepath
+"ENGINEPATH_ATTRIBUTE"
-        switch ( m_availGames[ m_nComboSelect ] ) {
-        case GAME_Q2: {

GtkRadiant/trunk/radiant/preferences.h

@@ -172 +172 @@
-  Str mEnginePath; ///< path to the engine
-  Str mEngine; ///< engine name
+  Str mMultiplayerEngine; ///< engine name
-#if defined (__linux__) || defined (__APPLE__)
-  Str mUserPathPrefix; ///< prefix for ~/.q3a ~/.wolf init, only on *nix

GtkRadiant/trunk/radiant/surfaceplugin.cpp

@@ -169 +169 @@
-  bool b_isQuake2;
-
- ( g_pGameDescription->quake2 ) || ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" ) 
+g_pGameDescription->quake2
-    b_isQuake2 = true;
-  else
@@ -176 +176 @@
-  if (!texdef_face_list)
-    return;
-
+
- if (b_SetUndoPoint)
- {
@@ -191 +191 @@
-
-      Undo_Start("set facelist texdefs");
-
+
-      if( selected_brushes.next != &selected_brushes )
- 
+
-      else
-        Undo_AddBrush(texdef_face_list->brush);
-
-
-  
-
+
+
+
+
-  for(texdef_to_face = texdef_face_list; texdef_to_face; texdef_to_face = texdef_to_face->next)
-  {
@@ -206 +206 @@
-    else
-      SetFaceTexdef(texdef_to_face->face, &texdef_to_face->texdef, NULL , bFit_to_Scale);
- 
+
-    if(bFit_to_Scale)
-      texdef_to_face->texdef = texdef_to_face->face->texdef;
-  }
-
+
-  if ( b_SetUndoPoint )
-  {
@@ -216 +216 @@
-      {
-        if(selected_brushes.next != &selected_brushes)
- 
+
-        else
-          Undo_EndBrush(texdef_face_list->brush);
-
+
-        Undo_End();
-        // Over-write the orig_texdef list, cementing the change.
@@ -226 +226 @@
-      }
-  }
-
+
-  Sys_UpdateWindows (W_ALL);
-}
@@ -240 +240 @@
-  {
-    Face_FitTexture(temp_texdef_face_list->face, nHeight, nWidth);
- 
+
-    // Write changes to our working Texdef list
-    temp_texdef_face_list->texdef = temp_texdef_face_list->face->texdef;

GtkRadiant/trunk/radiant/watchbsp.cpp

@@ -3 +3 @@
-All rights reserved.
-
- 
+
-are permitted provided that the following conditions are met:
-
- 
+
-of conditions and the following disclaimer.
-
@@ -13 +13 @@
-other materials provided with the distribution.
-
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-*/
-
@@ -69 +69 @@
-#include "stream_version.h"
-
- 
+
-{
-  if (data->ignore_depth == 0)
@@ -94 +94 @@
-        else if (strcmp((char*)attrs[1],Q3MAP_STREAM_VERSION) != 0)
-        {
- 
+
-            "This version of Radiant reads version %s debug streams, I got an incoming connection with version %s\n"
-            "Please make sure your versions of Radiant and q3map are matching.\n", Q3MAP_STREAM_VERSION, (char*)attrs[1]);
@@ -106 +106 @@
-        data->msg_level = atoi ((char *)attrs[1]);
-      }
- 
+
-      // polyline has a particular status .. right now we only use it for leakfile ..
-      {
@@ -206 +206 @@
-  char saxMsgBuffer[4096];
-  va_list args;
-
+
-  va_start(args, msg);
-  vsprintf (saxMsgBuffer, msg, args);
@@ -217 +217 @@
-  char saxMsgBuffer[4096];
-  va_list args;
-
+
-  va_start(args, msg);
-  vsprintf (saxMsgBuffer, msg, args);
@@ -227 +227 @@
-{
-  char buffer[4096];
-
+
-  va_list args;
-
+
-  va_start(args, msg);
-  vsprintf (buffer, msg, args);
@@ -391 +391 @@
-      Sys_Printf("Connected.\n");
-      // prepare the message info struct for diving in
- 
+
-      // a dumb flag to make sure we init the push parser context when first getting a msg
-      m_bNeedCtxtInit = true;
@@ -504 +504 @@
-            cmd = g_pGameDescription->mEnginePath.GetBuffer();
-            // this is game dependant
-
-
+
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            }
-            else
-            {
+              // SP
-              cmd += g_pGameDescription->mEngine.GetBuffer();
-            }
-#ifdef _WIN32
-            // NOTE: we are using unix pathnames and CreateProcess doesn't like / in the program path
+                        // FIXME: This isn't true anymore, doesn't it?
-            FindReplace( cmd, "/", "\\" );
-#endif
-            Str cmdline;
-(g_pGameDescription->mGameFile == "q2.game") || (g_pGameDescription->mGameFile == "heretic2.game")
+g_pGameDescription->quake2
-            {
-                cmdline = ". +exec radiant.cfg +map ";
@@ -697 +547 @@
-                else
-                {
-                
+
-                  cmdline += "+set nextmap \"spdevmap ";
-                  cmdline += m_sBSPName;
@@ -743 +593 @@
-    Sys_Printf("WatchBSP got a monitoring request while not idling...\n");
-    // prompt the user, should we cancel the current process and go ahead?
- 
+
-      "BSP process monitoring", MB_YESNO ) == IDYES)
-    {