Merge branch 'master' into Premake_updates

Author: MiranDMC

examples/Test/Main.cpp

@@ -2,6 +2,8 @@
 
 #if defined(GTA3) or defined(GTAVC) or defined(GTASA)
     #include <CMessages.h>
+#elif defined (GTA2)
+    #include <CHud.h>
 #endif
 
 using namespace plugin;
@@ -18,6 +20,8 @@ struct Main
     {
         #if defined(GTA3) or defined(GTAVC) or defined(GTASA)
             CMessages::AddMessageJumpQ("Hello, world!", 500, 0);
+        #elif defined (GTA2)
+            GetHud()->m_HudMessage.SetHudMessage(L"Hello, world!", MESSAGE_DISPLAY_NOW);
         #endif
     }
 } gInstance;

examples/Texture/Main.cpp

@@ -1,21 +1,25 @@
 #include "plugin.h"
+#include "SpriteLoader.h"
 #include "CSprite2d.h"
 
 using namespace plugin;
 
 class TextureExample {
 public:
-    TextureExample() {
-        static CSprite2d sprite;
+    static inline plugin::SpriteLoader spriteLoader = {};
 
-        Events::drawingEvent += [] {
-            if(!sprite.m_pTexture) // load texture only once
-                sprite.m_pTexture = RwD3D9DDSTextureRead(PLUGIN_PATH((char*)"image"), 0); // rw api gives you ability to load dds images
+    TextureExample() {
+        Events::drawHudEvent += [] {
+			auto sprite = spriteLoader.GetSprite("image"); // get sprite called image
             sprite.Draw(CRect(10.0f, 10.0f, 300.0f, 300.0f), CRGBA(255, 255, 255, 255)); // draw sprite
         };
 
+        Events::initRwEvent += []() {
+ 			spriteLoader.LoadSpriteFromFolder(PLUGIN_PATH("image.png")); // load single sprite called image.png
+        };
+
         Events::shutdownRwEvent += [] {
-            sprite.Delete(); // delete loaded texture
+            spriteLoader.Clear(); // delete any loaded sprites
         };
     }
 } texExample;

plugin_II/game_II/CHud.cpp

@@ -29,7 +29,7 @@ void CHud::DrawSprite(int id1, int id2, int x, int y, char style, int const& mod
     plugin::CallStd<0x4C71B0, int, int, int, int, char, int const&, int, int, char>(id1, id2, x, y, style, mode, enableAlpha, alpha, unk);
 }
 
-void CHudMessage::SetHudMessage(wchar_t* str, int priority) {
+void CHudMessage::SetHudMessage(const wchar_t* str, int priority) {
     plugin::CallMethod<0x4C6060>(this, str, priority);
 }
 

plugin_II/game_II/CHud.h

@@ -66,7 +66,7 @@ class CHudMessage {
     int m_nType;
 
 public:
-    void SetHudMessage(wchar_t* str, int priority);
+    void SetHudMessage(const wchar_t* str, int priority);
 };
 
 VALIDATE_SIZE(CHudMessage, 0x1C8);

plugin_III/game_III/CGame.cpp

@@ -139,3 +139,7 @@ CSprite2d* LoadSplash(const char* name) {
 RsEventStatus RsEventHandler(RsEvent event, void* param) {
     return plugin::CallAndReturnDyn<RsEventStatus>(0x584A20, event, param);
 }
+
+void RenderScene() {
+    plugin::Call<0x48E030>();
+}

plugin_III/game_III/CGame.h

@@ -50,4 +50,6 @@ extern class CSprite2d* LoadSplash(const char* name);
 
 extern RsEventStatus RsEventHandler(RsEvent event, void* param);
 
+extern void RenderScene();
+
 #include "meta/meta.CGame.h"

plugin_III/game_III/CRect.h

@@ -12,9 +12,9 @@
 class CRect {
 public:
     float left;
-    float top;
-    float right;
     float bottom;
+    float right;
+    float top;
 
     CRect(plugin::dummy_func_t) {}
 

plugin_iii_unreal/game_iii_unreal/CRect.h

@@ -10,9 +10,9 @@
 class CRect {
 public:
     float left;
-    float top;
-    float right;
     float bottom;
+    float right;
+    float top;
 
 public:
     CRect(plugin::dummy_func_t) {

plugin_sa/game_sa/CGame.cpp

@@ -231,3 +231,7 @@ void DoRwStuffEndOfFrame() {
 RsEventStatus RsEventHandler(RsEvent event, void* param) {
     return plugin::CallAndReturnDyn<RsEventStatus>(0x619B60, event, param);
 }
+
+void RenderScene() {
+    plugin::Call<0x53DF40>();
+}

plugin_sa/game_sa/CGame.h

@@ -58,5 +58,6 @@ SUPPORTED_10US void ValidateVersion();
 SUPPORTED_10US void D3DDeviceRestoreCallback();
 SUPPORTED_10US bool DoHaspChecks();
 extern RsEventStatus RsEventHandler(RsEvent event, void* param);
+extern void RenderScene();
 
 #include "meta/meta.CGame.h"