From 4a9b132893f24001660f8125229e965cde7663fe Mon Sep 17 00:00:00 2001 From: Willi Schinmeyer Date: Sat, 16 Jun 2012 16:48:07 +0200 Subject: [PATCH 1/3] Fixed wrong shaderpath being used for Jedi Academy --- radiant/preferences.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 08ff05c4..3ae76eb0 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -3573,6 +3573,9 @@ void CGameInstall::Run() { Str dest = m_strEngine.GetBuffer(); radCopyTree( source.GetBuffer(), dest.GetBuffer() ); fprintf( fg, " basegame=\"base\"\n" ); + fprintf( fg, " shaderpath=\"shaders\"\n" ); + fprintf( fg, " default_scale=\"0.25\"\n" ); + fprintf( fg, " caulk_shader=\"textures/system/caulk\"\n" ); break; } case GAME_REACTION: { From 6150c562c63c0a7c1a8b7d6ccef2045f910220b9 Mon Sep 17 00:00:00 2001 From: Willi Schinmeyer Date: Sat, 16 Jun 2012 16:51:31 +0200 Subject: [PATCH 2/3] Fix for missing shaderlist in JAPack --- radiant/preferences.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 3ae76eb0..eeb5e86b 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -3571,6 +3571,12 @@ void CGameInstall::Run() { source += JA_PACK; source += "/install/"; Str dest = m_strEngine.GetBuffer(); + // Hardcoded fix for "missing" shaderlist in gamepack + dest += "/baseq3/shaders/shaderlist.txt"; + if(CheckFile(dest.GetBuffer()) != PATH_FILE) { + source += "baseq3/shaders/default_shaderlist.txt"; + radCopyFile(source.GetBuffer(),dest.GetBuffer()); + } radCopyTree( source.GetBuffer(), dest.GetBuffer() ); fprintf( fg, " basegame=\"base\"\n" ); fprintf( fg, " shaderpath=\"shaders\"\n" ); From 34f3153d3127887444c3d8338018f119a2fe8a6e Mon Sep 17 00:00:00 2001 From: Willi Schinmeyer Date: Sat, 16 Jun 2012 17:15:50 +0200 Subject: [PATCH 3/3] Fixed some errors I made copying the shaderlist code --- radiant/preferences.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index eeb5e86b..c7c91291 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -3571,13 +3571,13 @@ void CGameInstall::Run() { source += JA_PACK; source += "/install/"; Str dest = m_strEngine.GetBuffer(); + radCopyTree( source.GetBuffer(), dest.GetBuffer() ); // Hardcoded fix for "missing" shaderlist in gamepack - dest += "/baseq3/shaders/shaderlist.txt"; + dest += "/base/shaders/shaderlist.txt"; if(CheckFile(dest.GetBuffer()) != PATH_FILE) { - source += "baseq3/shaders/default_shaderlist.txt"; + source += "base/scripts/default_shaderlist.txt"; radCopyFile(source.GetBuffer(),dest.GetBuffer()); } - radCopyTree( source.GetBuffer(), dest.GetBuffer() ); fprintf( fg, " basegame=\"base\"\n" ); fprintf( fg, " shaderpath=\"shaders\"\n" ); fprintf( fg, " default_scale=\"0.25\"\n" );