Adding ReactionPack to Radiant code.

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

diff --git a/config.py b/config.py
index e0f20a01e52271274abd64a2aa3d6b8284f29836..afe6e816b80737b19fb42c3759ec00b0446d5990 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', 'JAPack' ]
+               self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack', 'JAPack', 'ReactionPack' ]
 
        def __repr__( self ):
                return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@@ -259,7 +259,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' or pak == 'JAPack' ):
+                       if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'JAPack' or pak == 'ReactionPack' ):
                                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 03486fd861b4abc81997dd36b48f88f59e3e7613..cc31a540c355183eec4a2ccadf045ceca0d94a4d 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3305,6 +3305,9 @@ void CGameInstall::BuildDialog() {
                case GAME_JA:
                        gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Jedi Academy and mods") );
                        break;
+               case GAME_REACTION:
+                       gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), _("Reaction Quake 3") );
+                       break;
                }
                iGame++;
        }
@@ -3498,6 +3501,18 @@ void CGameInstall::Run() {
                fprintf( fg, "  basegame=\"base\"\n" );
                break;
        }
+       case GAME_REACTION: {
+               fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/"REACTION_PACK"/game\"\n", g_strAppPath.GetBuffer() );
+               fprintf( fg, "  prefix=\".Reaction\"\n" );
+               Str source = g_strAppPath.GetBuffer();
+               source += "installs/";
+               source += REACTION_PACK;
+               source += "/install/";
+               Str dest = m_strEngine.GetBuffer();
+               CopyTree( source.GetBuffer(), dest.GetBuffer() );
+               fprintf( fg, "  basegame=\"Boomstick\"\n" );
+               break;
+       }
        }
        fprintf( fg, "/>\n" );
        fclose( fg );
@@ -3544,6 +3559,9 @@ void CGameInstall::ScanGames() {
                if ( stricmp( dirname, JA_PACK ) == 0 ) {
                        m_availGames[ iGame++ ] = GAME_JA;
                }
+               if ( stricmp( dirname, REACTION_PACK ) == 0 ) {
+                       m_availGames[ iGame++ ] = GAME_REACTION;
+               }
        }
        Sys_Printf("No installable games found in: %s\n",
                pakPaths.GetBuffer() );

diff --git a/radiant/preferences.h b/radiant/preferences.h
index 784f3fc84b803c66a3e032714a1c4fa52145968c..49c69725c30417329e25cdb26f2cdca1a8b32ed6 100644 (file)
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -209,6 +209,7 @@ select games, copy editing assets and write out configuration files
 #define Q2_PACK "Q2Pack"
 #define TREMULOUS_PACK "TremulousPack"
 #define JA_PACK "JAPack"
+#define REACTION_PACK "ReactionPack"
 
 class CGameInstall : public Dialog {
 public:
@@ -231,6 +232,7 @@ public:
                GAME_Q2,
                GAME_TREMULOUS,
                GAME_JA,
+               GAME_REACTION,
                GAME_COUNT
        };