From 1ab8fe06de6a0593a27333ef915ad3b8033778ed Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 15 Apr 2020 16:40:53 +0800 Subject: [PATCH 1/3] Just copy actors without MRM setup --- nel/tools/build_gamedata/processes/shape/2_build.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nel/tools/build_gamedata/processes/shape/2_build.py b/nel/tools/build_gamedata/processes/shape/2_build.py index f261473fe..86a3b6a99 100755 --- a/nel/tools/build_gamedata/processes/shape/2_build.py +++ b/nel/tools/build_gamedata/processes/shape/2_build.py @@ -74,6 +74,13 @@ else: printLog(log, ">>> Copy Shape <<<") copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape") +printLog(log, ">>> Copy non-ShadowSkin non-CLodTex Shape <<<") +shapeDirectory = ExportBuildDirectory + "/" + ShapeNotOptimizedExportDirectory +mkPath(log, shapeDirectory) +mkPath(log, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory) +copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape") +shapeDirectory = ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory + # copy lightmap_not_optimized to lightmap printLog(log, ">>> Optimize lightmaps <<<") loPathLightmapsOriginal = ExportBuildDirectory + "/" + ShapeLightmapNotOptimizedExportDirectory From db92cbc6bbd270835c7d50fbe49240b95980e8b0 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 16 Apr 2020 09:22:32 +0800 Subject: [PATCH 2/3] Disable warning --- nel/src/sound/driver/xaudio2/source_xaudio2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp index 785ce0565..273c6ee60 100644 --- a/nel/src/sound/driver/xaudio2/source_xaudio2.cpp +++ b/nel/src/sound/driver/xaudio2/source_xaudio2.cpp @@ -480,7 +480,7 @@ void CSourceXAudio2::setLooping(bool l) _SourceVoice->GetState(&voice_state); if (voice_state.BuffersQueued) { - nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue"); + // nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue"); if (FAILED(_SourceVoice->FlushSourceBuffers())) nlwarning(NLSOUND_XAUDIO2_PREFIX "FAILED FlushSourceBuffers"); // queue buffer with correct looping parameters From c00701eee1dfdc7fbb3ed30f0c1742bc12803cb8 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 16 Apr 2020 09:22:47 +0800 Subject: [PATCH 3/3] More useful warnings --- nel/src/pacs/move_container.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nel/src/pacs/move_container.cpp b/nel/src/pacs/move_container.cpp index 7c346aed4..099f46839 100644 --- a/nel/src/pacs/move_container.cpp +++ b/nel/src/pacs/move_container.cpp @@ -418,13 +418,13 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage) /* // Check BB width not too large if (wI->getBBXMax() - wI->getBBXMin() > _CellWidth) { - nlwarning ("Primitives have moved more than a cell."); + nlwarning ("Primitives have moved more than a cell, width: %f.", (float)(wI->getBBXMax() - wI->getBBXMin())); } // Check BB height not too large if (wI->getBBYMax() - wI->getBBYMin() > _CellHeight) { - nlwarning ("Primitives have moved more than a cell."); + nlwarning ("Primitives have moved more than a cell, height: %f.", (float)(wI->getBBYMax() - wI->getBBYMin())); } */ #endif