Rainbomizer News: Re-enable in-game Rainbomizer news

* Fixed for the latest version. * Also a different server since the main one isn't redirected properly.
Parik27 · May 29, 2022 · 8759e85 · 8759e85
1 parent fb07fe0
commit 8759e85
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/config.toml b/config.toml
@@ -23,6 +23,7 @@
 [Randomizers]
 
 RainbomizerCredits = true
+RainbomizerNews = true
 
 CarGeneratorRandomizer = true
 ClothesRandomizer = true

diff --git a/src/common/configDefault.hh b/src/common/configDefault.hh
@@ -24,6 +24,7 @@ const char configDefault[] = R"(
 [Randomizers]
 
 RainbomizerCredits = true
+RainbomizerNews = true
 
 CarGeneratorRandomizer = true
 ClothesRandomizer = true
@@ -38,7 +39,6 @@ ScriptVehicleRandomizer = true
 VoiceLineRandomizer = true
 SfxRandomizer = true
 TimecycleRandomizer = true
-MissionRandomizer = true
 PedRandomizer = true
 HandlingRandomizer = false
 SwitchSceneRandomizer = false

diff --git a/src/common/logger.cc b/src/common/logger.cc
@@ -8,8 +8,8 @@
 #ifndef NDEBUG
 #define RAINBOMIZER_BUILD "Debug Build: " __DATE__ " " __TIME__
 #else
-#define RAINBOMIZER_BUILD "Release v3.2: " __DATE__ " " __TIME__
-#define RAINBOMIZER_BUILD_SHORT "Release v3.2"
+#define RAINBOMIZER_BUILD "Release v3.3: " __DATE__ " " __TIME__
+#define RAINBOMIZER_BUILD_SHORT "Release v3.3"
 #endif
 
 constexpr int RAINBOMIZER_BUILD_NUMBER =

diff --git a/src/misc/news.cc b/src/misc/news.cc
@@ -1,5 +1,6 @@
 #include <common/config.hh>
 
+#include "Patterns/Patterns.hh"
 #include "Utils.hh"
 
 #include "common/logger.hh"
@@ -25,38 +26,26 @@ class NewsRandomizer
                 if (strstr (prefix, "/news/"))
                     {
                         buff = out;
-                        strncpy (buff, "news.rainbomizer.com", outLen);
+                        strncpy (buff, "news.parik.eu.org/3.3", outLen);
                     }
             }
 
         return buff;
     }
 
-    /*******************************************************/
-    template <auto &rage__formatf>
-    static void
-    MoveCloudCache (char *out, int len, char *format, char *, char *file)
-    {
-        static std::string s_CachePath
-            = Rainbomizer::Common::GetRainbomizerFileName ("", "cloudcache/");
-        rage__formatf (out, len, format, s_CachePath.c_str (), file);
-    }
-
 public:
     NewsRandomizer ()
     {
         if (!ConfigManager::ReadConfig ("RainbomizerNews"))
             return;
 
+        char *cloudPath = hook::get_pattern<char> (
+            "63 6c 6f 75 64 5f 25 30 31 36 49 36 34 78 2e 64 61 74 00");
+
+        if (cloudPath)
+            strcpy (cloudPath, "rbcld_%016I64x.dat");
+
         REGISTER_HOOK ("41 b8 80 00 00 00 ? 8b ce e8 ? ? ? ? ? 8b f8 ", 9,
                        SetRainbowDomain, char *, char *, char *, uint32_t);
-
-        REGISTER_HOOK (
-            "0f 44 ca 41 8b d0 ? 8d 05 ? ? ? ? e8 ? ? ? ? ? 83 c4 38 c3 ", 13,
-            MoveCloudCache, void, char *, int, char *, const char *, char *);
     }
-}
-#ifdef BUILD_NEWS_RANDOMIZER
-news
-#endif
-    ;
+} news;