From 6ad288bf1aafc219336789a86ceda74d38a4bb99 Mon Sep 17 00:00:00 2001 From: engineer_apple Date: Wed, 11 Feb 2009 19:58:51 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2210 dfc29bdd-3216-0410-991c-e03cc46cb475 --- examples/21.Quake3Explorer/main.cpp | 11 +++++++++-- source/Irrlicht/CQ3LevelMesh.cpp | 5 ----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/21.Quake3Explorer/main.cpp b/examples/21.Quake3Explorer/main.cpp index 04ffe3e3..0b0bceb6 100644 --- a/examples/21.Quake3Explorer/main.cpp +++ b/examples/21.Quake3Explorer/main.cpp @@ -100,7 +100,7 @@ void GameData::setDefault () loadParam.defaultLightMapMaterial = EMT_LIGHTMAP; loadParam.defaultModulate = EMFN_MODULATE_1X; loadParam.defaultFilter = EMF_ANISOTROPIC_FILTER; - loadParam.verbose = 1; + loadParam.verbose = 2; loadParam.mergeShaderBuffer = 1; // merge meshbuffers with same material loadParam.cleanUnResolvedMeshes = 1; // should unresolved meshes be cleaned. otherwise blue texture loadParam.loadAllShaders = 1; // load all scripts in the script directory @@ -111,8 +111,15 @@ void GameData::setDefault () CurrentMapName = ""; CurrentArchiveList.clear (); + + //! Explorer Media directory CurrentArchiveList.push_back ( StartupDir + "../../media/" ); + + //! Add the original quake3 files before you load your custom map + //! Most mods are using the original shaders, models&items&weapons CurrentArchiveList.push_back ( "/q/baseq3/" ); + + CurrentArchiveList.push_back ( StartupDir + "../../media/map-20kdm2.pk3" ); } @@ -1086,7 +1093,7 @@ void CQuake3EventHandler::LoadMap ( const stringw &mapName, s32 collision ) */ Q3ShaderFactory ( Game->loadParam, Game->Device, Mesh, E_Q3_MESH_ITEMS,ShaderParent, Meta, false ); Q3ShaderFactory ( Game->loadParam, Game->Device, Mesh, E_Q3_MESH_FOG,FogParent, 0, false ); - Q3ShaderFactory ( Game->loadParam, Game->Device, Mesh, E_Q3_MESH_UNRESOLVED,UnresolvedParent, 0, true ); + Q3ShaderFactory ( Game->loadParam, Game->Device, Mesh, E_Q3_MESH_UNRESOLVED,UnresolvedParent, Meta, true ); /* diff --git a/source/Irrlicht/CQ3LevelMesh.cpp b/source/Irrlicht/CQ3LevelMesh.cpp index 1c49ac0e..1d7d74c9 100644 --- a/source/Irrlicht/CQ3LevelMesh.cpp +++ b/source/Irrlicht/CQ3LevelMesh.cpp @@ -1488,11 +1488,6 @@ const IShader* CQ3LevelMesh::getShader( const c8 * filename, bool fileNameIsVali if ( file ) { getShader ( file ); - if ( LoadParam.verbose > 1 ) - { - message = searchName + " found " + Shader[index].name; - os::Printer::log("quake3:getShader", message.c_str(), ELL_INFORMATION); - } file->drop (); }