v1.0.5

JuniorDjjr · Dec 18, 2020 · 75ce596 · 75ce596
1 parent db57d0b
commit 75ce596
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CLEOPlus/CLEOPlus.cpp b/CLEOPlus/CLEOPlus.cpp
@@ -18,7 +18,7 @@
 #include "rw/rpworld.h"
 #include <set>
 
-constexpr uint32_t CLEOPLUS_VERSION_INT = 0x01000400;
+constexpr uint32_t CLEOPLUS_VERSION_INT = 0x01000500;
 
 using namespace plugin;
 using namespace std;

diff --git a/CLEOPlus/Misc.cpp b/CLEOPlus/Misc.cpp
@@ -788,7 +788,10 @@ OpcodeResult WINAPI REQUEST_PRIORITY_MODEL(CScriptThread* thread)
 // 0E99=0,load_all_priority_models_now
 OpcodeResult WINAPI LOAD_ALL_PRIORITY_MODELS_NOW(CScriptThread* thread)
 {
-	CStreaming::LoadAllRequestedModels(true);
+	//CStreaming::LoadAllRequestedModels(true);
+	CTimer::Suspend();
+	CStreaming::LoadAllRequestedModels(false); // "true" doesn't work, I don't know why, so, now it works just like LOAD_ALL_MODELS_NOW
+	CTimer::Resume();
 	return OR_CONTINUE;
 }
 

diff --git a/CLEOPlus/RadarBlip.cpp b/CLEOPlus/RadarBlip.cpp
@@ -59,17 +59,18 @@ namespace RadarBlip
 		float width = (RsGlobal.maximumWidth * *ARwidthFromWF * blipSize);
 		float height = (RsGlobal.maximumHeight * *ARheightFromWF * blipSize);
 
-		int spriteId = (blip->spriteId != -1) ? blip->spriteId : RADAR_SPRITE_NONE;
+		int spriteIdForDisplay = (blip->spriteId != -1) ? blip->spriteId : RADAR_SPRITE_PROPERTYG;
+		int spriteIdForLegend = (blip->spriteId != -1) ? blip->spriteId : RADAR_SPRITE_NONE;
 
-		if (CRadar::DisplayThisBlip(spriteId, -99))
+		if (CRadar::DisplayThisBlip(spriteIdForDisplay, -99))
 		{
 			CRect rect;
 			rect.left = x - width;
 			rect.top = y - height;
 			rect.right = width + x;
 			rect.bottom = height + y;
 			blip->sprite->Draw(rect, blip->color);
-			if (spriteId > 0) CRadar::AddBlipToLegendList(0, spriteId);
+			if (spriteIdForLegend != RADAR_SPRITE_NONE) CRadar::AddBlipToLegendList(0, spriteIdForLegend);
 		}
 	}