ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-14 00:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add new game preferences variable for executables path. This allows games whose binaries live outside of the engine / data path to be resolved in .proj templates and the like. The executables path can be set via the game preferences dialog.

Browse source 
This changeset also cleans up the game preferences dialog and especially the game configuration dialog by adding frames and fixing padding where necessary.

Lastly, this changeset simplifies the prefix / prefix_win32 code to work like the rest of the conditionalized template attributes (via macro).

Oh, I almost forgot, the CGameInstall::Run() method is a bit less ugly now too. It's still very ugly.
This commit is contained in:
jdolan 2013-07-07 01:56:38 -04:00
parent 5a73ff3997
commit fa738a6f22
5 changed files with 208 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
radiant/mainframe.cpp
View file

@ -70,6 +70,13 @@ CGameDescription *g_pGameDescription; ///< shortcut to g_PrefsDlg.mGamesDialog
CString g_strPluginsDir; ///< name of plugins directory, always sub-directory of toolspath CString g_strPluginsDir; ///< name of plugins directory, always sub-directory of toolspath
CString g_strModulesDir; ///< name of modules directory, always sub-directory of toolspath CString g_strModulesDir; ///< name of modules directory, always sub-directory of toolspath
/*!
Points to an optional directory where external (read: not local to the game
install) may reside. For example, on Linux, a game's executables might live
in /usr/local/bin. On Mac, they might be in /Applications/Game.app/Contents/MacOS.
*/
CString g_strExecutablesPath;
/*! /*!
directory for temp files directory for temp files
NOTE: on *nix this is were we check for .pid NOTE: on *nix this is were we check for .pid

341
radiant/preferences.cpp
View file

@ -682,19 +682,25 @@ PrefsDlg::PrefsDlg (){
#if defined( WIN32 ) #if defined( WIN32 )
#define TOOLS_ATTRIBUTE "gametools_win32" #define TOOLS_ATTRIBUTE "gametools_win32"
#define EXECUTABLES_ATTRIBUTE "executables_win32"
#define ENGINE_ATTRIBUTE "engine_win32" #define ENGINE_ATTRIBUTE "engine_win32"
#define ENGINEPATH_ATTRIBUTE "enginepath_win32" #define ENGINEPATH_ATTRIBUTE "enginepath_win32"
#define MP_ENGINE_ATTRIBUTE "mp_engine_win32" #define MP_ENGINE_ATTRIBUTE "mp_engine_win32"
#define PREFIX_ATTRIBUTE "prefix_win32"
#elif defined( __linux__ ) || defined ( __FreeBSD__ ) #elif defined( __linux__ ) || defined ( __FreeBSD__ )
#define TOOLS_ATTRIBUTE "gametools_linux" #define TOOLS_ATTRIBUTE "gametools_linux"
#define EXECUTABLES_ATTRIBUTE "executables_linux"
#define ENGINE_ATTRIBUTE "engine_linux" #define ENGINE_ATTRIBUTE "engine_linux"
#define ENGINEPATH_ATTRIBUTE "enginepath_linux" #define ENGINEPATH_ATTRIBUTE "enginepath_linux"
#define MP_ENGINE_ATTRIBUTE "mp_engine_linux" #define MP_ENGINE_ATTRIBUTE "mp_engine_linux"
#define PREFIX_ATTRIBUTE "prefix"
#elif defined( __APPLE__ ) #elif defined( __APPLE__ )
#define TOOLS_ATTRIBUTE "gametools_macos" #define TOOLS_ATTRIBUTE "gametools_macos"
#define EXECUTABLES_ATTRIBUTE "executables_macos"
#define ENGINE_ATTRIBUTE "engine_macos" #define ENGINE_ATTRIBUTE "engine_macos"
#define ENGINEPATH_ATTRIBUTE "enginepath_macos" #define ENGINEPATH_ATTRIBUTE "enginepath_macos"
#define MP_ENGINE_ATTRIBUTE "mp_engine_macos" #define MP_ENGINE_ATTRIBUTE "mp_engine_macos"
#define PREFIX_ATTRIBUTE "prefix"
#else #else
#error "unsupported platform" #error "unsupported platform"
#endif #endif
@ -854,12 +860,19 @@ CGameDescription::CGameDescription( xmlDocPtr pDoc, const Str &GameFile ){
} }
} }
// Resolve the executables path for games which provide their binaries
// or map compiling tools in external locations.
prop = (char*)xmlGetProp( pNode, (const xmlChar *)EXECUTABLES_ATTRIBUTE );
if ( prop != NULL ) {
mExecutablesPath = prop;
xmlFree( prop );
prop = NULL; prop = NULL;
#if defined ( __linux__ ) || defined ( __APPLE__ ) } else {
prop = (char*)xmlGetProp( pNode, (const xmlChar *)"prefix" ); mExecutablesPath = mEnginePath.GetBuffer();
#elif defined ( _WIN32 ) }
prop = (char*)xmlGetProp( pNode, (const xmlChar *)"prefix_win32" );
#endif // Resolve the per-user directory.
prop = (char*)xmlGetProp( pNode, (const xmlChar *)PREFIX_ATTRIBUTE );
if ( prop != NULL ) { if ( prop != NULL ) {
mUserPathPrefix = prop; mUserPathPrefix = prop;
xmlFree( prop ); xmlFree( prop );
@ -923,6 +936,7 @@ void CGameDescription::Dump(){
Sys_Printf( "game path : '%s'\n", mGameToolsPath.GetBuffer() ); Sys_Printf( "game path : '%s'\n", mGameToolsPath.GetBuffer() );
Sys_Printf( "base game : '%s'\n", mBaseGame.GetBuffer() ); Sys_Printf( "base game : '%s'\n", mBaseGame.GetBuffer() );
Sys_Printf( "engine path : '%s'\n", mEnginePath.GetBuffer() ); Sys_Printf( "engine path : '%s'\n", mEnginePath.GetBuffer() );
Sys_Printf( "executables path : '%s'\n", mExecutablesPath.GetBuffer() );
Sys_Printf( "engine : '%s'\n", mEngine.GetBuffer() ); Sys_Printf( "engine : '%s'\n", mEngine.GetBuffer() );
Sys_Printf( "shaderlist : '%s'\n", mShaderlist.GetBuffer() ); Sys_Printf( "shaderlist : '%s'\n", mShaderlist.GetBuffer() );
Sys_Printf( "caulk shader : '%s'\n", mCaulkShader.GetBuffer() ); Sys_Printf( "caulk shader : '%s'\n", mCaulkShader.GetBuffer() );
@ -1033,18 +1047,18 @@ GtkWidget* CGameDialog::GetGlobalFrame(){
return mFrame; return mFrame;
} }
mFrame = gtk_frame_new( NULL ); mFrame = gtk_frame_new( "Select a game" );
gtk_container_set_border_width( GTK_CONTAINER( mFrame ), 5 ); gtk_container_set_border_width( GTK_CONTAINER( mFrame ), 5 );
gtk_widget_show( mFrame ); gtk_widget_show( mFrame );
vbox = gtk_vbox_new( FALSE, 6 ); vbox = gtk_vbox_new( FALSE, 5 );
gtk_widget_show( vbox ); gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( mFrame ), vbox ); gtk_container_add( GTK_CONTAINER( mFrame ), vbox );
gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
text = gtk_label_new( _( "Select the game:" ) ); /*text = gtk_label_new( _( "Select the game:" ) );
gtk_widget_show( text ); gtk_widget_show( text );
gtk_box_pack_start( GTK_BOX( vbox ), text, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), text, FALSE, FALSE, 0 );*/
combo = gtk_combo_box_new_text(); combo = gtk_combo_box_new_text();
gtk_widget_show( combo ); gtk_widget_show( combo );
@ -1124,9 +1138,10 @@ void CGameDialog::BuildDialog() {
GtkWidget *dlg, *vbox1, *button, *setup_button; GtkWidget *dlg, *vbox1, *button, *setup_button;
dlg = m_pWidget; dlg = m_pWidget;
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Select Game" ) ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Select a game" ) );
vbox1 = gtk_vbox_new( FALSE, 0 ); vbox1 = gtk_vbox_new( FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( vbox1 ), 5 );
gtk_widget_show( vbox1 ); gtk_widget_show( vbox1 );
gtk_container_add( GTK_CONTAINER( dlg ), vbox1 ); gtk_container_add( GTK_CONTAINER( dlg ), vbox1 );
@ -1149,7 +1164,7 @@ void CGameDialog::BuildDialog() {
gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
AddModalButton( button, IDCANCEL ); AddModalButton( button, IDCANCEL );
gtk_widget_set_usize( button, 60, -2 ); gtk_widget_set_size_request( dlg, 320, -1 );
} }
void CGameDialog::UpdateGameCombo() { void CGameDialog::UpdateGameCombo() {
@ -1305,6 +1320,7 @@ void CGameDialog::Init(){
g_pGameDescription = m_pCurrentGameDescription; g_pGameDescription = m_pCurrentGameDescription;
g_strGameToolsPath = g_pGameDescription->mGameToolsPath; g_strGameToolsPath = g_pGameDescription->mGameToolsPath;
g_strExecutablesPath = g_pGameDescription->mExecutablesPath;
// Add the per-user game path on all platforms // Add the per-user game path on all platforms
if ( m_pCurrentGameDescription->mUserPathPrefix.GetLength() ) { if ( m_pCurrentGameDescription->mUserPathPrefix.GetLength() ) {
@ -1523,6 +1539,7 @@ static void treeSelection( GtkTreeSelection* selection, gpointer data ){
} }
} }
#ifdef _WIN32
static void OnX64Toggle( GtkWidget *widget, gpointer data ) { static void OnX64Toggle( GtkWidget *widget, gpointer data ) {
Dialog * d = static_cast< Dialog * >( data ); Dialog * d = static_cast< Dialog * >( data );
if ( !d->IsModal() ) { if ( !d->IsModal() ) {
@ -1533,6 +1550,7 @@ static void OnX64Toggle( GtkWidget *widget, gpointer data ) {
g_PrefsDlg.m_nLastProjectVer = -1; g_PrefsDlg.m_nLastProjectVer = -1;
g_PrefsDlg.m_strLastProject = ""; g_PrefsDlg.m_strLastProject = "";
} }
#endif
void PrefsDlg::BuildDialog(){ void PrefsDlg::BuildDialog(){
// Main Preferences dialog // Main Preferences dialog
@ -1948,7 +1966,7 @@ void PrefsDlg::BuildDialog(){
pageframe = gtk_frame_new( _( "Textures" ) ); pageframe = gtk_frame_new( _( "Textures" ) );
gtk_container_set_border_width( GTK_CONTAINER( pageframe ), 5 ); gtk_container_set_border_width( GTK_CONTAINER( pageframe ), 5 );
gtk_widget_show( pageframe ); gtk_widget_show( pageframe );
vbox = gtk_vbox_new( FALSE, 6 ); vbox = gtk_vbox_new( FALSE, 5 );
gtk_widget_show( vbox ); gtk_widget_show( vbox );
gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
gtk_container_add( GTK_CONTAINER( pageframe ), vbox ); gtk_container_add( GTK_CONTAINER( pageframe ), vbox );
@ -3310,6 +3328,21 @@ void CGameInstall::OnBtnBrowseEngine( GtkWidget *widget, gpointer data ) {
} }
} }
void CGameInstall::OnBtnBrowseExecutables( GtkWidget *widget, gpointer data ) {
Sys_Printf( "OnBtnBrowseExecutables\n" );
CGameInstall* i = static_cast<CGameInstall*>( data );
char *dir = dir_dialog( i->m_pWidget, _( "Select executables directory" ), NULL );
i->UpdateData( TRUE );
if ( dir != NULL ) {
i->m_strExecutables = dir;
i->UpdateData( FALSE );
g_free( dir );
}
}
void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) { void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
Sys_Printf( "OnGameSelectChanged\n" ); Sys_Printf( "OnGameSelectChanged\n" );
@ -3320,22 +3353,28 @@ void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
} }
void CGameInstall::BuildDialog() { void CGameInstall::BuildDialog() {
GtkWidget *dlg, *vbox1, *button, *text, *combo, *entry, *hbox; GtkWidget *dlg, *vbox1, *frame, *vbox2, *button, *text, *combo, *entry, *hbox;
dlg = m_pWidget; dlg = m_pWidget;
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Configure games" ) ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Configure games" ) );
vbox1 = gtk_vbox_new( FALSE, 0 ); vbox1 = gtk_vbox_new( FALSE, 5 );
gtk_container_set_border_width( GTK_CONTAINER( vbox1 ), 5 );
gtk_widget_show( vbox1 ); gtk_widget_show( vbox1 );
gtk_container_add( GTK_CONTAINER( dlg ), vbox1 ); gtk_container_add( GTK_CONTAINER( dlg ), vbox1 );
text = gtk_label_new( _( "Select the game to configure" ) ); frame = gtk_frame_new( "Configure a game" );
gtk_widget_show( text ); gtk_widget_show( frame );
gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 ); gtk_container_add( GTK_CONTAINER( vbox1 ), frame );
vbox2 = gtk_vbox_new( FALSE, 5);
gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
gtk_widget_show( vbox2 );
gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
combo = gtk_combo_box_new_text(); combo = gtk_combo_box_new_text();
gtk_widget_show( combo ); gtk_widget_show( combo );
gtk_box_pack_start( GTK_BOX( vbox1 ), combo, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), combo, FALSE, FALSE, 0 );
// GList *combo_list = NULL; // GList *combo_list = NULL;
int iGame = 0; int iGame = 0;
@ -3389,20 +3428,20 @@ void CGameInstall::BuildDialog() {
text = gtk_label_new( _( "Name:" ) ); text = gtk_label_new( _( "Name:" ) );
gtk_widget_show( text ); gtk_widget_show( text );
gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), text, FALSE, FALSE, 0 );
entry = gtk_entry_new(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
gtk_box_pack_start( GTK_BOX( vbox1 ), entry, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), entry, FALSE, FALSE, 0 );
AddDialogData( entry, &m_strName, DLG_ENTRY_TEXT ); AddDialogData( entry, &m_strName, DLG_ENTRY_TEXT );
text = gtk_label_new( _( "Engine directory:" ) ); text = gtk_label_new( _( "Engine directory:" ) );
gtk_widget_show( text ); gtk_widget_show( text );
gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), text, FALSE, FALSE, 0 );
hbox = gtk_hbox_new( FALSE, 0 ); hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );
gtk_box_pack_start( GTK_BOX( vbox1 ), hbox, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, FALSE, FALSE, 0 );
entry = gtk_entry_new(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -3414,15 +3453,33 @@ void CGameInstall::BuildDialog() {
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnBtnBrowseEngine ), this ); gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnBtnBrowseEngine ), this );
gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
text = gtk_label_new( _( "Executables directory (optional):" ) );
gtk_widget_show( text );
gtk_box_pack_start( GTK_BOX( vbox2 ), text, FALSE, FALSE, 0 );
hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, FALSE, FALSE, 0 );
entry = gtk_entry_new();
gtk_widget_show( entry );
gtk_box_pack_start( GTK_BOX( hbox ), entry, FALSE, FALSE, 0 );
AddDialogData( entry, &m_strExecutables, DLG_ENTRY_TEXT );
button = gtk_button_new_with_label( _( "..." ) );
gtk_widget_show( button );
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnBtnBrowseExecutables ), this );
gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
// this gets done in the project stuff atm // this gets done in the project stuff atm
#if 0 #if 0
text = gtk_label_new( _( "Mod subdirectory:" ) ); text = gtk_label_new( _( "Mod subdirectory:" ) );
gtk_widget_show( text ); gtk_widget_show( text );
gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), text, FALSE, FALSE, 0 );
entry = gtk_entry_new(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
gtk_box_pack_start( GTK_BOX( vbox1 ), entry, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox2 ), entry, FALSE, FALSE, 0 );
AddDialogData( entry, &m_strMod, DLG_ENTRY_TEXT ); AddDialogData( entry, &m_strMod, DLG_ENTRY_TEXT );
#endif #endif
@ -3436,7 +3493,7 @@ void CGameInstall::BuildDialog() {
gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
AddModalButton( button, IDCANCEL ); AddModalButton( button, IDCANCEL );
gtk_widget_set_usize( button, 60, -2 ); gtk_widget_set_size_request( dlg, 320, -1);
} }
void CGameInstall::Run() { void CGameInstall::Run() {
@ -3450,8 +3507,8 @@ void CGameInstall::Run() {
} }
Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() ); Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() );
// write out the game file // Resolve the game pack and .game file
Str gameFilePath = g_strAppPath.GetBuffer(); Str gamePack, gameFilePath = g_strAppPath.GetBuffer();
gameFilePath += "games/"; gameFilePath += "games/";
if ( CheckFile( gameFilePath ) != PATH_DIRECTORY ) { if ( CheckFile( gameFilePath ) != PATH_DIRECTORY ) {
radCreateDirectory( gameFilePath ); radCreateDirectory( gameFilePath );
@ -3459,199 +3516,160 @@ void CGameInstall::Run() {
switch ( m_availGames[ m_nComboSelect ] ) { switch ( m_availGames[ m_nComboSelect ] ) {
case GAME_Q2: case GAME_Q2:
gameFilePath += "q2.game"; gamePack = Q2_PACK;
gameFilePath += Q2_GAME;
break; break;
case GAME_Q3: case GAME_Q3:
gameFilePath += "q3.game"; gamePack = Q3_PACK;
gameFilePath += Q3_GAME;
break; break;
case GAME_URT: case GAME_URT:
gameFilePath += "urt.game"; gamePack = URT_PACK;
gameFilePath += URT_GAME;
break; break;
case GAME_UFOAI: case GAME_UFOAI:
gameFilePath += "ufoai.game"; gamePack = UFOAI_PACK;
gameFilePath += UFOAI_GAME;
break; break;
case GAME_Q2W: case GAME_Q2W:
gameFilePath += "q2w.game"; gamePack = Q2W_PACK;
gameFilePath += Q2W_GAME;
break; break;
case GAME_WARSOW: case GAME_WARSOW:
gameFilePath += "warsow.game"; gameFilePath += WARSOW_GAME;
gamePack = WARSOW_PACK;
break; break;
case GAME_NEXUIZ: case GAME_NEXUIZ:
gameFilePath += "nexuiz.game"; gamePack = NEXUIZ_PACK;
gameFilePath += NEXUIZ_GAME;
break; break;
case GAME_TREMULOUS: case GAME_TREMULOUS:
gameFilePath += "tremulous.game"; gamePack = TREMULOUS_PACK;
gameFilePath += TREMULOUS_GAME;
break; break;
case GAME_JA: case GAME_JA:
gameFilePath += "ja.game"; gamePack = JA_PACK;
gameFilePath += JA_GAME;
break; break;
case GAME_REACTION: case GAME_REACTION:
gameFilePath += "reaction.game"; gamePack = REACTION_PACK;
gameFilePath += REACTION_GAME;
break; break;
case GAME_ET: case GAME_ET:
gameFilePath += "et.game"; gamePack = ET_PACK;
gameFilePath += ET_GAME;
break; break;
case GAME_QL: case GAME_QL:
gameFilePath += "ql.game"; gamePack = QL_PACK;
gameFilePath += QL_GAME;
break; break;
case GAME_STVEF: case GAME_STVEF:
gameFilePath += "stvef.game"; gamePack = STVEF_PACK;
gameFilePath += STVEF_GAME;
break; break;
default:
Error( "Invalid game selected: %d", m_availGames[ m_nComboSelect ] );
} }
Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() ); Str gameInstallPath = g_strAppPath.GetBuffer();
gameInstallPath += "installs/";
gameInstallPath += gamePack;
gameInstallPath += "/install/";
Sys_Printf( "Installing game pack from: %s\n", gameInstallPath.GetBuffer() );
// First copy the install directory into the game engine. We do this
// for all games, even if they don't provide an "install" folder.
radCopyTree( gameInstallPath.GetBuffer(), m_strEngine.GetBuffer() );
Sys_Printf( "Writing game file: %s\n", gameFilePath.GetBuffer() );
FILE * fg = fopen( gameFilePath.GetBuffer(), "w" ); FILE * fg = fopen( gameFilePath.GetBuffer(), "w" );
if ( fg == NULL ) { if ( fg == NULL ) {
Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() ); Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
} }
// Running Windows, crashing here? // Running Windows, crashing here?
// Make sure that libintl.h is not redefining fprintf to some broken BS! // Make sure that libintl.h is not redefining fprintf to some broken BS!
// - TTimo // - TTimo
fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" ); fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() ); fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() );
fprintf( fg, " "ENGINEPATH_ATTRIBUTE "=\"%s\"\n", m_strEngine.GetBuffer() ); fprintf( fg, " "ENGINEPATH_ATTRIBUTE "=\"%s\"\n", m_strEngine.GetBuffer() );
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/%s/game\"\n", g_strAppPath.GetBuffer(), gamePack.GetBuffer() );
if ( m_strExecutables.GetLength() > 0 ) {
fprintf( fg, " "EXECUTABLES_ATTRIBUTE "=\"%s\"\n", m_strExecutables.GetBuffer() );
}
switch ( m_availGames[ m_nComboSelect ] ) { switch ( m_availGames[ m_nComboSelect ] ) {
case GAME_Q2: { case GAME_Q2: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/Q2Pack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".quake2\"\n" ); fprintf( fg, " prefix=\".quake2\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += Q2_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"baseq2\"\n" ); fprintf( fg, " basegame=\"baseq2\"\n" );
break; break;
} }
case GAME_Q3: { case GAME_Q3: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/Q3Pack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".q3a\"\n" ); fprintf( fg, " prefix=\".q3a\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += Q3_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
// Hardcoded fix for "missing" shaderlist in gamepack
dest += "/baseq3/scripts/shaderlist.txt";
if(CheckFile(dest.GetBuffer()) != PATH_FILE) {
source += "baseq3/scripts/default_shaderlist.txt";
radCopyFile(source.GetBuffer(),dest.GetBuffer());
}
fprintf( fg, " basegame=\"baseq3\"\n" ); fprintf( fg, " basegame=\"baseq3\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/baseq3/scripts/shaderlist.txt";
if( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "baseq3/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break; break;
} }
case GAME_URT: { case GAME_URT: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/UrTPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".q3a\"\n" ); fprintf( fg, " prefix=\".q3a\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += URT_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"q3ut4\"\n" ); fprintf( fg, " basegame=\"q3ut4\"\n" );
break; break;
} }
case GAME_UFOAI: { case GAME_UFOAI: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/UFOAIPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".ufoai\"\n" ); fprintf( fg, " prefix=\".ufoai\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += UFOAI_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"base\"\n" ); fprintf( fg, " basegame=\"base\"\n" );
break; break;
} }
case GAME_Q2W: { case GAME_Q2W: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/Q2WPack/game\"\n", g_strAppPath.GetBuffer() );
#if defined ( __linux__ ) || defined ( __APPLE__ )
fprintf( fg, " prefix=\".quake2world\"\n" ); fprintf( fg, " prefix=\".quake2world\"\n" );
#elif defined ( _WIN32 )
fprintf( fg, " prefix_win32=\"Quake2World\"\n"); fprintf( fg, " prefix_win32=\"Quake2World\"\n");
#endif
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += Q2W_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"default\"\n" ); fprintf( fg, " basegame=\"default\"\n" );
break; break;
} }
case GAME_WARSOW: { case GAME_WARSOW: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/WarsowPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".warsow\"\n" ); fprintf( fg, " prefix=\".warsow\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += WARSOW_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"basewsw\"\n" ); fprintf( fg, " basegame=\"basewsw\"\n" );
break; break;
} }
case GAME_NEXUIZ: { case GAME_NEXUIZ: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/NexuizPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".nexuiz\"\n" ); fprintf( fg, " prefix=\".nexuiz\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += NEXUIZ_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"data\"\n" ); fprintf( fg, " basegame=\"data\"\n" );
break; break;
} }
case GAME_TREMULOUS: { case GAME_TREMULOUS: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/TremulousPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".tremulous\"\n" ); fprintf( fg, " prefix=\".tremulous\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += TREMULOUS_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"base\"\n" ); fprintf( fg, " basegame=\"base\"\n" );
break; break;
} }
case GAME_JA: { case GAME_JA: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/JAPack/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".ja\"\n" ); fprintf( fg, " prefix=\".ja\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += JA_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
// Hardcoded fix for "missing" shaderlist in gamepack
dest += "/base/shaders/shaderlist.txt";
if(CheckFile(dest.GetBuffer()) != PATH_FILE) {
source += "base/scripts/default_shaderlist.txt";
radCopyFile(source.GetBuffer(),dest.GetBuffer());
}
fprintf( fg, " basegame=\"base\"\n" ); fprintf( fg, " basegame=\"base\"\n" );
fprintf( fg, " shaderpath=\"shaders\"\n" ); fprintf( fg, " shaderpath=\"shaders\"\n" );
fprintf( fg, " default_scale=\"0.25\"\n" ); fprintf( fg, " default_scale=\"0.25\"\n" );
fprintf( fg, " caulk_shader=\"textures/system/caulk\"\n" ); fprintf( fg, " caulk_shader=\"textures/system/caulk\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/base/shaders/shaderlist.txt";
if( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "base/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break; break;
} }
case GAME_REACTION: { case GAME_REACTION: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/"REACTION_PACK "/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".Reaction\"\n" ); fprintf( fg, " prefix=\".Reaction\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += REACTION_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
fprintf( fg, " basegame=\"Boomstick\"\n" ); fprintf( fg, " basegame=\"Boomstick\"\n" );
fprintf( fg, " default_scale=\"0.5\"\n" ); // Superfluous because the default is already 0.5, fprintf( fg, " default_scale=\"0.5\"\n" );
// but demonstrates how to set the default texture scale
// for a specific game.
break; break;
} }
case GAME_ET: { case GAME_ET: {
@ -3660,60 +3678,45 @@ void CGameInstall::Run() {
#elif __linux__ #elif __linux__
fprintf( fg, " "ENGINE_ATTRIBUTE "=\"et\"\n" ); fprintf( fg, " "ENGINE_ATTRIBUTE "=\"et\"\n" );
#endif #endif
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/"ET_PACK "/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".etwolf\"\n" ); fprintf( fg, " prefix=\".etwolf\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += ET_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
// Hardcoded fix for "missing" shaderlist in gamepack
dest += "/etmain/scripts/shaderlist.txt";
if(CheckFile(dest.GetBuffer()) != PATH_FILE) {
source += "etmain/scripts/default_shaderlist.txt";
radCopyFile(source.GetBuffer(),dest.GetBuffer());
}
fprintf( fg, " basegame=\"etmain\"\n" ); fprintf( fg, " basegame=\"etmain\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/etmain/scripts/shaderlist.txt";
if( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "etmain/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break; break;
} }
case GAME_QL: { case GAME_QL: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/"QL_PACK "/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".quakelive/quakelive/home\"\n" ); fprintf( fg, " prefix=\".quakelive/quakelive/home\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += QL_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
// Hardcoded fix for "missing" shaderlist in gamepack
dest += "/baseq3/scripts/shaderlist.txt";
if(CheckFile(dest.GetBuffer()) != PATH_FILE) {
source += "baseq3/scripts/default_shaderlist.txt";
radCopyFile(source.GetBuffer(),dest.GetBuffer());
}
fprintf( fg, " basegame=\"baseq3\"\n" ); fprintf( fg, " basegame=\"baseq3\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/baseq3/scripts/shaderlist.txt";
if ( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "baseq3/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break; break;
} }
case GAME_STVEF: { case GAME_STVEF: {
fprintf( fg, " "TOOLS_ATTRIBUTE "=\"%sinstalls/"STVEF_PACK "/game\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " prefix=\".stvef\"\n" ); fprintf( fg, " prefix=\".stvef\"\n" );
Str source = g_strAppPath.GetBuffer();
source += "installs/";
source += STVEF_PACK;
source += "/install/";
Str dest = m_strEngine.GetBuffer();
radCopyTree( source.GetBuffer(), dest.GetBuffer() );
// Hardcoded fix for "missing" shaderlist in gamepack
dest += "/base/scripts/shaderlist.txt";
if(CheckFile(dest.GetBuffer()) != PATH_FILE) {
source += "base/scripts/default_shaderlist.txt";
radCopyFile(source.GetBuffer(),dest.GetBuffer());
}
fprintf( fg, " basegame=\"baseEF\"\n" ); fprintf( fg, " basegame=\"baseEF\"\n" );
fprintf( fg, " shaderpath=\"scripts\"\n" ); fprintf( fg, " shaderpath=\"scripts\"\n" );
fprintf( fg, " default_scale=\"0.25\"\n" ); fprintf( fg, " default_scale=\"0.25\"\n" );
fprintf( fg, " caulk_shader=\"textures/common/caulk\"\n" ); fprintf( fg, " caulk_shader=\"textures/common/caulk\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/base/scripts/shaderlist.txt";
if( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "base/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break; break;
} }
} }

17
radiant/preferences.h
View file

@ -173,6 +173,7 @@ Str mGameName; ///< name of the game used in dialogs
Str mGameFile; ///< the .game file that describes this game Str mGameFile; ///< the .game file that describes this game
Str mBaseGame; ///< basegame directory Str mBaseGame; ///< basegame directory
Str mEnginePath; ///< path to the engine Str mEnginePath; ///< path to the engine
Str mExecutablesPath; ///< path to external executables, e.g. /usr/local/bin
Str mEngine; ///< engine name Str mEngine; ///< engine name
Str mMultiplayerEngine; ///< engine name Str mMultiplayerEngine; ///< engine name
Str mUserPathPrefix; ///< prefix for ~/.q3a ~/.wolf init on *nix, or \My Document\My Games\ on Windows Str mUserPathPrefix; ///< prefix for ~/.q3a ~/.wolf init on *nix, or \My Document\My Games\ on Windows
@ -201,6 +202,20 @@ void Dump();
select games, copy editing assets and write out configuration files select games, copy editing assets and write out configuration files
*/ */
#define Q3_GAME "q3.game"
#define URT_GAME "urt.game"
#define UFOAI_GAME "ufoai.game"
#define Q2W_GAME "q2w.game"
#define WARSOW_GAME "warsow.game"
#define NEXUIZ_GAME "nexuiz.game"
#define Q2_GAME "q2.game"
#define TREMULOUS_GAME "tremulous.game"
#define JA_GAME "ja.game"
#define REACTION_GAME "reaction.game"
#define ET_GAME "et.game"
#define QL_GAME "ql.game"
#define STVEF_GAME "stvef.game"
#define Q3_PACK "Q3Pack" #define Q3_PACK "Q3Pack"
#define URT_PACK "UrTPack" #define URT_PACK "UrTPack"
#define UFOAI_PACK "UFOAIPack" #define UFOAI_PACK "UFOAIPack"
@ -223,6 +238,7 @@ void Run();
void BuildDialog(); void BuildDialog();
static void OnBtnBrowseEngine( GtkWidget *widget, gpointer data ); static void OnBtnBrowseEngine( GtkWidget *widget, gpointer data );
static void OnBtnBrowseExecutables( GtkWidget *widget, gpointer data );
static void OnGameSelectChanged( GtkWidget *widget, gpointer data ); static void OnGameSelectChanged( GtkWidget *widget, gpointer data );
enum gameType_e { enum gameType_e {
@ -247,6 +263,7 @@ protected:
Str m_strName; Str m_strName;
Str m_strMod; Str m_strMod;
Str m_strEngine; Str m_strEngine;
Str m_strExecutables;
int m_nComboSelect; int m_nComboSelect;
// maps from m_nComboSelect to the games // maps from m_nComboSelect to the games

5
radiant/qe3.cpp
View file

@ -441,6 +441,7 @@ void ReplaceTemplates( char* w, const char* r ){
const char *__ENGINEPATH = "TEMPLATEenginepath"; const char *__ENGINEPATH = "TEMPLATEenginepath";
const char *__USERHOMEPATH = "TEMPLATEuserhomepath"; const char *__USERHOMEPATH = "TEMPLATEuserhomepath";
const char *__TOOLSPATH = "TEMPLATEtoolspath"; const char *__TOOLSPATH = "TEMPLATEtoolspath";
const char *__EXECPATH = "TEMPLATEexecpath";
const char *__BASEDIR = "TEMPLATEbasedir"; const char *__BASEDIR = "TEMPLATEbasedir";
const char *__APPPATH = "TEMPLATEapppath"; const char *__APPPATH = "TEMPLATEapppath";
const char *__Q3MAP2 = "TEMPLATEq3map2"; const char *__Q3MAP2 = "TEMPLATEq3map2";
@ -466,6 +467,10 @@ void ReplaceTemplates( char* w, const char* r ){
r += strlen( __TOOLSPATH ) + 1; r += strlen( __TOOLSPATH ) + 1;
p = g_strGameToolsPath.GetBuffer(); p = g_strGameToolsPath.GetBuffer();
} }
else if ( strncmp( r + 1, __EXECPATH, strlen( __EXECPATH ) ) == 0 ) {
r += strlen( __EXECPATH ) + 1;
p = g_strExecutablesPath.GetBuffer();
}
else if ( strncmp( r + 1, __APPPATH, strlen( __APPPATH ) ) == 0 ) { else if ( strncmp( r + 1, __APPPATH, strlen( __APPPATH ) ) == 0 ) {
r += strlen( __APPPATH ) + 1; r += strlen( __APPPATH ) + 1;
p = g_strAppPath.GetBuffer(); p = g_strAppPath.GetBuffer();

1
radiant/qe3.h
View file

@ -770,6 +770,7 @@ extern CString g_strModulesDir;
extern CGameDescription *g_pGameDescription; extern CGameDescription *g_pGameDescription;
extern CString g_strGameToolsPath; extern CString g_strGameToolsPath;
extern CString g_strExecutablesPath;
extern CString g_strTempPath; extern CString g_strTempPath;
extern PrefsDlg& g_PrefsDlg; extern PrefsDlg& g_PrefsDlg;