From 4b65ccefefa534c7e02b81afafbb4a35aadb1afa Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Thu, 16 Aug 2007 02:42:37 +0000 Subject: [PATCH] - updated config.1.00.in to new config format - put back preset url behavior git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@340 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/config.1.00.in | 6 +----- src/projectM-engine/projectM.cpp | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/projectM-engine/config.1.00.in b/src/projectM-engine/config.1.00.in index 0bdb86715..4897f25b6 100644 --- a/src/projectM-engine/config.1.00.in +++ b/src/projectM-engine/config.1.00.in @@ -10,13 +10,9 @@ Windowed Width (Initial window width) 512 Windowed Height (Initial window width) 512 -Fullscreen Width (set to your native screen resolution) -1024 -Fullscreen Height (set to your native screen resolution) -768 FPS (Higher the Better) 30-90 is realisitc 35 Fullscreen on Startup (1=yes, 0=no) 0 Preset Path -@CMAKE_INSTALL_PREFIX@/share/projectM/presets \ No newline at end of file +@CMAKE_INSTALL_PREFIX@/share/projectM/presets diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index 4e4873d83..de9c939f8 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -771,8 +771,7 @@ int projectM::initPresetTools() #ifdef WIN32 srand ( time ( NULL ) ); #endif - - // if ( ( m_presetLoader = new PresetLoader ( PROJECTM_PRESET_PATH ) ) == 0 ) + if ( ( m_presetLoader = new PresetLoader (std::string(presetURL))) == 0 ) { m_presetLoader = 0;