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

#165 Add prefix_win32 support to game packs.

Browse source
This commit is contained in:
jdolan 2013-06-02 10:12:14 -04:00 committed by Timothee Besset
parent 5d08c3e9ec
commit 56d46ea561
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
radiant/preferences.cpp
View file

@ -853,13 +853,15 @@ CGameDescription::CGameDescription( xmlDocPtr pDoc, const Str &GameFile ){
} }
#if defined ( __linux__ ) || defined ( __APPLE__ ) #if defined ( __linux__ ) || defined ( __APPLE__ )
// *nix specific
prop = (char*)xmlGetProp( pNode, (const xmlChar *)"prefix" ); prop = (char*)xmlGetProp( pNode, (const xmlChar *)"prefix" );
#elif defined ( __WIN32 )
prop = (char*)xmlGetProp( pNode, (const xmlChar *)"prefix_win32" );
#endif
if ( prop != NULL ) { if ( prop != NULL ) {
mUserPathPrefix = prop; mUserPathPrefix = prop;
xmlFree( prop ); xmlFree( prop );
} }
#endif
mShaderPath = xmlGetProp( pNode, (const xmlChar *)"shaderpath" ); mShaderPath = xmlGetProp( pNode, (const xmlChar *)"shaderpath" );
if ( !mShaderPath.GetLength() ) { if ( !mShaderPath.GetLength() ) {
mShaderPath = "scripts/"; mShaderPath = "scripts/";
@ -918,10 +920,8 @@ void CGameDescription::Dump(){
Sys_Printf( "engine path : '%s'\n", mEnginePath.GetBuffer() ); Sys_Printf( "engine path : '%s'\n", mEnginePath.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() );
#if defined ( __linux__ ) || defined ( __APPLE__ )
Sys_Printf( "prefix : '%s'\n", mUserPathPrefix.GetBuffer() ); Sys_Printf( "prefix : '%s'\n", mUserPathPrefix.GetBuffer() );
#endif
Sys_Printf( "default texture scale: %g\n", mTextureDefaultScale ); Sys_Printf( "default texture scale: %g\n", mTextureDefaultScale );
Sys_Printf( "single eclass load : %s\n", mEClassSingleLoad ? "Yes" : "No" ); Sys_Printf( "single eclass load : %s\n", mEClassSingleLoad ? "Yes" : "No" );
Sys_Printf( "patches supported : %s\n", mNoPatch ? "No" : "Yes" ); Sys_Printf( "patches supported : %s\n", mNoPatch ? "No" : "Yes" );
@ -1301,17 +1301,22 @@ void CGameDialog::Init(){
g_strGameToolsPath = g_pGameDescription->mGameToolsPath; g_strGameToolsPath = g_pGameDescription->mGameToolsPath;
// NOTE TTimo: this is moved from QE_LoadProject in 1.2 // Add the per-user game path on all platforms
// (probably broken) if (m_pCurrentGameDescription->mUserPathPrefix.GetLength()) {
// NOTE Hydra: was broken for win32, we don't use m_strHomeGame or m_strFSBasePath
#if defined ( __linux__ ) || defined ( __APPLE__ ) #if defined ( __linux__ ) || defined ( __APPLE__ )
g_qeglobals.m_strHomeGame = g_get_home_dir(); g_qeglobals.m_strHomeGame = g_get_home_dir();
g_qeglobals.m_strHomeGame += "/"; g_qeglobals.m_strHomeGame += "/";
g_qeglobals.m_strHomeGame += m_pCurrentGameDescription->mUserPathPrefix.GetBuffer(); g_qeglobals.m_strHomeGame += m_pCurrentGameDescription->mUserPathPrefix.GetBuffer();
g_qeglobals.m_strHomeGame += "/"; g_qeglobals.m_strHomeGame += "/";
#else #elif defined ( _WIN32 )
g_qeglobals.m_strHomeGame = g_pGameDescription->mEnginePath.GetBuffer(); g_qeglobals.m_strHomeGame = g_get_home_dir();
g_qeglobals.m_strHomeGame += "\\My Games\\";
g_qeglobals.m_strHomeGame += m_pCurrentGameDescription->mUserPathPrefix.GetBuffer();
g_qeglobals.m_strHomeGame += "\\";
#endif #endif
} else {
g_qeglobals.m_strHomeGame = g_pGameDescription->mEnginePath.GetBuffer();
}
g_pGameDescription->Dump(); g_pGameDescription->Dump();
} }