Resolves issues regarding x64 beta branch

fluffy-servers · Sep 21, 2023 · bbcf017 · bbcf017
1 parent cf58b33
commit bbcf017
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/cpp/GRPCTest.cpp b/cpp/GRPCTest.cpp
@@ -2,6 +2,7 @@
 #include "GarrysMod/Lua/Interface.h"
 #include "discord_rpc.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <utility>
 
@@ -175,33 +176,34 @@ LUA_FUNCTION(UpdateDiscordStatus) {
     LUA->GetField(1, "instance");
     discordP.instance = LUA->GetNumber();
 
+    int buttonI = 0;
+
     LUA->GetField(1, "buttonPrimaryLabel");
-    if (LUA->GetType(-1) == GarrysMod::Lua::Type::String) {
-        DiscordRichPresenceButton button;
+    if (LUA->GetString() != NULL) {
+        discordP.buttons[buttonI] = (DiscordRichPresenceButton *)malloc(
+            sizeof(DiscordRichPresenceButton));
 
-        button.label = LUA->GetString();
+        discordP.buttons[buttonI]->label = LUA->GetString();
 
         LUA->GetField(1, "buttonPrimaryUrl");
         LUA->CheckString();
 
-        button.url = LUA->GetString();
+        discordP.buttons[buttonI]->url = LUA->GetString();
 
-        discordP.buttons[0] = &button;
+        buttonI += 1;
     }
 
     LUA->GetField(1, "buttonSecondaryLabel");
-    if (LUA->GetType(-1) == GarrysMod::Lua::Type::String) {
-        DiscordRichPresenceButton button;
+    if (LUA->GetString() != NULL) {
+        discordP.buttons[buttonI] = (DiscordRichPresenceButton *)malloc(
+            sizeof(DiscordRichPresenceButton));
 
-        button.label = LUA->GetString();
+        discordP.buttons[buttonI]->label = LUA->GetString();
 
         LUA->GetField(1, "buttonSecondaryUrl");
         LUA->CheckString();
 
-        button.url = LUA->GetString();
-
-#pragma warning(disable : 6201)
-        discordP.buttons[1] = &button;
+        discordP.buttons[buttonI]->url = LUA->GetString();
     }
 
     Discord_UpdatePresence(&discordP);

diff --git a/cpp/discord-rpc b/cpp/discord-rpc