* Tremulous patch by Ingar

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@288 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/COMPILING b/COMPILING
index b3ec018249e03ef0b02f3c523284956b70da28cc..ed2f58e66db9942ea35f152a1d62c2afc2fe1106 100644 (file)
--- a/COMPILING
+++ b/COMPILING
@@ -13,9 +13,12 @@ The subversion client can be obtained from the Subversion site.
 To get a copy of the source using the commandline Subversion client:
   Change the current directory to the desired location for the source.
   svn checkout https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/ ./GtkRadiant
-  svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/ ./GtkRadiant/games/Q3Pack
-  svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/UFOAIPack/trunk/ ./GtkRadiant/games/UFOAIPack
 
+Download the desired game packs:
+  cd ./GtkRadiant/install/installs
+  svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/ ./Q3Pack
+  svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/UFOAIPack/trunk/ ./UFOAIPack
+  svn checkout https://zerowing.idsoftware.com/svn/radiant.gamepacks/TremulousPack/trunk/ ./TremulousPack
 
 Linux/OSX(using X-windows)
 ==========================

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 709642082b2f281ad583fc590120ea6283a27da3..4bae22aa16e2e51e14c3af6cc7d36f51bc633638 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3248,6 +3248,9 @@ void CGameInstall::BuildDialog() {
                case GAME_NEXUIZ:
                        gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Nexuiz") );
                        break;
+               case GAME_TREMULOUS:
+                       gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Tremulous") );
+                       break;
                }
                iGame++;
        }
@@ -3414,6 +3417,18 @@ void CGameInstall::Run() {
                fprintf( fg, "  basegame=\"data\"\n" );
                break;
        }
+       case GAME_TREMULOUS: {
+               fprintf( fg, "  gametools=\"%sinstalls/TremulousPack/game\"\n", g_strAppPath.GetBuffer() );
+               fprintf( fg, "  prefix=\".tremulous\"\n" );
+               Str source = g_strAppPath.GetBuffer();
+               source += "installs/";
+               source += TREMULOUS_PACK;
+               source += "/install/";
+               Str dest = m_strEngine.GetBuffer();
+               CopyTree( source.GetBuffer(), dest.GetBuffer() );
+               fprintf( fg, "  basegame=\"base\"\n" );
+               break;
+       }
        }
        fprintf( fg, "/>\n" );
        fclose( fg );
@@ -3454,6 +3469,9 @@ void CGameInstall::ScanGames() {
                if ( stricmp( dirname, Q2_PACK ) == 0 ) {
                        m_availGames[ iGame++ ] = GAME_Q2;
                }
+               if ( stricmp( dirname, TREMULOUS_PACK ) == 0 ) {
+                       m_availGames[ iGame++ ] = GAME_TREMULOUS;
+               }
        }
 }
 

diff --git a/radiant/preferences.h b/radiant/preferences.h
index 2f65ecf79812ceb396743dc7d472805b274d83cc..6d0c9667f34732059d1cbab11246c9db9d837eb1 100644 (file)
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -206,6 +206,7 @@ select games, copy editing assets and write out configuration files
 #define WARSOW_PACK "WarsowPack"
 #define NEXUIZ_PACK "NexuizPack"
 #define Q2_PACK "Q2Pack"
+#define TREMULOUS_PACK "TremulousPack"
 
 class CGameInstall : public Dialog {
 public:
@@ -226,6 +227,7 @@ public:
                GAME_WARSOW,
                GAME_NEXUIZ,
                GAME_Q2,
+               GAME_TREMULOUS,
                GAME_COUNT
        };