Fix 64 bit windows q3map2 visibility.

This commit is contained in:
jdolan 2013-06-27 17:48:22 -04:00
parent dac352274a
commit 625eaa9502
3 changed files with 32 additions and 25 deletions

View file

@ -662,7 +662,9 @@ PrefsDlg::PrefsDlg (){
#endif
m_nLightRadiuses = 1;
m_bQ3Map2Texturing = TRUE;
#ifdef _WIN32
m_bx64q3map2 = TRUE;
#endif
#ifdef ATIHACK_812
m_bGlATIHack = FALSE;
#endif
@ -3144,7 +3146,9 @@ void PrefsDlg::LoadPrefs(){
mLocalPrefs.GetPref( LIGHTRADIUS_KEY, &m_nLightRadiuses, TRUE );
mLocalPrefs.GetPref( Q3MAP2TEX_KEY, &m_bQ3Map2Texturing, TRUE );
#ifdef _WIN32
mLocalPrefs.GetPref( X64Q3MAP2_KEY, &m_bx64q3map2, TRUE );
#endif
#ifdef ATIHACK_812
mLocalPrefs.GetPref( ATIHACK_KEY, &m_bGlATIHack, FALSE );

View file

@ -473,9 +473,12 @@ void ReplaceTemplates( char* w, const char* r ){
else if ( strncmp( r + 1, __Q3MAP2, strlen( __Q3MAP2 ) ) == 0 ) {
r += strlen( __Q3MAP2 ) + 1;
// see https://github.com/TTimo/GtkRadiant/issues/116
#ifdef _WIN32
if ( g_PrefsDlg.m_bx64q3map2 ) {
p = "x64/q3map2";
} else {
} else
#endif
{
p = "q3map2";
}
}