* applied Shamus Jedi Academy patch for Zeroradiant (gamepack will follow soon)

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@324 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/config.py b/config.py
index 30f623df25ef6e42645593f26b327611757afeea..5c6c150d2d46151695ab1d2bc5dec47c40a290b7 100644 (file)
--- a/config.py
+++ b/config.py
@@ -33,7 +33,7 @@ class Config:
                # platforms for which to assemble a setup
                self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
                # paks to assemble in the setup
-               self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack' ]
+               self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack', 'JAPack' ]
 
        def __repr__( self ):
                return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@@ -262,7 +262,7 @@ class Config:
 
        def FetchGamePaks( self, path ):
                for pak in self.setup_packs:
-                       if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' ):
+                       if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'JAPack' ):
                                svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
                                self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
 

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 9608fbb981737ff33dfa130623b4e5934c31e4e8..6050c49b00846816f6250c6852eeb7b6fa931b63 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3295,6 +3295,9 @@ void CGameInstall::BuildDialog() {
                case GAME_TREMULOUS:
                        gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Tremulous") );
                        break;
+               case GAME_JA:
+                       gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Jedi Academy and mods") );
+                       break;
                }
                iGame++;
        }
@@ -3473,6 +3476,18 @@ void CGameInstall::Run() {
                fprintf( fg, "  basegame=\"base\"\n" );
                break;
        }
+       case GAME_JA: {
+               fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/JAPack/game\"\n", g_strAppPath.GetBuffer() );
+               fprintf( fg, "  prefix=\".ja\"\n" );
+               Str source = g_strAppPath.GetBuffer();
+               source += "installs/";
+               source += JA_PACK;
+               source += "/install/";
+               Str dest = m_strEngine.GetBuffer();
+               CopyTree( source.GetBuffer(), dest.GetBuffer() );
+               fprintf( fg, "  basegame=\"base\"\n" );
+               break;
+       }
        }
        fprintf( fg, "/>\n" );
        fclose( fg );
@@ -3516,6 +3531,9 @@ void CGameInstall::ScanGames() {
                if ( stricmp( dirname, TREMULOUS_PACK ) == 0 ) {
                        m_availGames[ iGame++ ] = GAME_TREMULOUS;
                }
+               if ( stricmp( dirname, JA_PACK ) == 0 ) {
+                       m_availGames[ iGame++ ] = GAME_JA;
+               }
        }
 }
 

diff --git a/radiant/preferences.h b/radiant/preferences.h
index 8a9cc63d6fe37f11f7faa51783c16dcc4f6a1374..784f3fc84b803c66a3e032714a1c4fa52145968c 100644 (file)
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -208,6 +208,7 @@ select games, copy editing assets and write out configuration files
 #define NEXUIZ_PACK "NexuizPack"
 #define Q2_PACK "Q2Pack"
 #define TREMULOUS_PACK "TremulousPack"
+#define JA_PACK "JAPack"
 
 class CGameInstall : public Dialog {
 public:
@@ -229,6 +230,7 @@ public:
                GAME_NEXUIZ,
                GAME_Q2,
                GAME_TREMULOUS,
+               GAME_JA,
                GAME_COUNT
        };