ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Setup engine, enginepath, executablespath and prefix more thoroughly for q2w.game.

Browse source
This commit is contained in:
jdolan 2013-10-05 11:21:44 -04:00
parent 7c0ca95b7b
commit 5101b5b0aa
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
radiant/preferences.cpp
View file

@ -3023,13 +3023,6 @@ void PrefsDlg::LoadPrefs(){
// Texture subset on by default (HL specific really, because of halflife.wad's size)
mLocalPrefs.GetPref( TEXTURE_KEY, &m_bTextureWindow, TRUE );
}
else if ( g_pGameDescription->quake2 ) {
// BSP monitoring is implemented in Quake2 and Heretic2 tools
mLocalPrefs.GetPref( WATCHBSP_KEY, &m_bWatchBSP, TRUE );
// Texture subset on by default (HL specific really, because of halflife.wad's size)
mLocalPrefs.GetPref( TEXTURE_KEY, &m_bTextureWindow, TRUE );
}
else
{
mLocalPrefs.GetPref( WATCHBSP_KEY, &m_bWatchBSP, WATCHBSP_DEF );
@ -3622,6 +3615,7 @@ void CGameInstall::Run() {
switch ( m_availGames[ m_nComboSelect ] ) {
case GAME_Q2: {
fprintf( fg, " quake2=\"true\"\n" );
fprintf( fg, " prefix=\".quake2\"\n" );
fprintf( fg, " basegame=\"baseq2\"\n" );
fprintf( fg, " no_patch=\"true\"\n" );
@ -3654,8 +3648,23 @@ void CGameInstall::Run() {
break;
}
case GAME_Q2W: {
fprintf( fg, " prefix=\".quake2world\"\n" );
fprintf( fg, " prefix_win32=\"Quake2World\"\n");
#ifdef __APPLE__
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world\"\n" );
fprintf( fg, " " ENGINEPATH_ATTRIBUTE "=\"/Applications/Quake2World.app/Contents/Resources\"\n" );
fprintf( fg, " " EXECUTABLES_ATTRIBUTE "=\"/Applications/Quake2World.app/Contents/MacOS\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quake2world\"\n" );
#elif __linux__
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world\"\n" );
fprintf( fg, " " ENGINEPATH_ATTRIBUTE "=\"/usr/local/games/quake2world/share\"\n" );
fprintf( fg, " " EXECUTABLES_ATTRIBUTE "=\"/usr/local/games/quake2world/bin\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quake2world\"\n" );
#elif _WIN32
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world.exe\"\n" );
fprintf( fg, " " ENGINEPATH_ATTRIBUTE "=\"C:\\Program Files\\Quake2World\\share\"\n" );
fprintf( fg, " " EXECUTABLES_ATTRIBUTE "=\"C:\\Program Files\\Quake2World\\bin\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\"Quake2World\"\n" );
#endif
fprintf( fg, " quake2=\"true\"\n" );
fprintf( fg, " basegame=\"default\"\n" );
fprintf( fg, " no_patch=\"true\"\n" );
fprintf( fg, " default_scale=\"0.25\"\n" );

2
radiant/qe3.cpp
View file

@ -436,7 +436,7 @@ xmlDocPtr ParseXMLFile( const char* filename, bool validate = false ){
// copy a string r to a buffer w
// replace $string as appropriate
void ReplaceTemplates( char* w, const char* r ){
static void ReplaceTemplates( char* w, const char* r ){
const char *p;
const char *__ENGINEPATH = "TEMPLATEenginepath";
const char *__USERHOMEPATH = "TEMPLATEuserhomepath";