Merge branch 'master' into fixs-reverse

premake5.lua

@@ -8,6 +8,10 @@
     Options and Actions
 --]]
 
+newoption {
+    trigger     = "script-tracing",
+    description = "Enable script command trace logging (Slow!)"
+}
 newoption {
     trigger     = "outdir",
     value       = "path",

source/game_sa/Scripts/RunningScript.cpp

@@ -933,7 +933,13 @@ OpcodeResult CRunningScript::ProcessOneCommand() {
         };
     } op = { CTheScripts::Read2BytesFromScript(m_IP) };
 
-    SPDLOG_LOGGER_TRACE(logger, "[{}][IP: {:#x} + {:#x}]: {} [{:#x}]", m_szName, LOG_PTR(m_pBaseIP), LOG_PTR(m_IP - m_pBaseIP), notsa::script::GetScriptCommandName((eScriptCommands)op.command), (size_t)op.command);
+#ifdef NOTSA_SCRIPT_TRACING
+    // snprintf is faster (in debug at least) - Gotta stick to it for now
+    char msg[4096];
+    sprintf_s(msg, "[%s][IP: 0x%X + 0x%X]: %s [0x%X]", m_szName, LOG_PTR(m_pBaseIP), LOG_PTR(m_IP - m_pBaseIP), notsa::script::GetScriptCommandName((eScriptCommands)op.command).data(), (size_t)op.command);
+    SPDLOG_LOGGER_TRACE(logger, msg);
+    //SPDLOG_LOGGER_TRACE(logger, "[{}][IP: {:#x} + {:#x}]: {} [{:#x}]", m_szName, LOG_PTR(m_pBaseIP), LOG_PTR(m_IP - m_pBaseIP), notsa::script::GetScriptCommandName((eScriptCommands)op.command), (size_t)op.command);
+#endif
 
     m_bNotFlag = op.notFlag;
 

source/game_sa/Weather.cpp

@@ -310,29 +310,26 @@ void CWeather::UpdateInTunnelness() {
     plugin::Call<0x72B630>();
 }
 
-// 0x72A640
-void CWeather::UpdateWeatherRegion(CVector* posn) {
-    CVector camPos = TheCamera.GetPosition();
-    if (posn) {
-        camPos = *posn;
+// Based on 0x72A640
+eWeatherRegion CWeather::FindWeatherRegion(CVector2D pos) {
+    if (pos.x > 1000.0f && pos.y > 910.0f) {
+        return WEATHER_REGION_LV;
     }
-    if (camPos.x > 1000.0f && camPos.y > 910.0f) {
-        WeatherRegion = WEATHER_REGION_LV;
-        return;
+    if (pos.x > -850.0f && pos.x < 1000.0f && pos.y > 1280.0f) {
+        return WEATHER_REGION_DESERT;
     }
-    if (camPos.x > -850.0f && camPos.x < 1000.0f && camPos.y > 1280.0f) {
-        WeatherRegion = WEATHER_REGION_DESERT;
-        return;
+    if (pos.x < -1430.0f && pos.y > -580.0f && pos.y < 1430.0f) {
+        return WEATHER_REGION_SF;
     }
-    if (camPos.x < -1430.0f && camPos.y > 580.0f && camPos.y < 1430.0f) {
-        WeatherRegion = WEATHER_REGION_SF;
-        return;
+    if (pos.x > 250.0f && pos.x < 3000.0f && pos.y > -3000.0f && pos.y < -850.0f) {
+        return WEATHER_REGION_LA;
     }
-    if (camPos.x > 250.0f && camPos.x < 3000.0f && camPos.y > -3000.0f && camPos.y < -850.0f) { // todo: maybe wrong
-        WeatherRegion = WEATHER_REGION_LA;
-        return;
-    }
-    WeatherRegion = WEATHER_REGION_DEFAULT;
+    return WEATHER_REGION_DEFAULT;
+}
+
+// 0x72A640
+void CWeather::UpdateWeatherRegion(CVector* posn) {
+    WeatherRegion = FindWeatherRegion(posn ? *posn : TheCamera.GetPosition());
 }
 
 // 0x4ABF50

source/game_sa/Weather.h

@@ -79,6 +79,12 @@ class CWeather {
     static void SetWeatherToAppropriateTypeNow();
     static void Update();
     static void UpdateInTunnelness();
+    /*!
+    * @notsa
+    * @detail Based on code @ `0x72A640`
+    * @return The corresponding weather region at a given 2D position, or `WEATHER_REGION_DEFAULT` if no specific region was found
+    */
+    static eWeatherRegion FindWeatherRegion(CVector2D pos);
     static void UpdateWeatherRegion(CVector* posn);
     static bool IsRainy();
 

source/premake5.lua

@@ -41,6 +41,10 @@ project "gta_sa_modern"
         "../libs/tracy/public",
         "../libs/json/include"
     }
+
+    filter "options:script-tracing"
+        defines { "NOTSA_SCRIPT_TRACING" }
+    filter {}
 
     defines { 
         "NOMINMAX",