.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

.gitignore

@@ -1,6 +1,5 @@
 *.sav
 *.love
-*.zip
 dist/*.zip
 dist/**/cambridge.exe
 dist/**/libs

CONTRIBUTING.md

@@ -57,13 +57,13 @@ Coding conventions
 Use tabs to indent, spaces to align.
 
 * Specifically, spaces should not appear at the beginning of a line, and tabs should not appear _except_ at the beginning of a line.
-* If you're aligning multiline if-statements, the initial "if", "elseif" or "else" should be flush left with the indentation level, with spaces padding the gap to the next word as necessary. For example:
+* The sole exception is in a multiline `if` statement; the initial `if` should have four spaces before it to align it with an `elseif` on the next line. For example:
 
 ```lua
+	---- 4 spaces
 	    if self.level <  900 then return 12
 	elseif self.level < 1200 then return 8
-	else                          return  6
+	else return 6 end
-	end
 ```
 
 Comments at the end of lines of code must be one line long. Multi-line comments must appear in their own block.

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2021 Joe Zeng, Ishaan Bhardwaj
+Copyright (c) 2018-2019 Joe Zeng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,15 +1,37 @@
-![Cambridge Banner](https://t-sp.in/public/img/cambridge.png)
+![Cambridge Banner](https://cdn.discordapp.com/attachments/764432435802013709/767724895076614154/cambridge_logo_lt.png)
 
 Cambridge
 =========
 
 Welcome to Cambridge, the next open-source falling-block game engine!
 
-The project is written and maintained exclusively by [Milla](https://github.com/MillaBasset), [joezeng](https://github.com/joezeng) and [Oshisaure](https://github.com/oshisaure)!
+This fork is written and maintained exclusively by [SashLilac](https://github.com/SashLilac), [joezeng](https://github.com/joezeng) and [Oshisaure](https://github.com/oshisaure)!
 
-The Discord server has been reopened! https://discord.gg/AADZUmgsph
+Join our Discord server for help and a welcoming community! https://discord.gg/mteMJw4
 
-The game also has a website now with more detail than seen on this README: https://t-sp.in/cambridge
+Credits
+-------
+
+- [Lilla Oshisaure](https://www.youtube.com/user/LeSpyroshisaure) for being my co-dev!
+- [joezeng](https://github.com/joezeng) for the original project, and for offering to help with the expansion!
+- [The Tetra Legends Discord](http://discord.com/invite/7hMx5r2) for supporting me and playtesting!
+- [The Absolute Plus](https://discord.gg/6Gf2awJ) for being another source of motivation!
+
+The following people in no particular order also helped with the project:
+- [Hailey](https://github.com/haileylgbt)
+- CylinderKnot
+- MarkGamed7794
+- [Mizu](https://github.com/rexxt)
+- MattMayuga
+- Kitaru
+- switchpalacecorner
+- [sinefuse](https://github.com/sinefuse)
+- [2Tie](https://github.com/2Tie)
+- [nightmareci](https://github.com/nightmareci)
+- [MyPasswordIsWeak](https://github.com/MyPasswordIsWeak)
+- [Dr Ocelot](https://github.com/Dr-Ocelot)
+
+![Cambridge Logo](https://cdn.discordapp.com/attachments/625496179433668635/763363717730664458/Icon_2.png)
 
 Playing the game
 ----------------
@@ -18,21 +40,15 @@ Playing the game
 
 You do not need LÖVE on Windows, as it comes bundled with the program.  
 
-#### Stable release
+To get the stable release, simply download the ZIP in the latest release. All assets needed are bundled with the executable.
 
-To get the stable release, simply download either `cambridge-win32.zip` (32-bit) or `cambridge-windows.zip` (64-bit) in the [latest release](https://github.com/MillaBasset/cambridge/releases/latest).
+If you want the bleeding edge version, download [this](https://github.com/SashLilac/cambridge/archive/master.zip).
 
-All assets needed are bundled with the executable.
+Extract the ZIP, open a Command Prompt at the folder you extracted Cambridge to, then run this command:
-
-#### Bleeding edge
-
-If you want the bleeding edge version, download [this](https://github.com/MillaBasset/cambridge/archive/master.zip). Extract the ZIP to a folder of your choosing.
-
-If you're on Windows, you can double-click `start.bat` to run the game. If that doesn't work, open a Command Prompt where you extracted Cambridge and run:
 
 	dist\windows\love.exe .
 
-If that doesn't work, run this instead, still using Command Prompt where you extracted Cambridge:
+Alternatively, if you're on a 32-bit system, run this instead:
 
 	dist\win32\love.exe .
 
@@ -42,7 +58,7 @@ Then, check the mod pack section at the bottom of this page.
 
 ### macOS, Linux
 
-If you haven't already, install `love` with your favourite package manager (Homebrew on macOS, your system's default on Linux). **Make sure you're using LÖVE 11.3, because it won't work with earlier or later versions!**
+If you haven't already, install `love` with your favourite package manager (Homebrew on macOS, your system's default on Linux). **Make sure you're using LÖVE 11, because it won't work with earlier versions!**
 
 #### Downloading a release
 
@@ -54,7 +70,7 @@ You can download the .love file in the latest release, and run it with:
 
 Clone the repository in git:
 
-	git clone https://github.com/MillaBasset/cambridge
+	git clone https://github.com/SashLilac/cambridge
 
 Alternatively, download the source code ZIP in the latest release.
 
@@ -66,7 +82,13 @@ It should run automatically!
 
 ## Installing modpacks
 
-For instructions on how to install modpacks, go to [this](https://github.com/MillaBasset/cambridge-modpack) mod pack to get a taste of the mod potential.
+Simply drag your mode, ruleset, and randomizer Lua files into their respective [directory](https://love2d.org/wiki/love.filesystem), and they should appear automatically.  
+
+You can also load custom assets through this way, assuming you preserve the directory structure.  
+
+**WARNING:** The .exe / .love files and the bleeding edge releases have different save directories. Read the above link carefully!
+
+For more detailed instructions, install [this](https://github.com/SashLilac/cambridge-modpack) mod pack to get a taste of the mod potential.
 
 License
 -------
@@ -78,33 +100,3 @@ community, as well as borrowed from other places, either with licensing
 or as placeholders until suitable material can be found that is properly
 licensed. Their original sources, and copyright notices if applicable, are
 listed in the file SOURCES.
-
-Credits
--------
-
-- [Lilla Oshisaure](https://www.youtube.com/user/LeSpyroshisaure) for being my co-dev!
-- [joezeng](https://github.com/joezeng) for the original project, and for offering to help with the expansion!
-- [The Tetra Legends Discord](http://discord.com/invite/7hMx5r2) for supporting me and playtesting!
-- [The Absolute Plus](https://discord.gg/6Gf2awJ) for being another source of motivation!
-
-More special thanks can be found in-game, under the "Credits" menu.
-
-Other Notable Games
--------------------
-
-- [TGMsim](https://github.com/2Tie/TGMsim) by 2Tie
-- [Multimino](https://gamejolt.com/games/multimino/556683) by Axel Fox
-- [Tetra Legends](https://tetralegends.app) by Dr Ocelot
-- [ZTrix](https://discord.gg/MGhqCBDGNH) by Electra
-- [Shiromino](https://github.com/shiromino/shiromino) by Felicity/nightmareci/kdex
-- [Cursed Blocks](https://github.com/Manabender/Cursed-Blocks) by Manabender
-- [Picoris 2](https://www.lexaloffle.com/bbs/?tid=41733) by MarkGamed
-- [Tetra Online](https://github.com/Juan-Cartes/Tetra-Offline) by Mine
-- [Techmino](https://discord.gg/6Yuww44tq8) by MrZ
-- [Example Block Game](https://github.com/oshisaure/example-block-game) by Oshisaure
-- [Master of Blocks](https://discord.gg/72FZ49mjWh) by Phoenix Flare
-- [Spirit Drop](https://rayblastgames.com/spiritdrop.php) by RayRay26
-- [Puzzle Trial](https://kagamine-rin.itch.io/puzzle-trial) by Rin
-- [stackfuse](https://github.com/sinefuse/stackfuse) by sinefuse
-
-![Cambridge Logo](https://cdn.discordapp.com/attachments/827186653772644452/1077674343544393820/Icon_2.png)

SOURCES.md

@@ -170,51 +170,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-discord-rpc (https://github.com/discord/discord-rpc)  
---------------------
-
-Copyright 2017 Discord, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-lua-discordRPC (https://github.com/pfirsich/lua-discordRPC)
---------------------
-
-MIT License
-
-Copyright (c) 2018 Joel Schumacher
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

clean.bat

@@ -7,11 +7,5 @@
 @del dist\win32\SOURCES.md
 @del dist\win32\LICENSE.md
 @rmdir /Q /S dist\win32\libs
-@del dist\other\cambridge.love
-@del dist\other\SOURCES.md
-@del dist\other\LICENSE.md
-@rmdir /Q /S dist\other\libs
-@rmdir /Q /S dist\other
 @del dist\cambridge-windows.zip
 @del dist\cambridge-win32.zip
-@del dist\cambridge-other.zip

conf.lua

@@ -6,6 +6,5 @@ function love.conf(t)
 	t.window.title = "Cambridge"
 	t.window.width = 640
 	t.window.height = 480
-	t.window.icon = "res/img/cambridge_icon.png"
 	t.window.vsync = false
 end

funcs.lua

@@ -1,20 +1,10 @@
 function copy(t)
-	-- returns top-layer shallow copy of t
+	-- returns deep copy of t (as opposed to the shallow copy you get from var = t)
 	if type(t) ~= "table" then return t end
+	local meta = getmetatable(t)
 	local target = {}
-	for k, v in next, t do target[k] = v end
+	for k, v in pairs(t) do target[k] = v end
-	setmetatable(target, getmetatable(t))
+	setmetatable(target, meta)
-	return target
-end
-
-function deepcopy(t)
-    -- returns infinite-layer deep copy of t
-	if type(t) ~= "table" then return t end
-	local target = {}
-	for k, v in next, t do
-		target[deepcopy(k)] = deepcopy(v)
-	end
-	setmetatable(target, deepcopy(getmetatable(t)))
 	return target
 end
 
@@ -60,9 +50,6 @@ function formatTime(frames)
 	min  = math.floor(frames/3600)
 	sec  = math.floor(frames/60) % 60
 	hund = math.floor(frames/.6) % 100
-	if frames == 15641 then
-		hund = math.ceil(frames/.6) % 100
-	end
 	str = string.format("%02d:%02d.%02d", min, sec, hund)
 	return str
 end
@@ -100,50 +87,6 @@ function table.contains(table, element)
 	return false
 end
 
-function table.keys(table)
+function clamp(a, b, c)
-	local target = {}
+	return math.min(a, math.max(b, c))
-	for key in pairs(table) do
-		target[#target+1] = key
-	end
-	return target
-end
-
-function table.numkeys(table)
-	local count = 0
-	for k in pairs(table) do
-		count = count + 1
-	end
-	return count
-end
-
-function equals(x, y)
-	if type(x) ~= "table" or type(y) ~= "table" then
-		return x == y
-	else
-		for k in pairs(x) do
-			if not equals(x[k], y[k]) then return false end
-		end
-		for k in pairs(y) do
-			if not equals(x[k], y[k]) then return false end
-		end
-		return true
-	end
-end
-
-function table.equalvalues(t1, t2)
-	if table.numkeys(t1) ~= table.numkeys(t2) then
-		return false
-	else
-		for _, v in pairs(t2) do
-			if not table.contains(t1, v) then return false end
-		end
-		return true
-	end
-end
-
-function clamp(x, min, max)
-	if max < min then
-		min, max = max, min
-	end
-	return x < min and min or (x > max and max or x)
 end

libs/bigint/bigint.lua

@@ -7,43 +7,6 @@ local strict = true
 --------------------------------------------------------------------------------
 
 local bigint = {}
-setmetatable(bigint, {__call = function(_, arg) return bigint.new(arg) end})
-
-local mt = {
-    __add = function(lhs, rhs)
-        return bigint.add(lhs, rhs)
-    end,
-    __unm = function(arg)
-        return bigint.negate(arg)
-    end,
-    __sub = function(lhs, rhs)
-        return bigint.subtract(lhs, rhs)
-    end,
-    __mul = function(lhs, rhs)
-        return bigint.multiply(lhs, rhs)
-    end,
-    __div = function(lhs, rhs)
-        return bigint.divide(lhs, rhs)
-    end,
-    __mod = function(lhs, rhs)
-        return bigint.modulus(lhs, rhs)
-    end,
-    __pow = function(lhs, rhs)
-        return bigint.exponentiate(lhs, rhs)
-    end,
-    __tostring = function(arg)
-        return bigint.unserialize(arg, "s")
-    end,
-    __eq = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "==")
-    end,
-    __lt = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "<")
-    end,
-    __le = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "<=")
-    end
-}
 
 local named_powers = require("libs.bigint.named-powers-of-ten")
 
@@ -65,7 +28,43 @@ function bigint.new(num)
         return newint
     end
 
-    setmetatable(self, mt)
+    setmetatable(self, {
+        __add = function(lhs, rhs)
+            return bigint.add(lhs, rhs)
+        end,
+        __unm = function()
+            if (self.sign == "+") then
+                self.sign = "-"
+            else
+                self.sign = "+"
+            end
+            return self
+        end,
+        __sub = function(lhs, rhs)
+            return bigint.subtract(lhs, rhs)
+        end,
+        __mul = function(lhs, rhs)
+            return bigint.multiply(lhs, rhs)
+        end,
+        __div = function(lhs, rhs)
+            return bigint.divide(lhs, rhs)
+        end,
+        __mod = function(lhs, rhs)
+            return bigint.modulus(lhs, rhs)
+        end,
+        __pow = function(lhs, rhs)
+            return bigint.exponentiate(lhs, rhs)
+        end,
+        __eq = function(lhs, rhs)
+            return bigint.compare(lhs, rhs, "==")
+        end,
+        __lt = function(lhs, rhs)
+            return bigint.compare(lhs, rhs, "<")
+        end,
+        __le = function(lhs, rhs)
+            return bigint.compare(lhs, rhs, "<=")
+        end
+    })
 
     if (num) then
         local num_string = tostring(num)
@@ -77,7 +76,7 @@ function bigint.new(num)
         end
     end
 
-    return bigint.strip(self)
+    return self
 end
 
 -- Check the type of a big
@@ -85,26 +84,16 @@ end
 -- forced by supplying "true" as the second argument.
 function bigint.check(big, force)
     if (strict or force) then
-        assert(getmetatable(big) == mt, "at least one arg is not a bigint")
         assert(#big.digits > 0, "bigint is empty")
-        assert(big.sign == "+" or big.sign == "-", "bigint is unsigned")
+        assert(type(big.sign) == "string", "bigint is unsigned")
         for _, digit in pairs(big.digits) do
-            assert(type(digit) == "number", "at least one digit is invalid")
+            assert(type(digit) == "number", digit .. " is not a number")
-            assert(digit <= 9 and digit >= 0, digit .. " is not between 0 and 9")
+            assert(digit < 10, digit .. " is greater than or equal to 10")
-            assert(math.floor(digit) == digit, digit .. " is not an integer")
         end
     end
     return true
 end
 
--- Strip leading zeroes from a big, but don't remove the last zero
-function bigint.strip(big)
-	while (#big.digits > 1) and (big.digits[1] == 0) do
-        table.remove(big.digits, 1)
-    end
-	return big
-end
-
 -- Return a new big with the same digits but with a positive sign (absolute
 -- value)
 function bigint.abs(big)
@@ -114,24 +103,6 @@ function bigint.abs(big)
     return result
 end
 
--- Return a new big with the same digits but the opposite sign (negation)
-function bigint.negate(big)
-    bigint.check(big)
-    local result = big:clone()
-    if (result.sign == "+") then
-        result.sign = "-"
-    else
-        result.sign = "+"
-    end
-    return result
-end
-
--- Return the number of digits in the big
-function bigint.digits(big)
-    bigint.check(big)
-    return #big.digits
-end
-
 -- Convert a big to a number or string
 function bigint.unserialize(big, output_type, precision)
     bigint.check(big)
@@ -166,7 +137,7 @@ function bigint.unserialize(big, output_type, precision)
         -- Unserialization to human-readable form or scientific notation only
         -- requires reading the first few digits
         if (precision == nil) then
-            precision = math.min(#big.digits, 3)
+            precision = 3
         else
             assert(precision > 0, "Precision cannot be less than 1")
             assert(math.floor(precision) == precision,
@@ -175,18 +146,17 @@ function bigint.unserialize(big, output_type, precision)
 
         -- num is the first (precision + 1) digits, the first being separated by
         -- a decimal point from the others
-        num = num .. math.floor(big.digits[1])
+        num = num .. big.digits[1]
         if (precision > 1) then
             num = num .. "."
             for i = 1, (precision - 1) do
-                num = num .. math.floor(big.digits[i + 1])
+                num = num .. big.digits[i + 1]
             end
         end
 
         if ((output_type == "human-readable")
         or (output_type == "human")
-        or (output_type == "h"))
+        or (output_type == "h")) then
-        and (#big.digits >= 3 and #big.digits <= 10002) then
             -- Human-readable output contributed by 123eee555
 
             local name
@@ -338,7 +308,12 @@ function bigint.subtract_raw(big1, big2)
     ----------------------------------------------------------------------------
 
 
-    return bigint.strip(result)
+    -- Strip leading zeroes if any, but not if 0 is the only digit
+    while (#result.digits > 1) and (result.digits[1] == 0) do
+        table.remove(result.digits, 1)
+    end
+
+    return result
 end
 
 -- FRONTEND: Addition and subtraction operations, accounting for signs
@@ -368,7 +343,6 @@ function bigint.add(big1, big2)
 
     return result
 end
-
 function bigint.subtract(big1, big2)
     -- Type checking is done by bigint.compare in bigint.add
     -- Subtracting is like adding a negative
@@ -461,6 +435,7 @@ function bigint.multiply(big1, big2)
     return result
 end
 
+
 -- Raise a big to a positive integer or big power (TODO: negative integer power)
 function bigint.exponentiate(big, power)
     -- Type checking for big done by bigint.multiply
@@ -471,23 +446,13 @@ function bigint.exponentiate(big, power)
     if (bigint.compare(exp, bigint.new(0), "==")) then
         return bigint.new(1)
     elseif (bigint.compare(exp, bigint.new(1), "==")) then
-        return big:clone()
+        return big
     else
-        local result = bigint.new(1)
+        local result = big:clone()
-        local base = big:clone()
 
-        while (true) do
+        while (bigint.compare(exp, bigint.new(1), ">")) do
-            if (bigint.compare(
+            result = bigint.multiply(result, big)
-                bigint.modulus(exp, bigint.new(2)), bigint.new(1), "=="
+            exp = bigint.subtract(exp, bigint.new(1))
-            )) then
-                result = bigint.multiply(result, base)
-            end
-            if (bigint.compare(exp, bigint.new(1), "==")) then
-                break
-            else
-                exp = bigint.divide(exp, bigint.new(2))
-                base = bigint.multiply(base, base)
-            end
         end
 
         return result
@@ -503,7 +468,7 @@ function bigint.divide_raw(big1, big2)
     if (bigint.compare(big1, big2, "==")) then
         return bigint.new(1), bigint.new(0)
     elseif (bigint.compare(big1, big2, "<")) then
-        return bigint.new(0), big1:clone()
+        return bigint.new(0), bigint.new(0)
     else
         assert(bigint.compare(big2, bigint.new(0), "!="), "error: divide by zero")
         assert(big1.sign == "+", "error: big1 is not positive")
@@ -511,31 +476,55 @@ function bigint.divide_raw(big1, big2)
 
         local result = bigint.new()
 
-        local dividend = bigint.new() -- Dividend of a single operation
+        local dividend = bigint.new() -- Dividend of a single operation, not the
+                                      -- dividend of the overall function
+        local divisor = big2:clone()
+        local factor = 1
 
-        local neg_zero = bigint.new(0)
+        -- Walk left to right among digits in the dividend, like in long
-        neg_zero.sign = "-"
+        -- division
+        for _, digit in pairs(big1.digits) do
+            dividend.digits[#dividend.digits + 1] = digit
 
-        for i = 1, #big1.digits do
+            -- The dividend is smaller than the divisor, so a zero is appended
-            -- Fixes a negative zero bug
+            -- to the result and the loop ends
-            if (#dividend.digits ~= 0) and (bigint.compare(dividend, neg_zero, "==")) then
+            if (bigint.compare(dividend, divisor, "<")) then
-                dividend = bigint.new()
+                if (#result.digits > 0) then -- Don't add leading zeroes
+                    result.digits[#result.digits + 1] = 0
+                end
+            else
+                -- Find the maximum number of divisors that fit into the
+                -- dividend
+                factor = 0
+                while (bigint.compare(divisor, dividend, "<=")) do
+                    divisor = bigint.add(divisor, big2)
+                    factor = factor + 1
                 end
 
-            table.insert(dividend.digits, big1.digits[i])
+                -- Append the factor to the result
-            
+                if (factor == 10) then
-            local factor = bigint.new(0)
+                    -- Fixes a weird bug that introduces a new bug if fixed by
-            while bigint.compare(dividend, big2, ">=") do
+                    -- changing the comparison in the while loop to "<="
-                dividend = bigint.subtract(dividend, big2)
+                    result.digits[#result.digits] = 1
-                factor = bigint.add(factor, bigint.new(1))
+                    result.digits[#result.digits + 1] = 0
+                else
+                    result.digits[#result.digits + 1] = factor
                 end
 
-            for i = 0, #factor.digits - 1 do
+                -- Subtract the divisor from the dividend to obtain the
-                result.digits[#result.digits + 1 - i] = factor.digits[i + 1]
+                -- remainder, which is the new dividend for the next loop
-            end
+                dividend = bigint.subtract(dividend,
+                                           bigint.subtract(divisor, big2))
+
+                -- Reset the divisor
+                divisor = big2:clone()
             end
 
-        return bigint.strip(result), dividend
+        end
+
+        -- The remainder of the final loop is returned as the function's
+        -- overall remainder
+        return result, dividend
     end
 end
 

libs/discordGameSDK/README.md

@@ -1,13 +0,0 @@
-## Discord Game SDK
-
-> The SDK is currently under extensive development and is subject to change. Suggestions
-> about the current API are welcome.
-
-### Setup
-
-- Create an application on the Discord [developer site](https://discordapp.com/developers/applications/me).
-- Set a redirect URL. If you don't have one right now, just use <http://127.0.0.1>.
-- Enable Rich Presence for the application. This enables whitelist access for the SDK.
-  - When you are ready to test with more people, add them to the whitelist.
-- Copy the **Client ID**.
-  - Use this `CLIENT_ID` when initializing the SDK.

libs/discordGameSDK/c/discord_game_sdk.h

@@ -1,646 +0,0 @@
-#ifndef _DISCORD_GAME_SDK_H_
-#define _DISCORD_GAME_SDK_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <string.h>
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
-
-#define DISCORD_VERSION 2
-#define DISCORD_APPLICATION_MANAGER_VERSION 1
-#define DISCORD_USER_MANAGER_VERSION 1
-#define DISCORD_IMAGE_MANAGER_VERSION 1
-#define DISCORD_ACTIVITY_MANAGER_VERSION 1
-#define DISCORD_RELATIONSHIP_MANAGER_VERSION 1
-#define DISCORD_LOBBY_MANAGER_VERSION 1
-#define DISCORD_NETWORK_MANAGER_VERSION 1
-#define DISCORD_OVERLAY_MANAGER_VERSION 1
-#define DISCORD_STORAGE_MANAGER_VERSION 1
-#define DISCORD_STORE_MANAGER_VERSION 1
-#define DISCORD_VOICE_MANAGER_VERSION 1
-#define DISCORD_ACHIEVEMENT_MANAGER_VERSION 1
-
-enum EDiscordResult {
-    DiscordResult_Ok = 0,
-    DiscordResult_ServiceUnavailable = 1,
-    DiscordResult_InvalidVersion = 2,
-    DiscordResult_LockFailed = 3,
-    DiscordResult_InternalError = 4,
-    DiscordResult_InvalidPayload = 5,
-    DiscordResult_InvalidCommand = 6,
-    DiscordResult_InvalidPermissions = 7,
-    DiscordResult_NotFetched = 8,
-    DiscordResult_NotFound = 9,
-    DiscordResult_Conflict = 10,
-    DiscordResult_InvalidSecret = 11,
-    DiscordResult_InvalidJoinSecret = 12,
-    DiscordResult_NoEligibleActivity = 13,
-    DiscordResult_InvalidInvite = 14,
-    DiscordResult_NotAuthenticated = 15,
-    DiscordResult_InvalidAccessToken = 16,
-    DiscordResult_ApplicationMismatch = 17,
-    DiscordResult_InvalidDataUrl = 18,
-    DiscordResult_InvalidBase64 = 19,
-    DiscordResult_NotFiltered = 20,
-    DiscordResult_LobbyFull = 21,
-    DiscordResult_InvalidLobbySecret = 22,
-    DiscordResult_InvalidFilename = 23,
-    DiscordResult_InvalidFileSize = 24,
-    DiscordResult_InvalidEntitlement = 25,
-    DiscordResult_NotInstalled = 26,
-    DiscordResult_NotRunning = 27,
-    DiscordResult_InsufficientBuffer = 28,
-    DiscordResult_PurchaseCanceled = 29,
-    DiscordResult_InvalidGuild = 30,
-    DiscordResult_InvalidEvent = 31,
-    DiscordResult_InvalidChannel = 32,
-    DiscordResult_InvalidOrigin = 33,
-    DiscordResult_RateLimited = 34,
-    DiscordResult_OAuth2Error = 35,
-    DiscordResult_SelectChannelTimeout = 36,
-    DiscordResult_GetGuildTimeout = 37,
-    DiscordResult_SelectVoiceForceRequired = 38,
-    DiscordResult_CaptureShortcutAlreadyListening = 39,
-    DiscordResult_UnauthorizedForAchievement = 40,
-    DiscordResult_InvalidGiftCode = 41,
-    DiscordResult_PurchaseError = 42,
-    DiscordResult_TransactionAborted = 43,
-};
-
-enum EDiscordCreateFlags {
-    DiscordCreateFlags_Default = 0,
-    DiscordCreateFlags_NoRequireDiscord = 1,
-};
-
-enum EDiscordLogLevel {
-    DiscordLogLevel_Error = 1,
-    DiscordLogLevel_Warn,
-    DiscordLogLevel_Info,
-    DiscordLogLevel_Debug,
-};
-
-enum EDiscordUserFlag {
-    DiscordUserFlag_Partner = 2,
-    DiscordUserFlag_HypeSquadEvents = 4,
-    DiscordUserFlag_HypeSquadHouse1 = 64,
-    DiscordUserFlag_HypeSquadHouse2 = 128,
-    DiscordUserFlag_HypeSquadHouse3 = 256,
-};
-
-enum EDiscordPremiumType {
-    DiscordPremiumType_None = 0,
-    DiscordPremiumType_Tier1 = 1,
-    DiscordPremiumType_Tier2 = 2,
-};
-
-enum EDiscordImageType {
-    DiscordImageType_User,
-};
-
-enum EDiscordActivityType {
-    DiscordActivityType_Playing,
-    DiscordActivityType_Streaming,
-    DiscordActivityType_Listening,
-    DiscordActivityType_Watching,
-};
-
-enum EDiscordActivityActionType {
-    DiscordActivityActionType_Join = 1,
-    DiscordActivityActionType_Spectate,
-};
-
-enum EDiscordActivityJoinRequestReply {
-    DiscordActivityJoinRequestReply_No,
-    DiscordActivityJoinRequestReply_Yes,
-    DiscordActivityJoinRequestReply_Ignore,
-};
-
-enum EDiscordStatus {
-    DiscordStatus_Offline = 0,
-    DiscordStatus_Online = 1,
-    DiscordStatus_Idle = 2,
-    DiscordStatus_DoNotDisturb = 3,
-};
-
-enum EDiscordRelationshipType {
-    DiscordRelationshipType_None,
-    DiscordRelationshipType_Friend,
-    DiscordRelationshipType_Blocked,
-    DiscordRelationshipType_PendingIncoming,
-    DiscordRelationshipType_PendingOutgoing,
-    DiscordRelationshipType_Implicit,
-};
-
-enum EDiscordLobbyType {
-    DiscordLobbyType_Private = 1,
-    DiscordLobbyType_Public,
-};
-
-enum EDiscordLobbySearchComparison {
-    DiscordLobbySearchComparison_LessThanOrEqual = -2,
-    DiscordLobbySearchComparison_LessThan,
-    DiscordLobbySearchComparison_Equal,
-    DiscordLobbySearchComparison_GreaterThan,
-    DiscordLobbySearchComparison_GreaterThanOrEqual,
-    DiscordLobbySearchComparison_NotEqual,
-};
-
-enum EDiscordLobbySearchCast {
-    DiscordLobbySearchCast_String = 1,
-    DiscordLobbySearchCast_Number,
-};
-
-enum EDiscordLobbySearchDistance {
-    DiscordLobbySearchDistance_Local,
-    DiscordLobbySearchDistance_Default,
-    DiscordLobbySearchDistance_Extended,
-    DiscordLobbySearchDistance_Global,
-};
-
-enum EDiscordEntitlementType {
-    DiscordEntitlementType_Purchase = 1,
-    DiscordEntitlementType_PremiumSubscription,
-    DiscordEntitlementType_DeveloperGift,
-    DiscordEntitlementType_TestModePurchase,
-    DiscordEntitlementType_FreePurchase,
-    DiscordEntitlementType_UserGift,
-    DiscordEntitlementType_PremiumPurchase,
-};
-
-enum EDiscordSkuType {
-    DiscordSkuType_Application = 1,
-    DiscordSkuType_DLC,
-    DiscordSkuType_Consumable,
-    DiscordSkuType_Bundle,
-};
-
-enum EDiscordInputModeType {
-    DiscordInputModeType_VoiceActivity = 0,
-    DiscordInputModeType_PushToTalk,
-};
-
-typedef int64_t DiscordClientId;
-typedef int32_t DiscordVersion;
-typedef int64_t DiscordSnowflake;
-typedef int64_t DiscordTimestamp;
-typedef DiscordSnowflake DiscordUserId;
-typedef char DiscordLocale[128];
-typedef char DiscordBranch[4096];
-typedef DiscordSnowflake DiscordLobbyId;
-typedef char DiscordLobbySecret[128];
-typedef char DiscordMetadataKey[256];
-typedef char DiscordMetadataValue[4096];
-typedef uint64_t DiscordNetworkPeerId;
-typedef uint8_t DiscordNetworkChannelId;
-typedef char DiscordPath[4096];
-typedef char DiscordDateTime[64];
-
-struct DiscordUser {
-    DiscordUserId id;
-    char username[256];
-    char discriminator[8];
-    char avatar[128];
-    bool bot;
-};
-
-struct DiscordOAuth2Token {
-    char access_token[128];
-    char scopes[1024];
-    DiscordTimestamp expires;
-};
-
-struct DiscordImageHandle {
-    enum EDiscordImageType type;
-    int64_t id;
-    uint32_t size;
-};
-
-struct DiscordImageDimensions {
-    uint32_t width;
-    uint32_t height;
-};
-
-struct DiscordActivityTimestamps {
-    DiscordTimestamp start;
-    DiscordTimestamp end;
-};
-
-struct DiscordActivityAssets {
-    char large_image[128];
-    char large_text[128];
-    char small_image[128];
-    char small_text[128];
-};
-
-struct DiscordPartySize {
-    int32_t current_size;
-    int32_t max_size;
-};
-
-struct DiscordActivityParty {
-    char id[128];
-    struct DiscordPartySize size;
-};
-
-struct DiscordActivitySecrets {
-    char match[128];
-    char join[128];
-    char spectate[128];
-};
-
-struct DiscordActivity {
-    enum EDiscordActivityType type;
-    int64_t application_id;
-    char name[128];
-    char state[128];
-    char details[128];
-    struct DiscordActivityTimestamps timestamps;
-    struct DiscordActivityAssets assets;
-    struct DiscordActivityParty party;
-    struct DiscordActivitySecrets secrets;
-    bool instance;
-};
-
-struct DiscordPresence {
-    enum EDiscordStatus status;
-    struct DiscordActivity activity;
-};
-
-struct DiscordRelationship {
-    enum EDiscordRelationshipType type;
-    struct DiscordUser user;
-    struct DiscordPresence presence;
-};
-
-struct DiscordLobby {
-    DiscordLobbyId id;
-    enum EDiscordLobbyType type;
-    DiscordUserId owner_id;
-    DiscordLobbySecret secret;
-    uint32_t capacity;
-    bool locked;
-};
-
-struct DiscordFileStat {
-    char filename[260];
-    uint64_t size;
-    uint64_t last_modified;
-};
-
-struct DiscordEntitlement {
-    DiscordSnowflake id;
-    enum EDiscordEntitlementType type;
-    DiscordSnowflake sku_id;
-};
-
-struct DiscordSkuPrice {
-    uint32_t amount;
-    char currency[16];
-};
-
-struct DiscordSku {
-    DiscordSnowflake id;
-    enum EDiscordSkuType type;
-    char name[256];
-    struct DiscordSkuPrice price;
-};
-
-struct DiscordInputMode {
-    enum EDiscordInputModeType type;
-    char shortcut[256];
-};
-
-struct DiscordUserAchievement {
-    DiscordSnowflake user_id;
-    DiscordSnowflake achievement_id;
-    uint8_t percent_complete;
-    DiscordDateTime unlocked_at;
-};
-
-struct IDiscordLobbyTransaction {
-    enum EDiscordResult (*set_type)(struct IDiscordLobbyTransaction* lobby_transaction, enum EDiscordLobbyType type);
-    enum EDiscordResult (*set_owner)(struct IDiscordLobbyTransaction* lobby_transaction, DiscordUserId owner_id);
-    enum EDiscordResult (*set_capacity)(struct IDiscordLobbyTransaction* lobby_transaction, uint32_t capacity);
-    enum EDiscordResult (*set_metadata)(struct IDiscordLobbyTransaction* lobby_transaction, DiscordMetadataKey key, DiscordMetadataValue value);
-    enum EDiscordResult (*delete_metadata)(struct IDiscordLobbyTransaction* lobby_transaction, DiscordMetadataKey key);
-    enum EDiscordResult (*set_locked)(struct IDiscordLobbyTransaction* lobby_transaction, bool locked);
-};
-
-struct IDiscordLobbyMemberTransaction {
-    enum EDiscordResult (*set_metadata)(struct IDiscordLobbyMemberTransaction* lobby_member_transaction, DiscordMetadataKey key, DiscordMetadataValue value);
-    enum EDiscordResult (*delete_metadata)(struct IDiscordLobbyMemberTransaction* lobby_member_transaction, DiscordMetadataKey key);
-};
-
-struct IDiscordLobbySearchQuery {
-    enum EDiscordResult (*filter)(struct IDiscordLobbySearchQuery* lobby_search_query, DiscordMetadataKey key, enum EDiscordLobbySearchComparison comparison, enum EDiscordLobbySearchCast cast, DiscordMetadataValue value);
-    enum EDiscordResult (*sort)(struct IDiscordLobbySearchQuery* lobby_search_query, DiscordMetadataKey key, enum EDiscordLobbySearchCast cast, DiscordMetadataValue value);
-    enum EDiscordResult (*limit)(struct IDiscordLobbySearchQuery* lobby_search_query, uint32_t limit);
-    enum EDiscordResult (*distance)(struct IDiscordLobbySearchQuery* lobby_search_query, enum EDiscordLobbySearchDistance distance);
-};
-
-typedef void* IDiscordApplicationEvents;
-
-struct IDiscordApplicationManager {
-    void (*validate_or_exit)(struct IDiscordApplicationManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*get_current_locale)(struct IDiscordApplicationManager* manager, DiscordLocale* locale);
-    void (*get_current_branch)(struct IDiscordApplicationManager* manager, DiscordBranch* branch);
-    void (*get_oauth2_token)(struct IDiscordApplicationManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordOAuth2Token* oauth2_token));
-    void (*get_ticket)(struct IDiscordApplicationManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, const char* data));
-};
-
-struct IDiscordUserEvents {
-    void (*on_current_user_update)(void* event_data);
-};
-
-struct IDiscordUserManager {
-    enum EDiscordResult (*get_current_user)(struct IDiscordUserManager* manager, struct DiscordUser* current_user);
-    void (*get_user)(struct IDiscordUserManager* manager, DiscordUserId user_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordUser* user));
-    enum EDiscordResult (*get_current_user_premium_type)(struct IDiscordUserManager* manager, enum EDiscordPremiumType* premium_type);
-    enum EDiscordResult (*current_user_has_flag)(struct IDiscordUserManager* manager, enum EDiscordUserFlag flag, bool* has_flag);
-};
-
-typedef void* IDiscordImageEvents;
-
-struct IDiscordImageManager {
-    void (*fetch)(struct IDiscordImageManager* manager, struct DiscordImageHandle handle, bool refresh, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordImageHandle handle_result));
-    enum EDiscordResult (*get_dimensions)(struct IDiscordImageManager* manager, struct DiscordImageHandle handle, struct DiscordImageDimensions* dimensions);
-    enum EDiscordResult (*get_data)(struct IDiscordImageManager* manager, struct DiscordImageHandle handle, uint8_t* data, uint32_t data_length);
-};
-
-struct IDiscordActivityEvents {
-    void (*on_activity_join)(void* event_data, const char* secret);
-    void (*on_activity_spectate)(void* event_data, const char* secret);
-    void (*on_activity_join_request)(void* event_data, struct DiscordUser* user);
-    void (*on_activity_invite)(void* event_data, enum EDiscordActivityActionType type, struct DiscordUser* user, struct DiscordActivity* activity);
-};
-
-struct IDiscordActivityManager {
-    enum EDiscordResult (*register_command)(struct IDiscordActivityManager* manager, const char* command);
-    enum EDiscordResult (*register_steam)(struct IDiscordActivityManager* manager, uint32_t steam_id);
-    void (*update_activity)(struct IDiscordActivityManager* manager, struct DiscordActivity* activity, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*clear_activity)(struct IDiscordActivityManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_request_reply)(struct IDiscordActivityManager* manager, DiscordUserId user_id, enum EDiscordActivityJoinRequestReply reply, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_invite)(struct IDiscordActivityManager* manager, DiscordUserId user_id, enum EDiscordActivityActionType type, const char* content, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*accept_invite)(struct IDiscordActivityManager* manager, DiscordUserId user_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-struct IDiscordRelationshipEvents {
-    void (*on_refresh)(void* event_data);
-    void (*on_relationship_update)(void* event_data, struct DiscordRelationship* relationship);
-};
-
-struct IDiscordRelationshipManager {
-    void (*filter)(struct IDiscordRelationshipManager* manager, void* filter_data, bool (*filter)(void* filter_data, struct DiscordRelationship* relationship));
-    enum EDiscordResult (*count)(struct IDiscordRelationshipManager* manager, int32_t* count);
-    enum EDiscordResult (*get)(struct IDiscordRelationshipManager* manager, DiscordUserId user_id, struct DiscordRelationship* relationship);
-    enum EDiscordResult (*get_at)(struct IDiscordRelationshipManager* manager, uint32_t index, struct DiscordRelationship* relationship);
-};
-
-struct IDiscordLobbyEvents {
-    void (*on_lobby_update)(void* event_data, int64_t lobby_id);
-    void (*on_lobby_delete)(void* event_data, int64_t lobby_id, uint32_t reason);
-    void (*on_member_connect)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_member_update)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_member_disconnect)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_lobby_message)(void* event_data, int64_t lobby_id, int64_t user_id, uint8_t* data, uint32_t data_length);
-    void (*on_speaking)(void* event_data, int64_t lobby_id, int64_t user_id, bool speaking);
-    void (*on_network_message)(void* event_data, int64_t lobby_id, int64_t user_id, uint8_t channel_id, uint8_t* data, uint32_t data_length);
-};
-
-struct IDiscordLobbyManager {
-    enum EDiscordResult (*get_lobby_create_transaction)(struct IDiscordLobbyManager* manager, struct IDiscordLobbyTransaction** transaction);
-    enum EDiscordResult (*get_lobby_update_transaction)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, struct IDiscordLobbyTransaction** transaction);
-    enum EDiscordResult (*get_member_update_transaction)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, struct IDiscordLobbyMemberTransaction** transaction);
-    void (*create_lobby)(struct IDiscordLobbyManager* manager, struct IDiscordLobbyTransaction* transaction, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordLobby* lobby));
-    void (*update_lobby)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, struct IDiscordLobbyTransaction* transaction, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*delete_lobby)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*connect_lobby)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordLobbySecret secret, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordLobby* lobby));
-    void (*connect_lobby_with_activity_secret)(struct IDiscordLobbyManager* manager, DiscordLobbySecret activity_secret, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, struct DiscordLobby* lobby));
-    void (*disconnect_lobby)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*get_lobby)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, struct DiscordLobby* lobby);
-    enum EDiscordResult (*get_lobby_activity_secret)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordLobbySecret* secret);
-    enum EDiscordResult (*get_lobby_metadata_value)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordMetadataKey key, DiscordMetadataValue* value);
-    enum EDiscordResult (*get_lobby_metadata_key)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, int32_t index, DiscordMetadataKey* key);
-    enum EDiscordResult (*lobby_metadata_count)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, int32_t* count);
-    enum EDiscordResult (*member_count)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, int32_t* count);
-    enum EDiscordResult (*get_member_user_id)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, int32_t index, DiscordUserId* user_id);
-    enum EDiscordResult (*get_member_user)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, struct DiscordUser* user);
-    enum EDiscordResult (*get_member_metadata_value)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, DiscordMetadataKey key, DiscordMetadataValue* value);
-    enum EDiscordResult (*get_member_metadata_key)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, int32_t index, DiscordMetadataKey* key);
-    enum EDiscordResult (*member_metadata_count)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, int32_t* count);
-    void (*update_member)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, struct IDiscordLobbyMemberTransaction* transaction, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_lobby_message)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, uint8_t* data, uint32_t data_length, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*get_search_query)(struct IDiscordLobbyManager* manager, struct IDiscordLobbySearchQuery** query);
-    void (*search)(struct IDiscordLobbyManager* manager, struct IDiscordLobbySearchQuery* query, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*lobby_count)(struct IDiscordLobbyManager* manager, int32_t* count);
-    enum EDiscordResult (*get_lobby_id)(struct IDiscordLobbyManager* manager, int32_t index, DiscordLobbyId* lobby_id);
-    void (*connect_voice)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*disconnect_voice)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*connect_network)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id);
-    enum EDiscordResult (*disconnect_network)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id);
-    enum EDiscordResult (*flush_network)(struct IDiscordLobbyManager* manager);
-    enum EDiscordResult (*open_network_channel)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, uint8_t channel_id, bool reliable);
-    enum EDiscordResult (*send_network_message)(struct IDiscordLobbyManager* manager, DiscordLobbyId lobby_id, DiscordUserId user_id, uint8_t channel_id, uint8_t* data, uint32_t data_length);
-};
-
-struct IDiscordNetworkEvents {
-    void (*on_message)(void* event_data, DiscordNetworkPeerId peer_id, DiscordNetworkChannelId channel_id, uint8_t* data, uint32_t data_length);
-    void (*on_route_update)(void* event_data, const char* route_data);
-};
-
-struct IDiscordNetworkManager {
-    /**
-     * Get the local peer ID for this process.
-     */
-    void (*get_peer_id)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId* peer_id);
-    /**
-     * Send pending network messages.
-     */
-    enum EDiscordResult (*flush)(struct IDiscordNetworkManager* manager);
-    /**
-     * Open a connection to a remote peer.
-     */
-    enum EDiscordResult (*open_peer)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id, const char* route_data);
-    /**
-     * Update the route data for a connected peer.
-     */
-    enum EDiscordResult (*update_peer)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id, const char* route_data);
-    /**
-     * Close the connection to a remote peer.
-     */
-    enum EDiscordResult (*close_peer)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id);
-    /**
-     * Open a message channel to a connected peer.
-     */
-    enum EDiscordResult (*open_channel)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id, DiscordNetworkChannelId channel_id, bool reliable);
-    /**
-     * Close a message channel to a connected peer.
-     */
-    enum EDiscordResult (*close_channel)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id, DiscordNetworkChannelId channel_id);
-    /**
-     * Send a message to a connected peer over an opened message channel.
-     */
-    enum EDiscordResult (*send_message)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId peer_id, DiscordNetworkChannelId channel_id, uint8_t* data, uint32_t data_length);
-};
-
-struct IDiscordOverlayEvents {
-    void (*on_toggle)(void* event_data, bool locked);
-};
-
-struct IDiscordOverlayManager {
-    void (*is_enabled)(struct IDiscordOverlayManager* manager, bool* enabled);
-    void (*is_locked)(struct IDiscordOverlayManager* manager, bool* locked);
-    void (*set_locked)(struct IDiscordOverlayManager* manager, bool locked, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_activity_invite)(struct IDiscordOverlayManager* manager, enum EDiscordActivityActionType type, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_guild_invite)(struct IDiscordOverlayManager* manager, const char* code, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_voice_settings)(struct IDiscordOverlayManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-typedef void* IDiscordStorageEvents;
-
-struct IDiscordStorageManager {
-    enum EDiscordResult (*read)(struct IDiscordStorageManager* manager, const char* name, uint8_t* data, uint32_t data_length, uint32_t* read);
-    void (*read_async)(struct IDiscordStorageManager* manager, const char* name, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, uint8_t* data, uint32_t data_length));
-    void (*read_async_partial)(struct IDiscordStorageManager* manager, const char* name, uint64_t offset, uint64_t length, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result, uint8_t* data, uint32_t data_length));
-    enum EDiscordResult (*write)(struct IDiscordStorageManager* manager, const char* name, uint8_t* data, uint32_t data_length);
-    void (*write_async)(struct IDiscordStorageManager* manager, const char* name, uint8_t* data, uint32_t data_length, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*delete_)(struct IDiscordStorageManager* manager, const char* name);
-    enum EDiscordResult (*exists)(struct IDiscordStorageManager* manager, const char* name, bool* exists);
-    void (*count)(struct IDiscordStorageManager* manager, int32_t* count);
-    enum EDiscordResult (*stat)(struct IDiscordStorageManager* manager, const char* name, struct DiscordFileStat* stat);
-    enum EDiscordResult (*stat_at)(struct IDiscordStorageManager* manager, int32_t index, struct DiscordFileStat* stat);
-    enum EDiscordResult (*get_path)(struct IDiscordStorageManager* manager, DiscordPath* path);
-};
-
-struct IDiscordStoreEvents {
-    void (*on_entitlement_create)(void* event_data, struct DiscordEntitlement* entitlement);
-    void (*on_entitlement_delete)(void* event_data, struct DiscordEntitlement* entitlement);
-};
-
-struct IDiscordStoreManager {
-    void (*fetch_skus)(struct IDiscordStoreManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*count_skus)(struct IDiscordStoreManager* manager, int32_t* count);
-    enum EDiscordResult (*get_sku)(struct IDiscordStoreManager* manager, DiscordSnowflake sku_id, struct DiscordSku* sku);
-    enum EDiscordResult (*get_sku_at)(struct IDiscordStoreManager* manager, int32_t index, struct DiscordSku* sku);
-    void (*fetch_entitlements)(struct IDiscordStoreManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*count_entitlements)(struct IDiscordStoreManager* manager, int32_t* count);
-    enum EDiscordResult (*get_entitlement)(struct IDiscordStoreManager* manager, DiscordSnowflake entitlement_id, struct DiscordEntitlement* entitlement);
-    enum EDiscordResult (*get_entitlement_at)(struct IDiscordStoreManager* manager, int32_t index, struct DiscordEntitlement* entitlement);
-    enum EDiscordResult (*has_sku_entitlement)(struct IDiscordStoreManager* manager, DiscordSnowflake sku_id, bool* has_entitlement);
-    void (*start_purchase)(struct IDiscordStoreManager* manager, DiscordSnowflake sku_id, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-struct IDiscordVoiceEvents {
-    void (*on_settings_update)(void* event_data);
-};
-
-struct IDiscordVoiceManager {
-    enum EDiscordResult (*get_input_mode)(struct IDiscordVoiceManager* manager, struct DiscordInputMode* input_mode);
-    void (*set_input_mode)(struct IDiscordVoiceManager* manager, struct DiscordInputMode input_mode, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*is_self_mute)(struct IDiscordVoiceManager* manager, bool* mute);
-    enum EDiscordResult (*set_self_mute)(struct IDiscordVoiceManager* manager, bool mute);
-    enum EDiscordResult (*is_self_deaf)(struct IDiscordVoiceManager* manager, bool* deaf);
-    enum EDiscordResult (*set_self_deaf)(struct IDiscordVoiceManager* manager, bool deaf);
-    enum EDiscordResult (*is_local_mute)(struct IDiscordVoiceManager* manager, DiscordSnowflake user_id, bool* mute);
-    enum EDiscordResult (*set_local_mute)(struct IDiscordVoiceManager* manager, DiscordSnowflake user_id, bool mute);
-    enum EDiscordResult (*get_local_volume)(struct IDiscordVoiceManager* manager, DiscordSnowflake user_id, uint8_t* volume);
-    enum EDiscordResult (*set_local_volume)(struct IDiscordVoiceManager* manager, DiscordSnowflake user_id, uint8_t volume);
-};
-
-struct IDiscordAchievementEvents {
-    void (*on_user_achievement_update)(void* event_data, struct DiscordUserAchievement* user_achievement);
-};
-
-struct IDiscordAchievementManager {
-    void (*set_user_achievement)(struct IDiscordAchievementManager* manager, DiscordSnowflake achievement_id, uint8_t percent_complete, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*fetch_user_achievements)(struct IDiscordAchievementManager* manager, void* callback_data, void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*count_user_achievements)(struct IDiscordAchievementManager* manager, int32_t* count);
-    enum EDiscordResult (*get_user_achievement)(struct IDiscordAchievementManager* manager, DiscordSnowflake user_achievement_id, struct DiscordUserAchievement* user_achievement);
-    enum EDiscordResult (*get_user_achievement_at)(struct IDiscordAchievementManager* manager, int32_t index, struct DiscordUserAchievement* user_achievement);
-};
-
-typedef void* IDiscordCoreEvents;
-
-struct IDiscordCore {
-    void (*destroy)(struct IDiscordCore* core);
-    enum EDiscordResult (*run_callbacks)(struct IDiscordCore* core);
-    void (*set_log_hook)(struct IDiscordCore* core, enum EDiscordLogLevel min_level, void* hook_data, void (*hook)(void* hook_data, enum EDiscordLogLevel level, const char* message));
-    struct IDiscordApplicationManager* (*get_application_manager)(struct IDiscordCore* core);
-    struct IDiscordUserManager* (*get_user_manager)(struct IDiscordCore* core);
-    struct IDiscordImageManager* (*get_image_manager)(struct IDiscordCore* core);
-    struct IDiscordActivityManager* (*get_activity_manager)(struct IDiscordCore* core);
-    struct IDiscordRelationshipManager* (*get_relationship_manager)(struct IDiscordCore* core);
-    struct IDiscordLobbyManager* (*get_lobby_manager)(struct IDiscordCore* core);
-    struct IDiscordNetworkManager* (*get_network_manager)(struct IDiscordCore* core);
-    struct IDiscordOverlayManager* (*get_overlay_manager)(struct IDiscordCore* core);
-    struct IDiscordStorageManager* (*get_storage_manager)(struct IDiscordCore* core);
-    struct IDiscordStoreManager* (*get_store_manager)(struct IDiscordCore* core);
-    struct IDiscordVoiceManager* (*get_voice_manager)(struct IDiscordCore* core);
-    struct IDiscordAchievementManager* (*get_achievement_manager)(struct IDiscordCore* core);
-};
-
-struct DiscordCreateParams {
-    DiscordClientId client_id;
-    uint64_t flags;
-    IDiscordCoreEvents* events;
-    void* event_data;
-    IDiscordApplicationEvents* application_events;
-    DiscordVersion application_version;
-    struct IDiscordUserEvents* user_events;
-    DiscordVersion user_version;
-    IDiscordImageEvents* image_events;
-    DiscordVersion image_version;
-    struct IDiscordActivityEvents* activity_events;
-    DiscordVersion activity_version;
-    struct IDiscordRelationshipEvents* relationship_events;
-    DiscordVersion relationship_version;
-    struct IDiscordLobbyEvents* lobby_events;
-    DiscordVersion lobby_version;
-    struct IDiscordNetworkEvents* network_events;
-    DiscordVersion network_version;
-    struct IDiscordOverlayEvents* overlay_events;
-    DiscordVersion overlay_version;
-    IDiscordStorageEvents* storage_events;
-    DiscordVersion storage_version;
-    struct IDiscordStoreEvents* store_events;
-    DiscordVersion store_version;
-    struct IDiscordVoiceEvents* voice_events;
-    DiscordVersion voice_version;
-    struct IDiscordAchievementEvents* achievement_events;
-    DiscordVersion achievement_version;
-};
-
-#ifdef __cplusplus
-inline
-#else
-static
-#endif
-void DiscordCreateParamsSetDefault(struct DiscordCreateParams* params)
-{
-    memset(params, 0, sizeof(struct DiscordCreateParams));
-    params->application_version = DISCORD_APPLICATION_MANAGER_VERSION;
-    params->user_version = DISCORD_USER_MANAGER_VERSION;
-    params->image_version = DISCORD_IMAGE_MANAGER_VERSION;
-    params->activity_version = DISCORD_ACTIVITY_MANAGER_VERSION;
-    params->relationship_version = DISCORD_RELATIONSHIP_MANAGER_VERSION;
-    params->lobby_version = DISCORD_LOBBY_MANAGER_VERSION;
-    params->network_version = DISCORD_NETWORK_MANAGER_VERSION;
-    params->overlay_version = DISCORD_OVERLAY_MANAGER_VERSION;
-    params->storage_version = DISCORD_STORAGE_MANAGER_VERSION;
-    params->store_version = DISCORD_STORE_MANAGER_VERSION;
-    params->voice_version = DISCORD_VOICE_MANAGER_VERSION;
-    params->achievement_version = DISCORD_ACHIEVEMENT_MANAGER_VERSION;
-}
-
-enum EDiscordResult DiscordCreate(DiscordVersion version, struct DiscordCreateParams* params, struct IDiscordCore** result);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

libs/discordGameSDK/cpp/achievement_manager.cpp

@@ -1,98 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "achievement_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class AchievementEvents final {
-public:
-    static void OnUserAchievementUpdate(void* callbackData, DiscordUserAchievement* userAchievement)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->AchievementManager();
-        module.OnUserAchievementUpdate(*reinterpret_cast<UserAchievement const*>(userAchievement));
-    }
-};
-
-IDiscordAchievementEvents AchievementManager::events_{
-  &AchievementEvents::OnUserAchievementUpdate,
-};
-
-void AchievementManager::SetUserAchievement(Snowflake achievementId,
-                                            std::uint8_t percentComplete,
-                                            std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->set_user_achievement(
-      internal_, achievementId, percentComplete, cb.release(), wrapper);
-}
-
-void AchievementManager::FetchUserAchievements(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->fetch_user_achievements(internal_, cb.release(), wrapper);
-}
-
-void AchievementManager::CountUserAchievements(std::int32_t* count)
-{
-    if (!count) {
-        return;
-    }
-
-    internal_->count_user_achievements(internal_, reinterpret_cast<int32_t*>(count));
-}
-
-Result AchievementManager::GetUserAchievement(Snowflake userAchievementId,
-                                              UserAchievement* userAchievement)
-{
-    if (!userAchievement) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_user_achievement(
-      internal_, userAchievementId, reinterpret_cast<DiscordUserAchievement*>(userAchievement));
-    return static_cast<Result>(result);
-}
-
-Result AchievementManager::GetUserAchievementAt(std::int32_t index,
-                                                UserAchievement* userAchievement)
-{
-    if (!userAchievement) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_user_achievement_at(
-      internal_, index, reinterpret_cast<DiscordUserAchievement*>(userAchievement));
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/achievement_manager.h

@@ -1,34 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class AchievementManager final {
-public:
-    ~AchievementManager() = default;
-
-    void SetUserAchievement(Snowflake achievementId,
-                            std::uint8_t percentComplete,
-                            std::function<void(Result)> callback);
-    void FetchUserAchievements(std::function<void(Result)> callback);
-    void CountUserAchievements(std::int32_t* count);
-    Result GetUserAchievement(Snowflake userAchievementId, UserAchievement* userAchievement);
-    Result GetUserAchievementAt(std::int32_t index, UserAchievement* userAchievement);
-
-    Event<UserAchievement const&> OnUserAchievementUpdate;
-
-private:
-    friend class Core;
-
-    AchievementManager() = default;
-    AchievementManager(AchievementManager const& rhs) = delete;
-    AchievementManager& operator=(AchievementManager const& rhs) = delete;
-    AchievementManager(AchievementManager&& rhs) = delete;
-    AchievementManager& operator=(AchievementManager&& rhs) = delete;
-
-    IDiscordAchievementManager* internal_;
-    static IDiscordAchievementEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/activity_manager.cpp

@@ -1,177 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "activity_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class ActivityEvents final {
-public:
-    static void OnActivityJoin(void* callbackData, char const* secret)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->ActivityManager();
-        module.OnActivityJoin(static_cast<const char*>(secret));
-    }
-
-    static void OnActivitySpectate(void* callbackData, char const* secret)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->ActivityManager();
-        module.OnActivitySpectate(static_cast<const char*>(secret));
-    }
-
-    static void OnActivityJoinRequest(void* callbackData, DiscordUser* user)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->ActivityManager();
-        module.OnActivityJoinRequest(*reinterpret_cast<User const*>(user));
-    }
-
-    static void OnActivityInvite(void* callbackData,
-                                 EDiscordActivityActionType type,
-                                 DiscordUser* user,
-                                 DiscordActivity* activity)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->ActivityManager();
-        module.OnActivityInvite(static_cast<ActivityActionType>(type),
-                                *reinterpret_cast<User const*>(user),
-                                *reinterpret_cast<Activity const*>(activity));
-    }
-};
-
-IDiscordActivityEvents ActivityManager::events_{
-  &ActivityEvents::OnActivityJoin,
-  &ActivityEvents::OnActivitySpectate,
-  &ActivityEvents::OnActivityJoinRequest,
-  &ActivityEvents::OnActivityInvite,
-};
-
-Result ActivityManager::RegisterCommand(char const* command)
-{
-    auto result = internal_->register_command(internal_, const_cast<char*>(command));
-    return static_cast<Result>(result);
-}
-
-Result ActivityManager::RegisterSteam(std::uint32_t steamId)
-{
-    auto result = internal_->register_steam(internal_, steamId);
-    return static_cast<Result>(result);
-}
-
-void ActivityManager::UpdateActivity(Activity const& activity, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->update_activity(internal_,
-                               reinterpret_cast<DiscordActivity*>(const_cast<Activity*>(&activity)),
-                               cb.release(),
-                               wrapper);
-}
-
-void ActivityManager::ClearActivity(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->clear_activity(internal_, cb.release(), wrapper);
-}
-
-void ActivityManager::SendRequestReply(UserId userId,
-                                       ActivityJoinRequestReply reply,
-                                       std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->send_request_reply(internal_,
-                                  userId,
-                                  static_cast<EDiscordActivityJoinRequestReply>(reply),
-                                  cb.release(),
-                                  wrapper);
-}
-
-void ActivityManager::SendInvite(UserId userId,
-                                 ActivityActionType type,
-                                 char const* content,
-                                 std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->send_invite(internal_,
-                           userId,
-                           static_cast<EDiscordActivityActionType>(type),
-                           const_cast<char*>(content),
-                           cb.release(),
-                           wrapper);
-}
-
-void ActivityManager::AcceptInvite(UserId userId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->accept_invite(internal_, userId, cb.release(), wrapper);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/activity_manager.h

@@ -1,42 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class ActivityManager final {
-public:
-    ~ActivityManager() = default;
-
-    Result RegisterCommand(char const* command);
-    Result RegisterSteam(std::uint32_t steamId);
-    void UpdateActivity(Activity const& activity, std::function<void(Result)> callback);
-    void ClearActivity(std::function<void(Result)> callback);
-    void SendRequestReply(UserId userId,
-                          ActivityJoinRequestReply reply,
-                          std::function<void(Result)> callback);
-    void SendInvite(UserId userId,
-                    ActivityActionType type,
-                    char const* content,
-                    std::function<void(Result)> callback);
-    void AcceptInvite(UserId userId, std::function<void(Result)> callback);
-
-    Event<char const*> OnActivityJoin;
-    Event<char const*> OnActivitySpectate;
-    Event<User const&> OnActivityJoinRequest;
-    Event<ActivityActionType, User const&, Activity const&> OnActivityInvite;
-
-private:
-    friend class Core;
-
-    ActivityManager() = default;
-    ActivityManager(ActivityManager const& rhs) = delete;
-    ActivityManager& operator=(ActivityManager const& rhs) = delete;
-    ActivityManager(ActivityManager&& rhs) = delete;
-    ActivityManager& operator=(ActivityManager&& rhs) = delete;
-
-    IDiscordActivityManager* internal_;
-    static IDiscordActivityEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/application_manager.cpp

@@ -1,78 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "application_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-void ApplicationManager::ValidateOrExit(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->validate_or_exit(internal_, cb.release(), wrapper);
-}
-
-void ApplicationManager::GetCurrentLocale(char locale[128])
-{
-    if (!locale) {
-        return;
-    }
-
-    internal_->get_current_locale(internal_, reinterpret_cast<DiscordLocale*>(locale));
-}
-
-void ApplicationManager::GetCurrentBranch(char branch[4096])
-{
-    if (!branch) {
-        return;
-    }
-
-    internal_->get_current_branch(internal_, reinterpret_cast<DiscordBranch*>(branch));
-}
-
-void ApplicationManager::GetOAuth2Token(std::function<void(Result, OAuth2Token const&)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, DiscordOAuth2Token* oauth2Token) -> void {
-        std::unique_ptr<std::function<void(Result, OAuth2Token const&)>> cb(
-          reinterpret_cast<std::function<void(Result, OAuth2Token const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<OAuth2Token const*>(oauth2Token));
-    };
-    std::unique_ptr<std::function<void(Result, OAuth2Token const&)>> cb{};
-    cb.reset(new std::function<void(Result, OAuth2Token const&)>(std::move(callback)));
-    internal_->get_oauth2_token(internal_, cb.release(), wrapper);
-}
-
-void ApplicationManager::GetTicket(std::function<void(Result, char const*)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result, char const* data) -> void {
-        std::unique_ptr<std::function<void(Result, char const*)>> cb(
-          reinterpret_cast<std::function<void(Result, char const*)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), static_cast<const char*>(data));
-    };
-    std::unique_ptr<std::function<void(Result, char const*)>> cb{};
-    cb.reset(new std::function<void(Result, char const*)>(std::move(callback)));
-    internal_->get_ticket(internal_, cb.release(), wrapper);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/application_manager.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class ApplicationManager final {
-public:
-    ~ApplicationManager() = default;
-
-    void ValidateOrExit(std::function<void(Result)> callback);
-    void GetCurrentLocale(char locale[128]);
-    void GetCurrentBranch(char branch[4096]);
-    void GetOAuth2Token(std::function<void(Result, OAuth2Token const&)> callback);
-    void GetTicket(std::function<void(Result, char const*)> callback);
-
-private:
-    friend class Core;
-
-    ApplicationManager() = default;
-    ApplicationManager(ApplicationManager const& rhs) = delete;
-    ApplicationManager& operator=(ApplicationManager const& rhs) = delete;
-    ApplicationManager(ApplicationManager&& rhs) = delete;
-    ApplicationManager& operator=(ApplicationManager&& rhs) = delete;
-
-    IDiscordApplicationManager* internal_;
-    static IDiscordApplicationEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/core.cpp

@@ -1,182 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-Result Core::Create(ClientId clientId, std::uint64_t flags, Core** instance)
-{
-    if (!instance) {
-        return Result::InternalError;
-    }
-
-    (*instance) = new Core();
-    DiscordCreateParams params{};
-    DiscordCreateParamsSetDefault(&params);
-    params.client_id = clientId;
-    params.flags = flags;
-    params.events = nullptr;
-    params.event_data = *instance;
-    params.user_events = &UserManager::events_;
-    params.activity_events = &ActivityManager::events_;
-    params.relationship_events = &RelationshipManager::events_;
-    params.lobby_events = &LobbyManager::events_;
-    params.network_events = &NetworkManager::events_;
-    params.overlay_events = &OverlayManager::events_;
-    params.store_events = &StoreManager::events_;
-    params.voice_events = &VoiceManager::events_;
-    params.achievement_events = &AchievementManager::events_;
-    auto result = DiscordCreate(DISCORD_VERSION, &params, &((*instance)->internal_));
-    if (result != DiscordResult_Ok || !(*instance)->internal_) {
-        delete (*instance);
-        (*instance) = nullptr;
-    }
-
-    return static_cast<Result>(result);
-}
-
-Core::~Core()
-{
-    if (internal_) {
-        internal_->destroy(internal_);
-        internal_ = nullptr;
-    }
-}
-
-Result Core::RunCallbacks()
-{
-    auto result = internal_->run_callbacks(internal_);
-    return static_cast<Result>(result);
-}
-
-void Core::SetLogHook(LogLevel minLevel, std::function<void(LogLevel, char const*)> hook)
-{
-    setLogHook_.DisconnectAll();
-    setLogHook_.Connect(std::move(hook));
-    static auto wrapper =
-      [](void* callbackData, EDiscordLogLevel level, char const* message) -> void {
-        auto cb(reinterpret_cast<decltype(setLogHook_)*>(callbackData));
-        if (!cb) {
-            return;
-        }
-        (*cb)(static_cast<LogLevel>(level), static_cast<const char*>(message));
-    };
-
-    internal_->set_log_hook(
-      internal_, static_cast<EDiscordLogLevel>(minLevel), &setLogHook_, wrapper);
-}
-
-discord::ApplicationManager& Core::ApplicationManager()
-{
-    if (!applicationManager_.internal_) {
-        applicationManager_.internal_ = internal_->get_application_manager(internal_);
-    }
-
-    return applicationManager_;
-}
-
-discord::UserManager& Core::UserManager()
-{
-    if (!userManager_.internal_) {
-        userManager_.internal_ = internal_->get_user_manager(internal_);
-    }
-
-    return userManager_;
-}
-
-discord::ImageManager& Core::ImageManager()
-{
-    if (!imageManager_.internal_) {
-        imageManager_.internal_ = internal_->get_image_manager(internal_);
-    }
-
-    return imageManager_;
-}
-
-discord::ActivityManager& Core::ActivityManager()
-{
-    if (!activityManager_.internal_) {
-        activityManager_.internal_ = internal_->get_activity_manager(internal_);
-    }
-
-    return activityManager_;
-}
-
-discord::RelationshipManager& Core::RelationshipManager()
-{
-    if (!relationshipManager_.internal_) {
-        relationshipManager_.internal_ = internal_->get_relationship_manager(internal_);
-    }
-
-    return relationshipManager_;
-}
-
-discord::LobbyManager& Core::LobbyManager()
-{
-    if (!lobbyManager_.internal_) {
-        lobbyManager_.internal_ = internal_->get_lobby_manager(internal_);
-    }
-
-    return lobbyManager_;
-}
-
-discord::NetworkManager& Core::NetworkManager()
-{
-    if (!networkManager_.internal_) {
-        networkManager_.internal_ = internal_->get_network_manager(internal_);
-    }
-
-    return networkManager_;
-}
-
-discord::OverlayManager& Core::OverlayManager()
-{
-    if (!overlayManager_.internal_) {
-        overlayManager_.internal_ = internal_->get_overlay_manager(internal_);
-    }
-
-    return overlayManager_;
-}
-
-discord::StorageManager& Core::StorageManager()
-{
-    if (!storageManager_.internal_) {
-        storageManager_.internal_ = internal_->get_storage_manager(internal_);
-    }
-
-    return storageManager_;
-}
-
-discord::StoreManager& Core::StoreManager()
-{
-    if (!storeManager_.internal_) {
-        storeManager_.internal_ = internal_->get_store_manager(internal_);
-    }
-
-    return storeManager_;
-}
-
-discord::VoiceManager& Core::VoiceManager()
-{
-    if (!voiceManager_.internal_) {
-        voiceManager_.internal_ = internal_->get_voice_manager(internal_);
-    }
-
-    return voiceManager_;
-}
-
-discord::AchievementManager& Core::AchievementManager()
-{
-    if (!achievementManager_.internal_) {
-        achievementManager_.internal_ = internal_->get_achievement_manager(internal_);
-    }
-
-    return achievementManager_;
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/core.h

@@ -1,64 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include "application_manager.h"
-#include "user_manager.h"
-#include "image_manager.h"
-#include "activity_manager.h"
-#include "relationship_manager.h"
-#include "lobby_manager.h"
-#include "network_manager.h"
-#include "overlay_manager.h"
-#include "storage_manager.h"
-#include "store_manager.h"
-#include "voice_manager.h"
-#include "achievement_manager.h"
-
-namespace discord {
-
-class Core final {
-public:
-    static Result Create(ClientId clientId, std::uint64_t flags, Core** instance);
-
-    ~Core();
-
-    Result RunCallbacks();
-    void SetLogHook(LogLevel minLevel, std::function<void(LogLevel, char const*)> hook);
-
-    discord::ApplicationManager& ApplicationManager();
-    discord::UserManager& UserManager();
-    discord::ImageManager& ImageManager();
-    discord::ActivityManager& ActivityManager();
-    discord::RelationshipManager& RelationshipManager();
-    discord::LobbyManager& LobbyManager();
-    discord::NetworkManager& NetworkManager();
-    discord::OverlayManager& OverlayManager();
-    discord::StorageManager& StorageManager();
-    discord::StoreManager& StoreManager();
-    discord::VoiceManager& VoiceManager();
-    discord::AchievementManager& AchievementManager();
-
-private:
-    Core() = default;
-    Core(Core const& rhs) = delete;
-    Core& operator=(Core const& rhs) = delete;
-    Core(Core&& rhs) = delete;
-    Core& operator=(Core&& rhs) = delete;
-
-    IDiscordCore* internal_;
-    Event<LogLevel, char const*> setLogHook_;
-    discord::ApplicationManager applicationManager_;
-    discord::UserManager userManager_;
-    discord::ImageManager imageManager_;
-    discord::ActivityManager activityManager_;
-    discord::RelationshipManager relationshipManager_;
-    discord::LobbyManager lobbyManager_;
-    discord::NetworkManager networkManager_;
-    discord::OverlayManager overlayManager_;
-    discord::StorageManager storageManager_;
-    discord::StoreManager storeManager_;
-    discord::VoiceManager voiceManager_;
-    discord::AchievementManager achievementManager_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/discord.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include "core.h"
-#include "application_manager.h"
-#include "user_manager.h"
-#include "image_manager.h"
-#include "activity_manager.h"
-#include "relationship_manager.h"
-#include "lobby_manager.h"
-#include "network_manager.h"
-#include "overlay_manager.h"
-#include "storage_manager.h"
-#include "store_manager.h"
-#include "voice_manager.h"
-#include "achievement_manager.h"

libs/discordGameSDK/cpp/event.h

@@ -1,59 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <vector>
-
-namespace discord {
-
-template <typename... Args>
-class Event final {
-public:
-    using Token = int;
-
-    Event() { slots_.reserve(4); }
-
-    Event(Event const&) = default;
-    Event(Event&&) = default;
-    ~Event() = default;
-
-    Event& operator=(Event const&) = default;
-    Event& operator=(Event&&) = default;
-
-    template <typename EventHandler>
-    Token Connect(EventHandler slot)
-    {
-        slots_.emplace_back(Slot{nextToken_, std::move(slot)});
-        return nextToken_++;
-    }
-
-    void Disconnect(Token token)
-    {
-        for (auto& slot : slots_) {
-            if (slot.token == token) {
-                slot = slots_.back();
-                slots_.pop_back();
-                break;
-            }
-        }
-    }
-
-    void DisconnectAll() { slots_ = {}; }
-
-    void operator()(Args... args)
-    {
-        for (auto const& slot : slots_) {
-            slot.fn(std::forward<Args>(args)...);
-        }
-    }
-
-private:
-    struct Slot {
-        Token token;
-        std::function<void(Args...)> fn;
-    };
-
-    Token nextToken_{};
-    std::vector<Slot> slots_{};
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/ffi.h

@@ -1,942 +0,0 @@
-#ifndef _DISCORD_GAME_SDK_H_
-#define _DISCORD_GAME_SDK_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <string.h>
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
-
-#define DISCORD_VERSION 2
-#define DISCORD_APPLICATION_MANAGER_VERSION 1
-#define DISCORD_USER_MANAGER_VERSION 1
-#define DISCORD_IMAGE_MANAGER_VERSION 1
-#define DISCORD_ACTIVITY_MANAGER_VERSION 1
-#define DISCORD_RELATIONSHIP_MANAGER_VERSION 1
-#define DISCORD_LOBBY_MANAGER_VERSION 1
-#define DISCORD_NETWORK_MANAGER_VERSION 1
-#define DISCORD_OVERLAY_MANAGER_VERSION 1
-#define DISCORD_STORAGE_MANAGER_VERSION 1
-#define DISCORD_STORE_MANAGER_VERSION 1
-#define DISCORD_VOICE_MANAGER_VERSION 1
-#define DISCORD_ACHIEVEMENT_MANAGER_VERSION 1
-
-enum EDiscordResult {
-    DiscordResult_Ok = 0,
-    DiscordResult_ServiceUnavailable = 1,
-    DiscordResult_InvalidVersion = 2,
-    DiscordResult_LockFailed = 3,
-    DiscordResult_InternalError = 4,
-    DiscordResult_InvalidPayload = 5,
-    DiscordResult_InvalidCommand = 6,
-    DiscordResult_InvalidPermissions = 7,
-    DiscordResult_NotFetched = 8,
-    DiscordResult_NotFound = 9,
-    DiscordResult_Conflict = 10,
-    DiscordResult_InvalidSecret = 11,
-    DiscordResult_InvalidJoinSecret = 12,
-    DiscordResult_NoEligibleActivity = 13,
-    DiscordResult_InvalidInvite = 14,
-    DiscordResult_NotAuthenticated = 15,
-    DiscordResult_InvalidAccessToken = 16,
-    DiscordResult_ApplicationMismatch = 17,
-    DiscordResult_InvalidDataUrl = 18,
-    DiscordResult_InvalidBase64 = 19,
-    DiscordResult_NotFiltered = 20,
-    DiscordResult_LobbyFull = 21,
-    DiscordResult_InvalidLobbySecret = 22,
-    DiscordResult_InvalidFilename = 23,
-    DiscordResult_InvalidFileSize = 24,
-    DiscordResult_InvalidEntitlement = 25,
-    DiscordResult_NotInstalled = 26,
-    DiscordResult_NotRunning = 27,
-    DiscordResult_InsufficientBuffer = 28,
-    DiscordResult_PurchaseCanceled = 29,
-    DiscordResult_InvalidGuild = 30,
-    DiscordResult_InvalidEvent = 31,
-    DiscordResult_InvalidChannel = 32,
-    DiscordResult_InvalidOrigin = 33,
-    DiscordResult_RateLimited = 34,
-    DiscordResult_OAuth2Error = 35,
-    DiscordResult_SelectChannelTimeout = 36,
-    DiscordResult_GetGuildTimeout = 37,
-    DiscordResult_SelectVoiceForceRequired = 38,
-    DiscordResult_CaptureShortcutAlreadyListening = 39,
-    DiscordResult_UnauthorizedForAchievement = 40,
-    DiscordResult_InvalidGiftCode = 41,
-    DiscordResult_PurchaseError = 42,
-    DiscordResult_TransactionAborted = 43,
-};
-
-enum EDiscordCreateFlags {
-    DiscordCreateFlags_Default = 0,
-    DiscordCreateFlags_NoRequireDiscord = 1,
-};
-
-enum EDiscordLogLevel {
-    DiscordLogLevel_Error = 1,
-    DiscordLogLevel_Warn,
-    DiscordLogLevel_Info,
-    DiscordLogLevel_Debug,
-};
-
-enum EDiscordUserFlag {
-    DiscordUserFlag_Partner = 2,
-    DiscordUserFlag_HypeSquadEvents = 4,
-    DiscordUserFlag_HypeSquadHouse1 = 64,
-    DiscordUserFlag_HypeSquadHouse2 = 128,
-    DiscordUserFlag_HypeSquadHouse3 = 256,
-};
-
-enum EDiscordPremiumType {
-    DiscordPremiumType_None = 0,
-    DiscordPremiumType_Tier1 = 1,
-    DiscordPremiumType_Tier2 = 2,
-};
-
-enum EDiscordImageType {
-    DiscordImageType_User,
-};
-
-enum EDiscordActivityType {
-    DiscordActivityType_Playing,
-    DiscordActivityType_Streaming,
-    DiscordActivityType_Listening,
-    DiscordActivityType_Watching,
-};
-
-enum EDiscordActivityActionType {
-    DiscordActivityActionType_Join = 1,
-    DiscordActivityActionType_Spectate,
-};
-
-enum EDiscordActivityJoinRequestReply {
-    DiscordActivityJoinRequestReply_No,
-    DiscordActivityJoinRequestReply_Yes,
-    DiscordActivityJoinRequestReply_Ignore,
-};
-
-enum EDiscordStatus {
-    DiscordStatus_Offline = 0,
-    DiscordStatus_Online = 1,
-    DiscordStatus_Idle = 2,
-    DiscordStatus_DoNotDisturb = 3,
-};
-
-enum EDiscordRelationshipType {
-    DiscordRelationshipType_None,
-    DiscordRelationshipType_Friend,
-    DiscordRelationshipType_Blocked,
-    DiscordRelationshipType_PendingIncoming,
-    DiscordRelationshipType_PendingOutgoing,
-    DiscordRelationshipType_Implicit,
-};
-
-enum EDiscordLobbyType {
-    DiscordLobbyType_Private = 1,
-    DiscordLobbyType_Public,
-};
-
-enum EDiscordLobbySearchComparison {
-    DiscordLobbySearchComparison_LessThanOrEqual = -2,
-    DiscordLobbySearchComparison_LessThan,
-    DiscordLobbySearchComparison_Equal,
-    DiscordLobbySearchComparison_GreaterThan,
-    DiscordLobbySearchComparison_GreaterThanOrEqual,
-    DiscordLobbySearchComparison_NotEqual,
-};
-
-enum EDiscordLobbySearchCast {
-    DiscordLobbySearchCast_String = 1,
-    DiscordLobbySearchCast_Number,
-};
-
-enum EDiscordLobbySearchDistance {
-    DiscordLobbySearchDistance_Local,
-    DiscordLobbySearchDistance_Default,
-    DiscordLobbySearchDistance_Extended,
-    DiscordLobbySearchDistance_Global,
-};
-
-enum EDiscordEntitlementType {
-    DiscordEntitlementType_Purchase = 1,
-    DiscordEntitlementType_PremiumSubscription,
-    DiscordEntitlementType_DeveloperGift,
-    DiscordEntitlementType_TestModePurchase,
-    DiscordEntitlementType_FreePurchase,
-    DiscordEntitlementType_UserGift,
-    DiscordEntitlementType_PremiumPurchase,
-};
-
-enum EDiscordSkuType {
-    DiscordSkuType_Application = 1,
-    DiscordSkuType_DLC,
-    DiscordSkuType_Consumable,
-    DiscordSkuType_Bundle,
-};
-
-enum EDiscordInputModeType {
-    DiscordInputModeType_VoiceActivity = 0,
-    DiscordInputModeType_PushToTalk,
-};
-
-typedef int64_t DiscordClientId;
-typedef int32_t DiscordVersion;
-typedef int64_t DiscordSnowflake;
-typedef int64_t DiscordTimestamp;
-typedef DiscordSnowflake DiscordUserId;
-typedef char DiscordLocale[128];
-typedef char DiscordBranch[4096];
-typedef DiscordSnowflake DiscordLobbyId;
-typedef char DiscordLobbySecret[128];
-typedef char DiscordMetadataKey[256];
-typedef char DiscordMetadataValue[4096];
-typedef uint64_t DiscordNetworkPeerId;
-typedef uint8_t DiscordNetworkChannelId;
-typedef char DiscordPath[4096];
-typedef char DiscordDateTime[64];
-
-struct DiscordUser {
-    DiscordUserId id;
-    char username[256];
-    char discriminator[8];
-    char avatar[128];
-    bool bot;
-};
-
-struct DiscordOAuth2Token {
-    char access_token[128];
-    char scopes[1024];
-    DiscordTimestamp expires;
-};
-
-struct DiscordImageHandle {
-    enum EDiscordImageType type;
-    int64_t id;
-    uint32_t size;
-};
-
-struct DiscordImageDimensions {
-    uint32_t width;
-    uint32_t height;
-};
-
-struct DiscordActivityTimestamps {
-    DiscordTimestamp start;
-    DiscordTimestamp end;
-};
-
-struct DiscordActivityAssets {
-    char large_image[128];
-    char large_text[128];
-    char small_image[128];
-    char small_text[128];
-};
-
-struct DiscordPartySize {
-    int32_t current_size;
-    int32_t max_size;
-};
-
-struct DiscordActivityParty {
-    char id[128];
-    struct DiscordPartySize size;
-};
-
-struct DiscordActivitySecrets {
-    char match[128];
-    char join[128];
-    char spectate[128];
-};
-
-struct DiscordActivity {
-    enum EDiscordActivityType type;
-    int64_t application_id;
-    char name[128];
-    char state[128];
-    char details[128];
-    struct DiscordActivityTimestamps timestamps;
-    struct DiscordActivityAssets assets;
-    struct DiscordActivityParty party;
-    struct DiscordActivitySecrets secrets;
-    bool instance;
-};
-
-struct DiscordPresence {
-    enum EDiscordStatus status;
-    struct DiscordActivity activity;
-};
-
-struct DiscordRelationship {
-    enum EDiscordRelationshipType type;
-    struct DiscordUser user;
-    struct DiscordPresence presence;
-};
-
-struct DiscordLobby {
-    DiscordLobbyId id;
-    enum EDiscordLobbyType type;
-    DiscordUserId owner_id;
-    DiscordLobbySecret secret;
-    uint32_t capacity;
-    bool locked;
-};
-
-struct DiscordFileStat {
-    char filename[260];
-    uint64_t size;
-    uint64_t last_modified;
-};
-
-struct DiscordEntitlement {
-    DiscordSnowflake id;
-    enum EDiscordEntitlementType type;
-    DiscordSnowflake sku_id;
-};
-
-struct DiscordSkuPrice {
-    uint32_t amount;
-    char currency[16];
-};
-
-struct DiscordSku {
-    DiscordSnowflake id;
-    enum EDiscordSkuType type;
-    char name[256];
-    struct DiscordSkuPrice price;
-};
-
-struct DiscordInputMode {
-    enum EDiscordInputModeType type;
-    char shortcut[256];
-};
-
-struct DiscordUserAchievement {
-    DiscordSnowflake user_id;
-    DiscordSnowflake achievement_id;
-    uint8_t percent_complete;
-    DiscordDateTime unlocked_at;
-};
-
-struct IDiscordLobbyTransaction {
-    enum EDiscordResult (*set_type)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                    enum EDiscordLobbyType type);
-    enum EDiscordResult (*set_owner)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                     DiscordUserId owner_id);
-    enum EDiscordResult (*set_capacity)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                        uint32_t capacity);
-    enum EDiscordResult (*set_metadata)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                        DiscordMetadataKey key,
-                                        DiscordMetadataValue value);
-    enum EDiscordResult (*delete_metadata)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                           DiscordMetadataKey key);
-    enum EDiscordResult (*set_locked)(struct IDiscordLobbyTransaction* lobby_transaction,
-                                      bool locked);
-};
-
-struct IDiscordLobbyMemberTransaction {
-    enum EDiscordResult (*set_metadata)(
-      struct IDiscordLobbyMemberTransaction* lobby_member_transaction,
-      DiscordMetadataKey key,
-      DiscordMetadataValue value);
-    enum EDiscordResult (*delete_metadata)(
-      struct IDiscordLobbyMemberTransaction* lobby_member_transaction,
-      DiscordMetadataKey key);
-};
-
-struct IDiscordLobbySearchQuery {
-    enum EDiscordResult (*filter)(struct IDiscordLobbySearchQuery* lobby_search_query,
-                                  DiscordMetadataKey key,
-                                  enum EDiscordLobbySearchComparison comparison,
-                                  enum EDiscordLobbySearchCast cast,
-                                  DiscordMetadataValue value);
-    enum EDiscordResult (*sort)(struct IDiscordLobbySearchQuery* lobby_search_query,
-                                DiscordMetadataKey key,
-                                enum EDiscordLobbySearchCast cast,
-                                DiscordMetadataValue value);
-    enum EDiscordResult (*limit)(struct IDiscordLobbySearchQuery* lobby_search_query,
-                                 uint32_t limit);
-    enum EDiscordResult (*distance)(struct IDiscordLobbySearchQuery* lobby_search_query,
-                                    enum EDiscordLobbySearchDistance distance);
-};
-
-typedef void* IDiscordApplicationEvents;
-
-struct IDiscordApplicationManager {
-    void (*validate_or_exit)(struct IDiscordApplicationManager* manager,
-                             void* callback_data,
-                             void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*get_current_locale)(struct IDiscordApplicationManager* manager, DiscordLocale* locale);
-    void (*get_current_branch)(struct IDiscordApplicationManager* manager, DiscordBranch* branch);
-    void (*get_oauth2_token)(struct IDiscordApplicationManager* manager,
-                             void* callback_data,
-                             void (*callback)(void* callback_data,
-                                              enum EDiscordResult result,
-                                              struct DiscordOAuth2Token* oauth2_token));
-    void (*get_ticket)(struct IDiscordApplicationManager* manager,
-                       void* callback_data,
-                       void (*callback)(void* callback_data,
-                                        enum EDiscordResult result,
-                                        const char* data));
-};
-
-struct IDiscordUserEvents {
-    void (*on_current_user_update)(void* event_data);
-};
-
-struct IDiscordUserManager {
-    enum EDiscordResult (*get_current_user)(struct IDiscordUserManager* manager,
-                                            struct DiscordUser* current_user);
-    void (*get_user)(struct IDiscordUserManager* manager,
-                     DiscordUserId user_id,
-                     void* callback_data,
-                     void (*callback)(void* callback_data,
-                                      enum EDiscordResult result,
-                                      struct DiscordUser* user));
-    enum EDiscordResult (*get_current_user_premium_type)(struct IDiscordUserManager* manager,
-                                                         enum EDiscordPremiumType* premium_type);
-    enum EDiscordResult (*current_user_has_flag)(struct IDiscordUserManager* manager,
-                                                 enum EDiscordUserFlag flag,
-                                                 bool* has_flag);
-};
-
-typedef void* IDiscordImageEvents;
-
-struct IDiscordImageManager {
-    void (*fetch)(struct IDiscordImageManager* manager,
-                  struct DiscordImageHandle handle,
-                  bool refresh,
-                  void* callback_data,
-                  void (*callback)(void* callback_data,
-                                   enum EDiscordResult result,
-                                   struct DiscordImageHandle handle_result));
-    enum EDiscordResult (*get_dimensions)(struct IDiscordImageManager* manager,
-                                          struct DiscordImageHandle handle,
-                                          struct DiscordImageDimensions* dimensions);
-    enum EDiscordResult (*get_data)(struct IDiscordImageManager* manager,
-                                    struct DiscordImageHandle handle,
-                                    uint8_t* data,
-                                    uint32_t data_length);
-};
-
-struct IDiscordActivityEvents {
-    void (*on_activity_join)(void* event_data, const char* secret);
-    void (*on_activity_spectate)(void* event_data, const char* secret);
-    void (*on_activity_join_request)(void* event_data, struct DiscordUser* user);
-    void (*on_activity_invite)(void* event_data,
-                               enum EDiscordActivityActionType type,
-                               struct DiscordUser* user,
-                               struct DiscordActivity* activity);
-};
-
-struct IDiscordActivityManager {
-    enum EDiscordResult (*register_command)(struct IDiscordActivityManager* manager,
-                                            const char* command);
-    enum EDiscordResult (*register_steam)(struct IDiscordActivityManager* manager,
-                                          uint32_t steam_id);
-    void (*update_activity)(struct IDiscordActivityManager* manager,
-                            struct DiscordActivity* activity,
-                            void* callback_data,
-                            void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*clear_activity)(struct IDiscordActivityManager* manager,
-                           void* callback_data,
-                           void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_request_reply)(struct IDiscordActivityManager* manager,
-                               DiscordUserId user_id,
-                               enum EDiscordActivityJoinRequestReply reply,
-                               void* callback_data,
-                               void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_invite)(struct IDiscordActivityManager* manager,
-                        DiscordUserId user_id,
-                        enum EDiscordActivityActionType type,
-                        const char* content,
-                        void* callback_data,
-                        void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*accept_invite)(struct IDiscordActivityManager* manager,
-                          DiscordUserId user_id,
-                          void* callback_data,
-                          void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-struct IDiscordRelationshipEvents {
-    void (*on_refresh)(void* event_data);
-    void (*on_relationship_update)(void* event_data, struct DiscordRelationship* relationship);
-};
-
-struct IDiscordRelationshipManager {
-    void (*filter)(struct IDiscordRelationshipManager* manager,
-                   void* filter_data,
-                   bool (*filter)(void* filter_data, struct DiscordRelationship* relationship));
-    enum EDiscordResult (*count)(struct IDiscordRelationshipManager* manager, int32_t* count);
-    enum EDiscordResult (*get)(struct IDiscordRelationshipManager* manager,
-                               DiscordUserId user_id,
-                               struct DiscordRelationship* relationship);
-    enum EDiscordResult (*get_at)(struct IDiscordRelationshipManager* manager,
-                                  uint32_t index,
-                                  struct DiscordRelationship* relationship);
-};
-
-struct IDiscordLobbyEvents {
-    void (*on_lobby_update)(void* event_data, int64_t lobby_id);
-    void (*on_lobby_delete)(void* event_data, int64_t lobby_id, uint32_t reason);
-    void (*on_member_connect)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_member_update)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_member_disconnect)(void* event_data, int64_t lobby_id, int64_t user_id);
-    void (*on_lobby_message)(void* event_data,
-                             int64_t lobby_id,
-                             int64_t user_id,
-                             uint8_t* data,
-                             uint32_t data_length);
-    void (*on_speaking)(void* event_data, int64_t lobby_id, int64_t user_id, bool speaking);
-    void (*on_network_message)(void* event_data,
-                               int64_t lobby_id,
-                               int64_t user_id,
-                               uint8_t channel_id,
-                               uint8_t* data,
-                               uint32_t data_length);
-};
-
-struct IDiscordLobbyManager {
-    enum EDiscordResult (*get_lobby_create_transaction)(
-      struct IDiscordLobbyManager* manager,
-      struct IDiscordLobbyTransaction** transaction);
-    enum EDiscordResult (*get_lobby_update_transaction)(
-      struct IDiscordLobbyManager* manager,
-      DiscordLobbyId lobby_id,
-      struct IDiscordLobbyTransaction** transaction);
-    enum EDiscordResult (*get_member_update_transaction)(
-      struct IDiscordLobbyManager* manager,
-      DiscordLobbyId lobby_id,
-      DiscordUserId user_id,
-      struct IDiscordLobbyMemberTransaction** transaction);
-    void (*create_lobby)(struct IDiscordLobbyManager* manager,
-                         struct IDiscordLobbyTransaction* transaction,
-                         void* callback_data,
-                         void (*callback)(void* callback_data,
-                                          enum EDiscordResult result,
-                                          struct DiscordLobby* lobby));
-    void (*update_lobby)(struct IDiscordLobbyManager* manager,
-                         DiscordLobbyId lobby_id,
-                         struct IDiscordLobbyTransaction* transaction,
-                         void* callback_data,
-                         void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*delete_lobby)(struct IDiscordLobbyManager* manager,
-                         DiscordLobbyId lobby_id,
-                         void* callback_data,
-                         void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*connect_lobby)(struct IDiscordLobbyManager* manager,
-                          DiscordLobbyId lobby_id,
-                          DiscordLobbySecret secret,
-                          void* callback_data,
-                          void (*callback)(void* callback_data,
-                                           enum EDiscordResult result,
-                                           struct DiscordLobby* lobby));
-    void (*connect_lobby_with_activity_secret)(struct IDiscordLobbyManager* manager,
-                                               DiscordLobbySecret activity_secret,
-                                               void* callback_data,
-                                               void (*callback)(void* callback_data,
-                                                                enum EDiscordResult result,
-                                                                struct DiscordLobby* lobby));
-    void (*disconnect_lobby)(struct IDiscordLobbyManager* manager,
-                             DiscordLobbyId lobby_id,
-                             void* callback_data,
-                             void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*get_lobby)(struct IDiscordLobbyManager* manager,
-                                     DiscordLobbyId lobby_id,
-                                     struct DiscordLobby* lobby);
-    enum EDiscordResult (*get_lobby_activity_secret)(struct IDiscordLobbyManager* manager,
-                                                     DiscordLobbyId lobby_id,
-                                                     DiscordLobbySecret* secret);
-    enum EDiscordResult (*get_lobby_metadata_value)(struct IDiscordLobbyManager* manager,
-                                                    DiscordLobbyId lobby_id,
-                                                    DiscordMetadataKey key,
-                                                    DiscordMetadataValue* value);
-    enum EDiscordResult (*get_lobby_metadata_key)(struct IDiscordLobbyManager* manager,
-                                                  DiscordLobbyId lobby_id,
-                                                  int32_t index,
-                                                  DiscordMetadataKey* key);
-    enum EDiscordResult (*lobby_metadata_count)(struct IDiscordLobbyManager* manager,
-                                                DiscordLobbyId lobby_id,
-                                                int32_t* count);
-    enum EDiscordResult (*member_count)(struct IDiscordLobbyManager* manager,
-                                        DiscordLobbyId lobby_id,
-                                        int32_t* count);
-    enum EDiscordResult (*get_member_user_id)(struct IDiscordLobbyManager* manager,
-                                              DiscordLobbyId lobby_id,
-                                              int32_t index,
-                                              DiscordUserId* user_id);
-    enum EDiscordResult (*get_member_user)(struct IDiscordLobbyManager* manager,
-                                           DiscordLobbyId lobby_id,
-                                           DiscordUserId user_id,
-                                           struct DiscordUser* user);
-    enum EDiscordResult (*get_member_metadata_value)(struct IDiscordLobbyManager* manager,
-                                                     DiscordLobbyId lobby_id,
-                                                     DiscordUserId user_id,
-                                                     DiscordMetadataKey key,
-                                                     DiscordMetadataValue* value);
-    enum EDiscordResult (*get_member_metadata_key)(struct IDiscordLobbyManager* manager,
-                                                   DiscordLobbyId lobby_id,
-                                                   DiscordUserId user_id,
-                                                   int32_t index,
-                                                   DiscordMetadataKey* key);
-    enum EDiscordResult (*member_metadata_count)(struct IDiscordLobbyManager* manager,
-                                                 DiscordLobbyId lobby_id,
-                                                 DiscordUserId user_id,
-                                                 int32_t* count);
-    void (*update_member)(struct IDiscordLobbyManager* manager,
-                          DiscordLobbyId lobby_id,
-                          DiscordUserId user_id,
-                          struct IDiscordLobbyMemberTransaction* transaction,
-                          void* callback_data,
-                          void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*send_lobby_message)(struct IDiscordLobbyManager* manager,
-                               DiscordLobbyId lobby_id,
-                               uint8_t* data,
-                               uint32_t data_length,
-                               void* callback_data,
-                               void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*get_search_query)(struct IDiscordLobbyManager* manager,
-                                            struct IDiscordLobbySearchQuery** query);
-    void (*search)(struct IDiscordLobbyManager* manager,
-                   struct IDiscordLobbySearchQuery* query,
-                   void* callback_data,
-                   void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*lobby_count)(struct IDiscordLobbyManager* manager, int32_t* count);
-    enum EDiscordResult (*get_lobby_id)(struct IDiscordLobbyManager* manager,
-                                        int32_t index,
-                                        DiscordLobbyId* lobby_id);
-    void (*connect_voice)(struct IDiscordLobbyManager* manager,
-                          DiscordLobbyId lobby_id,
-                          void* callback_data,
-                          void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*disconnect_voice)(struct IDiscordLobbyManager* manager,
-                             DiscordLobbyId lobby_id,
-                             void* callback_data,
-                             void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*connect_network)(struct IDiscordLobbyManager* manager,
-                                           DiscordLobbyId lobby_id);
-    enum EDiscordResult (*disconnect_network)(struct IDiscordLobbyManager* manager,
-                                              DiscordLobbyId lobby_id);
-    enum EDiscordResult (*flush_network)(struct IDiscordLobbyManager* manager);
-    enum EDiscordResult (*open_network_channel)(struct IDiscordLobbyManager* manager,
-                                                DiscordLobbyId lobby_id,
-                                                uint8_t channel_id,
-                                                bool reliable);
-    enum EDiscordResult (*send_network_message)(struct IDiscordLobbyManager* manager,
-                                                DiscordLobbyId lobby_id,
-                                                DiscordUserId user_id,
-                                                uint8_t channel_id,
-                                                uint8_t* data,
-                                                uint32_t data_length);
-};
-
-struct IDiscordNetworkEvents {
-    void (*on_message)(void* event_data,
-                       DiscordNetworkPeerId peer_id,
-                       DiscordNetworkChannelId channel_id,
-                       uint8_t* data,
-                       uint32_t data_length);
-    void (*on_route_update)(void* event_data, const char* route_data);
-};
-
-struct IDiscordNetworkManager {
-    /**
-     * Get the local peer ID for this process.
-     */
-    void (*get_peer_id)(struct IDiscordNetworkManager* manager, DiscordNetworkPeerId* peer_id);
-    /**
-     * Send pending network messages.
-     */
-    enum EDiscordResult (*flush)(struct IDiscordNetworkManager* manager);
-    /**
-     * Open a connection to a remote peer.
-     */
-    enum EDiscordResult (*open_peer)(struct IDiscordNetworkManager* manager,
-                                     DiscordNetworkPeerId peer_id,
-                                     const char* route_data);
-    /**
-     * Update the route data for a connected peer.
-     */
-    enum EDiscordResult (*update_peer)(struct IDiscordNetworkManager* manager,
-                                       DiscordNetworkPeerId peer_id,
-                                       const char* route_data);
-    /**
-     * Close the connection to a remote peer.
-     */
-    enum EDiscordResult (*close_peer)(struct IDiscordNetworkManager* manager,
-                                      DiscordNetworkPeerId peer_id);
-    /**
-     * Open a message channel to a connected peer.
-     */
-    enum EDiscordResult (*open_channel)(struct IDiscordNetworkManager* manager,
-                                        DiscordNetworkPeerId peer_id,
-                                        DiscordNetworkChannelId channel_id,
-                                        bool reliable);
-    /**
-     * Close a message channel to a connected peer.
-     */
-    enum EDiscordResult (*close_channel)(struct IDiscordNetworkManager* manager,
-                                         DiscordNetworkPeerId peer_id,
-                                         DiscordNetworkChannelId channel_id);
-    /**
-     * Send a message to a connected peer over an opened message channel.
-     */
-    enum EDiscordResult (*send_message)(struct IDiscordNetworkManager* manager,
-                                        DiscordNetworkPeerId peer_id,
-                                        DiscordNetworkChannelId channel_id,
-                                        uint8_t* data,
-                                        uint32_t data_length);
-};
-
-struct IDiscordOverlayEvents {
-    void (*on_toggle)(void* event_data, bool locked);
-};
-
-struct IDiscordOverlayManager {
-    void (*is_enabled)(struct IDiscordOverlayManager* manager, bool* enabled);
-    void (*is_locked)(struct IDiscordOverlayManager* manager, bool* locked);
-    void (*set_locked)(struct IDiscordOverlayManager* manager,
-                       bool locked,
-                       void* callback_data,
-                       void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_activity_invite)(struct IDiscordOverlayManager* manager,
-                                 enum EDiscordActivityActionType type,
-                                 void* callback_data,
-                                 void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_guild_invite)(struct IDiscordOverlayManager* manager,
-                              const char* code,
-                              void* callback_data,
-                              void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*open_voice_settings)(struct IDiscordOverlayManager* manager,
-                                void* callback_data,
-                                void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-typedef void* IDiscordStorageEvents;
-
-struct IDiscordStorageManager {
-    enum EDiscordResult (*read)(struct IDiscordStorageManager* manager,
-                                const char* name,
-                                uint8_t* data,
-                                uint32_t data_length,
-                                uint32_t* read);
-    void (*read_async)(struct IDiscordStorageManager* manager,
-                       const char* name,
-                       void* callback_data,
-                       void (*callback)(void* callback_data,
-                                        enum EDiscordResult result,
-                                        uint8_t* data,
-                                        uint32_t data_length));
-    void (*read_async_partial)(struct IDiscordStorageManager* manager,
-                               const char* name,
-                               uint64_t offset,
-                               uint64_t length,
-                               void* callback_data,
-                               void (*callback)(void* callback_data,
-                                                enum EDiscordResult result,
-                                                uint8_t* data,
-                                                uint32_t data_length));
-    enum EDiscordResult (*write)(struct IDiscordStorageManager* manager,
-                                 const char* name,
-                                 uint8_t* data,
-                                 uint32_t data_length);
-    void (*write_async)(struct IDiscordStorageManager* manager,
-                        const char* name,
-                        uint8_t* data,
-                        uint32_t data_length,
-                        void* callback_data,
-                        void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*delete_)(struct IDiscordStorageManager* manager, const char* name);
-    enum EDiscordResult (*exists)(struct IDiscordStorageManager* manager,
-                                  const char* name,
-                                  bool* exists);
-    void (*count)(struct IDiscordStorageManager* manager, int32_t* count);
-    enum EDiscordResult (*stat)(struct IDiscordStorageManager* manager,
-                                const char* name,
-                                struct DiscordFileStat* stat);
-    enum EDiscordResult (*stat_at)(struct IDiscordStorageManager* manager,
-                                   int32_t index,
-                                   struct DiscordFileStat* stat);
-    enum EDiscordResult (*get_path)(struct IDiscordStorageManager* manager, DiscordPath* path);
-};
-
-struct IDiscordStoreEvents {
-    void (*on_entitlement_create)(void* event_data, struct DiscordEntitlement* entitlement);
-    void (*on_entitlement_delete)(void* event_data, struct DiscordEntitlement* entitlement);
-};
-
-struct IDiscordStoreManager {
-    void (*fetch_skus)(struct IDiscordStoreManager* manager,
-                       void* callback_data,
-                       void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*count_skus)(struct IDiscordStoreManager* manager, int32_t* count);
-    enum EDiscordResult (*get_sku)(struct IDiscordStoreManager* manager,
-                                   DiscordSnowflake sku_id,
-                                   struct DiscordSku* sku);
-    enum EDiscordResult (*get_sku_at)(struct IDiscordStoreManager* manager,
-                                      int32_t index,
-                                      struct DiscordSku* sku);
-    void (*fetch_entitlements)(struct IDiscordStoreManager* manager,
-                               void* callback_data,
-                               void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*count_entitlements)(struct IDiscordStoreManager* manager, int32_t* count);
-    enum EDiscordResult (*get_entitlement)(struct IDiscordStoreManager* manager,
-                                           DiscordSnowflake entitlement_id,
-                                           struct DiscordEntitlement* entitlement);
-    enum EDiscordResult (*get_entitlement_at)(struct IDiscordStoreManager* manager,
-                                              int32_t index,
-                                              struct DiscordEntitlement* entitlement);
-    enum EDiscordResult (*has_sku_entitlement)(struct IDiscordStoreManager* manager,
-                                               DiscordSnowflake sku_id,
-                                               bool* has_entitlement);
-    void (*start_purchase)(struct IDiscordStoreManager* manager,
-                           DiscordSnowflake sku_id,
-                           void* callback_data,
-                           void (*callback)(void* callback_data, enum EDiscordResult result));
-};
-
-struct IDiscordVoiceEvents {
-    void (*on_settings_update)(void* event_data);
-};
-
-struct IDiscordVoiceManager {
-    enum EDiscordResult (*get_input_mode)(struct IDiscordVoiceManager* manager,
-                                          struct DiscordInputMode* input_mode);
-    void (*set_input_mode)(struct IDiscordVoiceManager* manager,
-                           struct DiscordInputMode input_mode,
-                           void* callback_data,
-                           void (*callback)(void* callback_data, enum EDiscordResult result));
-    enum EDiscordResult (*is_self_mute)(struct IDiscordVoiceManager* manager, bool* mute);
-    enum EDiscordResult (*set_self_mute)(struct IDiscordVoiceManager* manager, bool mute);
-    enum EDiscordResult (*is_self_deaf)(struct IDiscordVoiceManager* manager, bool* deaf);
-    enum EDiscordResult (*set_self_deaf)(struct IDiscordVoiceManager* manager, bool deaf);
-    enum EDiscordResult (*is_local_mute)(struct IDiscordVoiceManager* manager,
-                                         DiscordSnowflake user_id,
-                                         bool* mute);
-    enum EDiscordResult (*set_local_mute)(struct IDiscordVoiceManager* manager,
-                                          DiscordSnowflake user_id,
-                                          bool mute);
-    enum EDiscordResult (*get_local_volume)(struct IDiscordVoiceManager* manager,
-                                            DiscordSnowflake user_id,
-                                            uint8_t* volume);
-    enum EDiscordResult (*set_local_volume)(struct IDiscordVoiceManager* manager,
-                                            DiscordSnowflake user_id,
-                                            uint8_t volume);
-};
-
-struct IDiscordAchievementEvents {
-    void (*on_user_achievement_update)(void* event_data,
-                                       struct DiscordUserAchievement* user_achievement);
-};
-
-struct IDiscordAchievementManager {
-    void (*set_user_achievement)(struct IDiscordAchievementManager* manager,
-                                 DiscordSnowflake achievement_id,
-                                 uint8_t percent_complete,
-                                 void* callback_data,
-                                 void (*callback)(void* callback_data, enum EDiscordResult result));
-    void (*fetch_user_achievements)(struct IDiscordAchievementManager* manager,
-                                    void* callback_data,
-                                    void (*callback)(void* callback_data,
-                                                     enum EDiscordResult result));
-    void (*count_user_achievements)(struct IDiscordAchievementManager* manager, int32_t* count);
-    enum EDiscordResult (*get_user_achievement)(struct IDiscordAchievementManager* manager,
-                                                DiscordSnowflake user_achievement_id,
-                                                struct DiscordUserAchievement* user_achievement);
-    enum EDiscordResult (*get_user_achievement_at)(struct IDiscordAchievementManager* manager,
-                                                   int32_t index,
-                                                   struct DiscordUserAchievement* user_achievement);
-};
-
-typedef void* IDiscordCoreEvents;
-
-struct IDiscordCore {
-    void (*destroy)(struct IDiscordCore* core);
-    enum EDiscordResult (*run_callbacks)(struct IDiscordCore* core);
-    void (*set_log_hook)(struct IDiscordCore* core,
-                         enum EDiscordLogLevel min_level,
-                         void* hook_data,
-                         void (*hook)(void* hook_data,
-                                      enum EDiscordLogLevel level,
-                                      const char* message));
-    struct IDiscordApplicationManager* (*get_application_manager)(struct IDiscordCore* core);
-    struct IDiscordUserManager* (*get_user_manager)(struct IDiscordCore* core);
-    struct IDiscordImageManager* (*get_image_manager)(struct IDiscordCore* core);
-    struct IDiscordActivityManager* (*get_activity_manager)(struct IDiscordCore* core);
-    struct IDiscordRelationshipManager* (*get_relationship_manager)(struct IDiscordCore* core);
-    struct IDiscordLobbyManager* (*get_lobby_manager)(struct IDiscordCore* core);
-    struct IDiscordNetworkManager* (*get_network_manager)(struct IDiscordCore* core);
-    struct IDiscordOverlayManager* (*get_overlay_manager)(struct IDiscordCore* core);
-    struct IDiscordStorageManager* (*get_storage_manager)(struct IDiscordCore* core);
-    struct IDiscordStoreManager* (*get_store_manager)(struct IDiscordCore* core);
-    struct IDiscordVoiceManager* (*get_voice_manager)(struct IDiscordCore* core);
-    struct IDiscordAchievementManager* (*get_achievement_manager)(struct IDiscordCore* core);
-};
-
-struct DiscordCreateParams {
-    DiscordClientId client_id;
-    uint64_t flags;
-    IDiscordCoreEvents* events;
-    void* event_data;
-    IDiscordApplicationEvents* application_events;
-    DiscordVersion application_version;
-    struct IDiscordUserEvents* user_events;
-    DiscordVersion user_version;
-    IDiscordImageEvents* image_events;
-    DiscordVersion image_version;
-    struct IDiscordActivityEvents* activity_events;
-    DiscordVersion activity_version;
-    struct IDiscordRelationshipEvents* relationship_events;
-    DiscordVersion relationship_version;
-    struct IDiscordLobbyEvents* lobby_events;
-    DiscordVersion lobby_version;
-    struct IDiscordNetworkEvents* network_events;
-    DiscordVersion network_version;
-    struct IDiscordOverlayEvents* overlay_events;
-    DiscordVersion overlay_version;
-    IDiscordStorageEvents* storage_events;
-    DiscordVersion storage_version;
-    struct IDiscordStoreEvents* store_events;
-    DiscordVersion store_version;
-    struct IDiscordVoiceEvents* voice_events;
-    DiscordVersion voice_version;
-    struct IDiscordAchievementEvents* achievement_events;
-    DiscordVersion achievement_version;
-};
-
-#ifdef __cplusplus
-inline
-#else
-static
-#endif
-  void
-  DiscordCreateParamsSetDefault(struct DiscordCreateParams* params)
-{
-    memset(params, 0, sizeof(struct DiscordCreateParams));
-    params->application_version = DISCORD_APPLICATION_MANAGER_VERSION;
-    params->user_version = DISCORD_USER_MANAGER_VERSION;
-    params->image_version = DISCORD_IMAGE_MANAGER_VERSION;
-    params->activity_version = DISCORD_ACTIVITY_MANAGER_VERSION;
-    params->relationship_version = DISCORD_RELATIONSHIP_MANAGER_VERSION;
-    params->lobby_version = DISCORD_LOBBY_MANAGER_VERSION;
-    params->network_version = DISCORD_NETWORK_MANAGER_VERSION;
-    params->overlay_version = DISCORD_OVERLAY_MANAGER_VERSION;
-    params->storage_version = DISCORD_STORAGE_MANAGER_VERSION;
-    params->store_version = DISCORD_STORE_MANAGER_VERSION;
-    params->voice_version = DISCORD_VOICE_MANAGER_VERSION;
-    params->achievement_version = DISCORD_ACHIEVEMENT_MANAGER_VERSION;
-}
-
-enum EDiscordResult DiscordCreate(DiscordVersion version,
-                                  struct DiscordCreateParams* params,
-                                  struct IDiscordCore** result);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

libs/discordGameSDK/cpp/image_manager.cpp

@@ -1,57 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "image_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-void ImageManager::Fetch(ImageHandle handle,
-                         bool refresh,
-                         std::function<void(Result, ImageHandle)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, DiscordImageHandle handleResult) -> void {
-        std::unique_ptr<std::function<void(Result, ImageHandle)>> cb(
-          reinterpret_cast<std::function<void(Result, ImageHandle)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<ImageHandle const*>(&handleResult));
-    };
-    std::unique_ptr<std::function<void(Result, ImageHandle)>> cb{};
-    cb.reset(new std::function<void(Result, ImageHandle)>(std::move(callback)));
-    internal_->fetch(internal_,
-                     *reinterpret_cast<DiscordImageHandle const*>(&handle),
-                     (refresh ? 1 : 0),
-                     cb.release(),
-                     wrapper);
-}
-
-Result ImageManager::GetDimensions(ImageHandle handle, ImageDimensions* dimensions)
-{
-    if (!dimensions) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_dimensions(internal_,
-                                            *reinterpret_cast<DiscordImageHandle const*>(&handle),
-                                            reinterpret_cast<DiscordImageDimensions*>(dimensions));
-    return static_cast<Result>(result);
-}
-
-Result ImageManager::GetData(ImageHandle handle, std::uint8_t* data, std::uint32_t dataLength)
-{
-    auto result = internal_->get_data(internal_,
-                                      *reinterpret_cast<DiscordImageHandle const*>(&handle),
-                                      reinterpret_cast<uint8_t*>(data),
-                                      dataLength);
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/image_manager.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class ImageManager final {
-public:
-    ~ImageManager() = default;
-
-    void Fetch(ImageHandle handle, bool refresh, std::function<void(Result, ImageHandle)> callback);
-    Result GetDimensions(ImageHandle handle, ImageDimensions* dimensions);
-    Result GetData(ImageHandle handle, std::uint8_t* data, std::uint32_t dataLength);
-
-private:
-    friend class Core;
-
-    ImageManager() = default;
-    ImageManager(ImageManager const& rhs) = delete;
-    ImageManager& operator=(ImageManager const& rhs) = delete;
-    ImageManager(ImageManager&& rhs) = delete;
-    ImageManager& operator=(ImageManager&& rhs) = delete;
-
-    IDiscordImageManager* internal_;
-    static IDiscordImageEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/lobby_manager.cpp

@@ -1,547 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "lobby_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class LobbyEvents final {
-public:
-    static void OnLobbyUpdate(void* callbackData, int64_t lobbyId)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnLobbyUpdate(lobbyId);
-    }
-
-    static void OnLobbyDelete(void* callbackData, int64_t lobbyId, uint32_t reason)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnLobbyDelete(lobbyId, reason);
-    }
-
-    static void OnMemberConnect(void* callbackData, int64_t lobbyId, int64_t userId)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnMemberConnect(lobbyId, userId);
-    }
-
-    static void OnMemberUpdate(void* callbackData, int64_t lobbyId, int64_t userId)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnMemberUpdate(lobbyId, userId);
-    }
-
-    static void OnMemberDisconnect(void* callbackData, int64_t lobbyId, int64_t userId)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnMemberDisconnect(lobbyId, userId);
-    }
-
-    static void OnLobbyMessage(void* callbackData,
-                               int64_t lobbyId,
-                               int64_t userId,
-                               uint8_t* data,
-                               uint32_t dataLength)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnLobbyMessage(lobbyId, userId, data, dataLength);
-    }
-
-    static void OnSpeaking(void* callbackData, int64_t lobbyId, int64_t userId, bool speaking)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnSpeaking(lobbyId, userId, (speaking != 0));
-    }
-
-    static void OnNetworkMessage(void* callbackData,
-                                 int64_t lobbyId,
-                                 int64_t userId,
-                                 uint8_t channelId,
-                                 uint8_t* data,
-                                 uint32_t dataLength)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->LobbyManager();
-        module.OnNetworkMessage(lobbyId, userId, channelId, data, dataLength);
-    }
-};
-
-IDiscordLobbyEvents LobbyManager::events_{
-  &LobbyEvents::OnLobbyUpdate,
-  &LobbyEvents::OnLobbyDelete,
-  &LobbyEvents::OnMemberConnect,
-  &LobbyEvents::OnMemberUpdate,
-  &LobbyEvents::OnMemberDisconnect,
-  &LobbyEvents::OnLobbyMessage,
-  &LobbyEvents::OnSpeaking,
-  &LobbyEvents::OnNetworkMessage,
-};
-
-Result LobbyManager::GetLobbyCreateTransaction(LobbyTransaction* transaction)
-{
-    if (!transaction) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby_create_transaction(internal_, transaction->Receive());
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetLobbyUpdateTransaction(LobbyId lobbyId, LobbyTransaction* transaction)
-{
-    if (!transaction) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_lobby_update_transaction(internal_, lobbyId, transaction->Receive());
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetMemberUpdateTransaction(LobbyId lobbyId,
-                                                UserId userId,
-                                                LobbyMemberTransaction* transaction)
-{
-    if (!transaction) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_member_update_transaction(internal_, lobbyId, userId, transaction->Receive());
-    return static_cast<Result>(result);
-}
-
-void LobbyManager::CreateLobby(LobbyTransaction const& transaction,
-                               std::function<void(Result, Lobby const&)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, DiscordLobby* lobby) -> void {
-        std::unique_ptr<std::function<void(Result, Lobby const&)>> cb(
-          reinterpret_cast<std::function<void(Result, Lobby const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<Lobby const*>(lobby));
-    };
-    std::unique_ptr<std::function<void(Result, Lobby const&)>> cb{};
-    cb.reset(new std::function<void(Result, Lobby const&)>(std::move(callback)));
-    internal_->create_lobby(
-      internal_, const_cast<LobbyTransaction&>(transaction).Internal(), cb.release(), wrapper);
-}
-
-void LobbyManager::UpdateLobby(LobbyId lobbyId,
-                               LobbyTransaction const& transaction,
-                               std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->update_lobby(internal_,
-                            lobbyId,
-                            const_cast<LobbyTransaction&>(transaction).Internal(),
-                            cb.release(),
-                            wrapper);
-}
-
-void LobbyManager::DeleteLobby(LobbyId lobbyId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->delete_lobby(internal_, lobbyId, cb.release(), wrapper);
-}
-
-void LobbyManager::ConnectLobby(LobbyId lobbyId,
-                                LobbySecret secret,
-                                std::function<void(Result, Lobby const&)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, DiscordLobby* lobby) -> void {
-        std::unique_ptr<std::function<void(Result, Lobby const&)>> cb(
-          reinterpret_cast<std::function<void(Result, Lobby const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<Lobby const*>(lobby));
-    };
-    std::unique_ptr<std::function<void(Result, Lobby const&)>> cb{};
-    cb.reset(new std::function<void(Result, Lobby const&)>(std::move(callback)));
-    internal_->connect_lobby(internal_, lobbyId, const_cast<char*>(secret), cb.release(), wrapper);
-}
-
-void LobbyManager::ConnectLobbyWithActivitySecret(
-  LobbySecret activitySecret,
-  std::function<void(Result, Lobby const&)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, DiscordLobby* lobby) -> void {
-        std::unique_ptr<std::function<void(Result, Lobby const&)>> cb(
-          reinterpret_cast<std::function<void(Result, Lobby const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<Lobby const*>(lobby));
-    };
-    std::unique_ptr<std::function<void(Result, Lobby const&)>> cb{};
-    cb.reset(new std::function<void(Result, Lobby const&)>(std::move(callback)));
-    internal_->connect_lobby_with_activity_secret(
-      internal_, const_cast<char*>(activitySecret), cb.release(), wrapper);
-}
-
-void LobbyManager::DisconnectLobby(LobbyId lobbyId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->disconnect_lobby(internal_, lobbyId, cb.release(), wrapper);
-}
-
-Result LobbyManager::GetLobby(LobbyId lobbyId, Lobby* lobby)
-{
-    if (!lobby) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby(internal_, lobbyId, reinterpret_cast<DiscordLobby*>(lobby));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetLobbyActivitySecret(LobbyId lobbyId, char secret[128])
-{
-    if (!secret) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby_activity_secret(
-      internal_, lobbyId, reinterpret_cast<DiscordLobbySecret*>(secret));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetLobbyMetadataValue(LobbyId lobbyId, MetadataKey key, char value[4096])
-{
-    if (!value) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby_metadata_value(
-      internal_, lobbyId, const_cast<char*>(key), reinterpret_cast<DiscordMetadataValue*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetLobbyMetadataKey(LobbyId lobbyId, std::int32_t index, char key[256])
-{
-    if (!key) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby_metadata_key(
-      internal_, lobbyId, index, reinterpret_cast<DiscordMetadataKey*>(key));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::LobbyMetadataCount(LobbyId lobbyId, std::int32_t* count)
-{
-    if (!count) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->lobby_metadata_count(internal_, lobbyId, reinterpret_cast<int32_t*>(count));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::MemberCount(LobbyId lobbyId, std::int32_t* count)
-{
-    if (!count) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->member_count(internal_, lobbyId, reinterpret_cast<int32_t*>(count));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetMemberUserId(LobbyId lobbyId, std::int32_t index, UserId* userId)
-{
-    if (!userId) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_member_user_id(internal_, lobbyId, index, reinterpret_cast<int64_t*>(userId));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetMemberUser(LobbyId lobbyId, UserId userId, User* user)
-{
-    if (!user) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_member_user(internal_, lobbyId, userId, reinterpret_cast<DiscordUser*>(user));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetMemberMetadataValue(LobbyId lobbyId,
-                                            UserId userId,
-                                            MetadataKey key,
-                                            char value[4096])
-{
-    if (!value) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_member_metadata_value(internal_,
-                                           lobbyId,
-                                           userId,
-                                           const_cast<char*>(key),
-                                           reinterpret_cast<DiscordMetadataValue*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::GetMemberMetadataKey(LobbyId lobbyId,
-                                          UserId userId,
-                                          std::int32_t index,
-                                          char key[256])
-{
-    if (!key) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_member_metadata_key(
-      internal_, lobbyId, userId, index, reinterpret_cast<DiscordMetadataKey*>(key));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::MemberMetadataCount(LobbyId lobbyId, UserId userId, std::int32_t* count)
-{
-    if (!count) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->member_metadata_count(
-      internal_, lobbyId, userId, reinterpret_cast<int32_t*>(count));
-    return static_cast<Result>(result);
-}
-
-void LobbyManager::UpdateMember(LobbyId lobbyId,
-                                UserId userId,
-                                LobbyMemberTransaction const& transaction,
-                                std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->update_member(internal_,
-                             lobbyId,
-                             userId,
-                             const_cast<LobbyMemberTransaction&>(transaction).Internal(),
-                             cb.release(),
-                             wrapper);
-}
-
-void LobbyManager::SendLobbyMessage(LobbyId lobbyId,
-                                    std::uint8_t* data,
-                                    std::uint32_t dataLength,
-                                    std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->send_lobby_message(
-      internal_, lobbyId, reinterpret_cast<uint8_t*>(data), dataLength, cb.release(), wrapper);
-}
-
-Result LobbyManager::GetSearchQuery(LobbySearchQuery* query)
-{
-    if (!query) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_search_query(internal_, query->Receive());
-    return static_cast<Result>(result);
-}
-
-void LobbyManager::Search(LobbySearchQuery const& query, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->search(
-      internal_, const_cast<LobbySearchQuery&>(query).Internal(), cb.release(), wrapper);
-}
-
-void LobbyManager::LobbyCount(std::int32_t* count)
-{
-    if (!count) {
-        return;
-    }
-
-    internal_->lobby_count(internal_, reinterpret_cast<int32_t*>(count));
-}
-
-Result LobbyManager::GetLobbyId(std::int32_t index, LobbyId* lobbyId)
-{
-    if (!lobbyId) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_lobby_id(internal_, index, reinterpret_cast<int64_t*>(lobbyId));
-    return static_cast<Result>(result);
-}
-
-void LobbyManager::ConnectVoice(LobbyId lobbyId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->connect_voice(internal_, lobbyId, cb.release(), wrapper);
-}
-
-void LobbyManager::DisconnectVoice(LobbyId lobbyId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->disconnect_voice(internal_, lobbyId, cb.release(), wrapper);
-}
-
-Result LobbyManager::ConnectNetwork(LobbyId lobbyId)
-{
-    auto result = internal_->connect_network(internal_, lobbyId);
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::DisconnectNetwork(LobbyId lobbyId)
-{
-    auto result = internal_->disconnect_network(internal_, lobbyId);
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::FlushNetwork()
-{
-    auto result = internal_->flush_network(internal_);
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::OpenNetworkChannel(LobbyId lobbyId, std::uint8_t channelId, bool reliable)
-{
-    auto result =
-      internal_->open_network_channel(internal_, lobbyId, channelId, (reliable ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result LobbyManager::SendNetworkMessage(LobbyId lobbyId,
-                                        UserId userId,
-                                        std::uint8_t channelId,
-                                        std::uint8_t* data,
-                                        std::uint32_t dataLength)
-{
-    auto result = internal_->send_network_message(
-      internal_, lobbyId, userId, channelId, reinterpret_cast<uint8_t*>(data), dataLength);
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/lobby_manager.h

@@ -1,88 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class LobbyManager final {
-public:
-    ~LobbyManager() = default;
-
-    Result GetLobbyCreateTransaction(LobbyTransaction* transaction);
-    Result GetLobbyUpdateTransaction(LobbyId lobbyId, LobbyTransaction* transaction);
-    Result GetMemberUpdateTransaction(LobbyId lobbyId,
-                                      UserId userId,
-                                      LobbyMemberTransaction* transaction);
-    void CreateLobby(LobbyTransaction const& transaction,
-                     std::function<void(Result, Lobby const&)> callback);
-    void UpdateLobby(LobbyId lobbyId,
-                     LobbyTransaction const& transaction,
-                     std::function<void(Result)> callback);
-    void DeleteLobby(LobbyId lobbyId, std::function<void(Result)> callback);
-    void ConnectLobby(LobbyId lobbyId,
-                      LobbySecret secret,
-                      std::function<void(Result, Lobby const&)> callback);
-    void ConnectLobbyWithActivitySecret(LobbySecret activitySecret,
-                                        std::function<void(Result, Lobby const&)> callback);
-    void DisconnectLobby(LobbyId lobbyId, std::function<void(Result)> callback);
-    Result GetLobby(LobbyId lobbyId, Lobby* lobby);
-    Result GetLobbyActivitySecret(LobbyId lobbyId, char secret[128]);
-    Result GetLobbyMetadataValue(LobbyId lobbyId, MetadataKey key, char value[4096]);
-    Result GetLobbyMetadataKey(LobbyId lobbyId, std::int32_t index, char key[256]);
-    Result LobbyMetadataCount(LobbyId lobbyId, std::int32_t* count);
-    Result MemberCount(LobbyId lobbyId, std::int32_t* count);
-    Result GetMemberUserId(LobbyId lobbyId, std::int32_t index, UserId* userId);
-    Result GetMemberUser(LobbyId lobbyId, UserId userId, User* user);
-    Result GetMemberMetadataValue(LobbyId lobbyId,
-                                  UserId userId,
-                                  MetadataKey key,
-                                  char value[4096]);
-    Result GetMemberMetadataKey(LobbyId lobbyId, UserId userId, std::int32_t index, char key[256]);
-    Result MemberMetadataCount(LobbyId lobbyId, UserId userId, std::int32_t* count);
-    void UpdateMember(LobbyId lobbyId,
-                      UserId userId,
-                      LobbyMemberTransaction const& transaction,
-                      std::function<void(Result)> callback);
-    void SendLobbyMessage(LobbyId lobbyId,
-                          std::uint8_t* data,
-                          std::uint32_t dataLength,
-                          std::function<void(Result)> callback);
-    Result GetSearchQuery(LobbySearchQuery* query);
-    void Search(LobbySearchQuery const& query, std::function<void(Result)> callback);
-    void LobbyCount(std::int32_t* count);
-    Result GetLobbyId(std::int32_t index, LobbyId* lobbyId);
-    void ConnectVoice(LobbyId lobbyId, std::function<void(Result)> callback);
-    void DisconnectVoice(LobbyId lobbyId, std::function<void(Result)> callback);
-    Result ConnectNetwork(LobbyId lobbyId);
-    Result DisconnectNetwork(LobbyId lobbyId);
-    Result FlushNetwork();
-    Result OpenNetworkChannel(LobbyId lobbyId, std::uint8_t channelId, bool reliable);
-    Result SendNetworkMessage(LobbyId lobbyId,
-                              UserId userId,
-                              std::uint8_t channelId,
-                              std::uint8_t* data,
-                              std::uint32_t dataLength);
-
-    Event<std::int64_t> OnLobbyUpdate;
-    Event<std::int64_t, std::uint32_t> OnLobbyDelete;
-    Event<std::int64_t, std::int64_t> OnMemberConnect;
-    Event<std::int64_t, std::int64_t> OnMemberUpdate;
-    Event<std::int64_t, std::int64_t> OnMemberDisconnect;
-    Event<std::int64_t, std::int64_t, std::uint8_t*, std::uint32_t> OnLobbyMessage;
-    Event<std::int64_t, std::int64_t, bool> OnSpeaking;
-    Event<std::int64_t, std::int64_t, std::uint8_t, std::uint8_t*, std::uint32_t> OnNetworkMessage;
-
-private:
-    friend class Core;
-
-    LobbyManager() = default;
-    LobbyManager(LobbyManager const& rhs) = delete;
-    LobbyManager& operator=(LobbyManager const& rhs) = delete;
-    LobbyManager(LobbyManager&& rhs) = delete;
-    LobbyManager& operator=(LobbyManager&& rhs) = delete;
-
-    IDiscordLobbyManager* internal_;
-    static IDiscordLobbyEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/network_manager.cpp

@@ -1,103 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "network_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class NetworkEvents final {
-public:
-    static void OnMessage(void* callbackData,
-                          DiscordNetworkPeerId peerId,
-                          DiscordNetworkChannelId channelId,
-                          uint8_t* data,
-                          uint32_t dataLength)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->NetworkManager();
-        module.OnMessage(peerId, channelId, data, dataLength);
-    }
-
-    static void OnRouteUpdate(void* callbackData, char const* routeData)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->NetworkManager();
-        module.OnRouteUpdate(static_cast<const char*>(routeData));
-    }
-};
-
-IDiscordNetworkEvents NetworkManager::events_{
-  &NetworkEvents::OnMessage,
-  &NetworkEvents::OnRouteUpdate,
-};
-
-void NetworkManager::GetPeerId(NetworkPeerId* peerId)
-{
-    if (!peerId) {
-        return;
-    }
-
-    internal_->get_peer_id(internal_, reinterpret_cast<uint64_t*>(peerId));
-}
-
-Result NetworkManager::Flush()
-{
-    auto result = internal_->flush(internal_);
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::OpenPeer(NetworkPeerId peerId, char const* routeData)
-{
-    auto result = internal_->open_peer(internal_, peerId, const_cast<char*>(routeData));
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::UpdatePeer(NetworkPeerId peerId, char const* routeData)
-{
-    auto result = internal_->update_peer(internal_, peerId, const_cast<char*>(routeData));
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::ClosePeer(NetworkPeerId peerId)
-{
-    auto result = internal_->close_peer(internal_, peerId);
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::OpenChannel(NetworkPeerId peerId, NetworkChannelId channelId, bool reliable)
-{
-    auto result = internal_->open_channel(internal_, peerId, channelId, (reliable ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::CloseChannel(NetworkPeerId peerId, NetworkChannelId channelId)
-{
-    auto result = internal_->close_channel(internal_, peerId, channelId);
-    return static_cast<Result>(result);
-}
-
-Result NetworkManager::SendMessage(NetworkPeerId peerId,
-                                   NetworkChannelId channelId,
-                                   std::uint8_t* data,
-                                   std::uint32_t dataLength)
-{
-    auto result = internal_->send_message(
-      internal_, peerId, channelId, reinterpret_cast<uint8_t*>(data), dataLength);
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/network_manager.h

@@ -1,63 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class NetworkManager final {
-public:
-    ~NetworkManager() = default;
-
-    /**
-     * Get the local peer ID for this process.
-     */
-    void GetPeerId(NetworkPeerId* peerId);
-    /**
-     * Send pending network messages.
-     */
-    Result Flush();
-    /**
-     * Open a connection to a remote peer.
-     */
-    Result OpenPeer(NetworkPeerId peerId, char const* routeData);
-    /**
-     * Update the route data for a connected peer.
-     */
-    Result UpdatePeer(NetworkPeerId peerId, char const* routeData);
-    /**
-     * Close the connection to a remote peer.
-     */
-    Result ClosePeer(NetworkPeerId peerId);
-    /**
-     * Open a message channel to a connected peer.
-     */
-    Result OpenChannel(NetworkPeerId peerId, NetworkChannelId channelId, bool reliable);
-    /**
-     * Close a message channel to a connected peer.
-     */
-    Result CloseChannel(NetworkPeerId peerId, NetworkChannelId channelId);
-    /**
-     * Send a message to a connected peer over an opened message channel.
-     */
-    Result SendMessage(NetworkPeerId peerId,
-                       NetworkChannelId channelId,
-                       std::uint8_t* data,
-                       std::uint32_t dataLength);
-
-    Event<NetworkPeerId, NetworkChannelId, std::uint8_t*, std::uint32_t> OnMessage;
-    Event<char const*> OnRouteUpdate;
-
-private:
-    friend class Core;
-
-    NetworkManager() = default;
-    NetworkManager(NetworkManager const& rhs) = delete;
-    NetworkManager& operator=(NetworkManager const& rhs) = delete;
-    NetworkManager(NetworkManager&& rhs) = delete;
-    NetworkManager& operator=(NetworkManager&& rhs) = delete;
-
-    IDiscordNetworkManager* internal_;
-    static IDiscordNetworkEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/overlay_manager.cpp

@@ -1,112 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "overlay_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class OverlayEvents final {
-public:
-    static void OnToggle(void* callbackData, bool locked)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->OverlayManager();
-        module.OnToggle((locked != 0));
-    }
-};
-
-IDiscordOverlayEvents OverlayManager::events_{
-  &OverlayEvents::OnToggle,
-};
-
-void OverlayManager::IsEnabled(bool* enabled)
-{
-    if (!enabled) {
-        return;
-    }
-
-    internal_->is_enabled(internal_, reinterpret_cast<bool*>(enabled));
-}
-
-void OverlayManager::IsLocked(bool* locked)
-{
-    if (!locked) {
-        return;
-    }
-
-    internal_->is_locked(internal_, reinterpret_cast<bool*>(locked));
-}
-
-void OverlayManager::SetLocked(bool locked, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->set_locked(internal_, (locked ? 1 : 0), cb.release(), wrapper);
-}
-
-void OverlayManager::OpenActivityInvite(ActivityActionType type,
-                                        std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->open_activity_invite(
-      internal_, static_cast<EDiscordActivityActionType>(type), cb.release(), wrapper);
-}
-
-void OverlayManager::OpenGuildInvite(char const* code, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->open_guild_invite(internal_, const_cast<char*>(code), cb.release(), wrapper);
-}
-
-void OverlayManager::OpenVoiceSettings(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->open_voice_settings(internal_, cb.release(), wrapper);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/overlay_manager.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class OverlayManager final {
-public:
-    ~OverlayManager() = default;
-
-    void IsEnabled(bool* enabled);
-    void IsLocked(bool* locked);
-    void SetLocked(bool locked, std::function<void(Result)> callback);
-    void OpenActivityInvite(ActivityActionType type, std::function<void(Result)> callback);
-    void OpenGuildInvite(char const* code, std::function<void(Result)> callback);
-    void OpenVoiceSettings(std::function<void(Result)> callback);
-
-    Event<bool> OnToggle;
-
-private:
-    friend class Core;
-
-    OverlayManager() = default;
-    OverlayManager(OverlayManager const& rhs) = delete;
-    OverlayManager& operator=(OverlayManager const& rhs) = delete;
-    OverlayManager(OverlayManager&& rhs) = delete;
-    OverlayManager& operator=(OverlayManager&& rhs) = delete;
-
-    IDiscordOverlayManager* internal_;
-    static IDiscordOverlayEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/relationship_manager.cpp

@@ -1,90 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "relationship_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class RelationshipEvents final {
-public:
-    static void OnRefresh(void* callbackData)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->RelationshipManager();
-        module.OnRefresh();
-    }
-
-    static void OnRelationshipUpdate(void* callbackData, DiscordRelationship* relationship)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->RelationshipManager();
-        module.OnRelationshipUpdate(*reinterpret_cast<Relationship const*>(relationship));
-    }
-};
-
-IDiscordRelationshipEvents RelationshipManager::events_{
-  &RelationshipEvents::OnRefresh,
-  &RelationshipEvents::OnRelationshipUpdate,
-};
-
-void RelationshipManager::Filter(std::function<bool(Relationship const&)> filter)
-{
-    static auto wrapper = [](void* callbackData, DiscordRelationship* relationship) -> bool {
-        auto cb(reinterpret_cast<std::function<bool(Relationship const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return {};
-        }
-        return (*cb)(*reinterpret_cast<Relationship const*>(relationship));
-    };
-    std::unique_ptr<std::function<bool(Relationship const&)>> cb{};
-    cb.reset(new std::function<bool(Relationship const&)>(std::move(filter)));
-    internal_->filter(internal_, cb.get(), wrapper);
-}
-
-Result RelationshipManager::Count(std::int32_t* count)
-{
-    if (!count) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->count(internal_, reinterpret_cast<int32_t*>(count));
-    return static_cast<Result>(result);
-}
-
-Result RelationshipManager::Get(UserId userId, Relationship* relationship)
-{
-    if (!relationship) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get(internal_, userId, reinterpret_cast<DiscordRelationship*>(relationship));
-    return static_cast<Result>(result);
-}
-
-Result RelationshipManager::GetAt(std::uint32_t index, Relationship* relationship)
-{
-    if (!relationship) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_at(internal_, index, reinterpret_cast<DiscordRelationship*>(relationship));
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/relationship_manager.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class RelationshipManager final {
-public:
-    ~RelationshipManager() = default;
-
-    void Filter(std::function<bool(Relationship const&)> filter);
-    Result Count(std::int32_t* count);
-    Result Get(UserId userId, Relationship* relationship);
-    Result GetAt(std::uint32_t index, Relationship* relationship);
-
-    Event<> OnRefresh;
-    Event<Relationship const&> OnRelationshipUpdate;
-
-private:
-    friend class Core;
-
-    RelationshipManager() = default;
-    RelationshipManager(RelationshipManager const& rhs) = delete;
-    RelationshipManager& operator=(RelationshipManager const& rhs) = delete;
-    RelationshipManager(RelationshipManager&& rhs) = delete;
-    RelationshipManager& operator=(RelationshipManager&& rhs) = delete;
-
-    IDiscordRelationshipManager* internal_;
-    static IDiscordRelationshipEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/storage_manager.cpp

@@ -1,158 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "storage_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-Result StorageManager::Read(char const* name,
-                            std::uint8_t* data,
-                            std::uint32_t dataLength,
-                            std::uint32_t* read)
-{
-    if (!read) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->read(internal_,
-                                  const_cast<char*>(name),
-                                  reinterpret_cast<uint8_t*>(data),
-                                  dataLength,
-                                  reinterpret_cast<uint32_t*>(read));
-    return static_cast<Result>(result);
-}
-
-void StorageManager::ReadAsync(char const* name,
-                               std::function<void(Result, std::uint8_t*, std::uint32_t)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, uint8_t* data, uint32_t dataLength) -> void {
-        std::unique_ptr<std::function<void(Result, std::uint8_t*, std::uint32_t)>> cb(
-          reinterpret_cast<std::function<void(Result, std::uint8_t*, std::uint32_t)>*>(
-            callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), data, dataLength);
-    };
-    std::unique_ptr<std::function<void(Result, std::uint8_t*, std::uint32_t)>> cb{};
-    cb.reset(new std::function<void(Result, std::uint8_t*, std::uint32_t)>(std::move(callback)));
-    internal_->read_async(internal_, const_cast<char*>(name), cb.release(), wrapper);
-}
-
-void StorageManager::ReadAsyncPartial(
-  char const* name,
-  std::uint64_t offset,
-  std::uint64_t length,
-  std::function<void(Result, std::uint8_t*, std::uint32_t)> callback)
-{
-    static auto wrapper =
-      [](void* callbackData, EDiscordResult result, uint8_t* data, uint32_t dataLength) -> void {
-        std::unique_ptr<std::function<void(Result, std::uint8_t*, std::uint32_t)>> cb(
-          reinterpret_cast<std::function<void(Result, std::uint8_t*, std::uint32_t)>*>(
-            callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), data, dataLength);
-    };
-    std::unique_ptr<std::function<void(Result, std::uint8_t*, std::uint32_t)>> cb{};
-    cb.reset(new std::function<void(Result, std::uint8_t*, std::uint32_t)>(std::move(callback)));
-    internal_->read_async_partial(
-      internal_, const_cast<char*>(name), offset, length, cb.release(), wrapper);
-}
-
-Result StorageManager::Write(char const* name, std::uint8_t* data, std::uint32_t dataLength)
-{
-    auto result = internal_->write(
-      internal_, const_cast<char*>(name), reinterpret_cast<uint8_t*>(data), dataLength);
-    return static_cast<Result>(result);
-}
-
-void StorageManager::WriteAsync(char const* name,
-                                std::uint8_t* data,
-                                std::uint32_t dataLength,
-                                std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->write_async(internal_,
-                           const_cast<char*>(name),
-                           reinterpret_cast<uint8_t*>(data),
-                           dataLength,
-                           cb.release(),
-                           wrapper);
-}
-
-Result StorageManager::Delete(char const* name)
-{
-    auto result = internal_->delete_(internal_, const_cast<char*>(name));
-    return static_cast<Result>(result);
-}
-
-Result StorageManager::Exists(char const* name, bool* exists)
-{
-    if (!exists) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->exists(internal_, const_cast<char*>(name), reinterpret_cast<bool*>(exists));
-    return static_cast<Result>(result);
-}
-
-void StorageManager::Count(std::int32_t* count)
-{
-    if (!count) {
-        return;
-    }
-
-    internal_->count(internal_, reinterpret_cast<int32_t*>(count));
-}
-
-Result StorageManager::Stat(char const* name, FileStat* stat)
-{
-    if (!stat) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->stat(internal_, const_cast<char*>(name), reinterpret_cast<DiscordFileStat*>(stat));
-    return static_cast<Result>(result);
-}
-
-Result StorageManager::StatAt(std::int32_t index, FileStat* stat)
-{
-    if (!stat) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->stat_at(internal_, index, reinterpret_cast<DiscordFileStat*>(stat));
-    return static_cast<Result>(result);
-}
-
-Result StorageManager::GetPath(char path[4096])
-{
-    if (!path) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_path(internal_, reinterpret_cast<DiscordPath*>(path));
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/storage_manager.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class StorageManager final {
-public:
-    ~StorageManager() = default;
-
-    Result Read(char const* name,
-                std::uint8_t* data,
-                std::uint32_t dataLength,
-                std::uint32_t* read);
-    void ReadAsync(char const* name,
-                   std::function<void(Result, std::uint8_t*, std::uint32_t)> callback);
-    void ReadAsyncPartial(char const* name,
-                          std::uint64_t offset,
-                          std::uint64_t length,
-                          std::function<void(Result, std::uint8_t*, std::uint32_t)> callback);
-    Result Write(char const* name, std::uint8_t* data, std::uint32_t dataLength);
-    void WriteAsync(char const* name,
-                    std::uint8_t* data,
-                    std::uint32_t dataLength,
-                    std::function<void(Result)> callback);
-    Result Delete(char const* name);
-    Result Exists(char const* name, bool* exists);
-    void Count(std::int32_t* count);
-    Result Stat(char const* name, FileStat* stat);
-    Result StatAt(std::int32_t index, FileStat* stat);
-    Result GetPath(char path[4096]);
-
-private:
-    friend class Core;
-
-    StorageManager() = default;
-    StorageManager(StorageManager const& rhs) = delete;
-    StorageManager& operator=(StorageManager const& rhs) = delete;
-    StorageManager(StorageManager&& rhs) = delete;
-    StorageManager& operator=(StorageManager&& rhs) = delete;
-
-    IDiscordStorageManager* internal_;
-    static IDiscordStorageEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/store_manager.cpp

@@ -1,160 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "store_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class StoreEvents final {
-public:
-    static void OnEntitlementCreate(void* callbackData, DiscordEntitlement* entitlement)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->StoreManager();
-        module.OnEntitlementCreate(*reinterpret_cast<Entitlement const*>(entitlement));
-    }
-
-    static void OnEntitlementDelete(void* callbackData, DiscordEntitlement* entitlement)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->StoreManager();
-        module.OnEntitlementDelete(*reinterpret_cast<Entitlement const*>(entitlement));
-    }
-};
-
-IDiscordStoreEvents StoreManager::events_{
-  &StoreEvents::OnEntitlementCreate,
-  &StoreEvents::OnEntitlementDelete,
-};
-
-void StoreManager::FetchSkus(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->fetch_skus(internal_, cb.release(), wrapper);
-}
-
-void StoreManager::CountSkus(std::int32_t* count)
-{
-    if (!count) {
-        return;
-    }
-
-    internal_->count_skus(internal_, reinterpret_cast<int32_t*>(count));
-}
-
-Result StoreManager::GetSku(Snowflake skuId, Sku* sku)
-{
-    if (!sku) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_sku(internal_, skuId, reinterpret_cast<DiscordSku*>(sku));
-    return static_cast<Result>(result);
-}
-
-Result StoreManager::GetSkuAt(std::int32_t index, Sku* sku)
-{
-    if (!sku) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_sku_at(internal_, index, reinterpret_cast<DiscordSku*>(sku));
-    return static_cast<Result>(result);
-}
-
-void StoreManager::FetchEntitlements(std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->fetch_entitlements(internal_, cb.release(), wrapper);
-}
-
-void StoreManager::CountEntitlements(std::int32_t* count)
-{
-    if (!count) {
-        return;
-    }
-
-    internal_->count_entitlements(internal_, reinterpret_cast<int32_t*>(count));
-}
-
-Result StoreManager::GetEntitlement(Snowflake entitlementId, Entitlement* entitlement)
-{
-    if (!entitlement) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_entitlement(
-      internal_, entitlementId, reinterpret_cast<DiscordEntitlement*>(entitlement));
-    return static_cast<Result>(result);
-}
-
-Result StoreManager::GetEntitlementAt(std::int32_t index, Entitlement* entitlement)
-{
-    if (!entitlement) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_entitlement_at(
-      internal_, index, reinterpret_cast<DiscordEntitlement*>(entitlement));
-    return static_cast<Result>(result);
-}
-
-Result StoreManager::HasSkuEntitlement(Snowflake skuId, bool* hasEntitlement)
-{
-    if (!hasEntitlement) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->has_sku_entitlement(internal_, skuId, reinterpret_cast<bool*>(hasEntitlement));
-    return static_cast<Result>(result);
-}
-
-void StoreManager::StartPurchase(Snowflake skuId, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->start_purchase(internal_, skuId, cb.release(), wrapper);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/store_manager.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class StoreManager final {
-public:
-    ~StoreManager() = default;
-
-    void FetchSkus(std::function<void(Result)> callback);
-    void CountSkus(std::int32_t* count);
-    Result GetSku(Snowflake skuId, Sku* sku);
-    Result GetSkuAt(std::int32_t index, Sku* sku);
-    void FetchEntitlements(std::function<void(Result)> callback);
-    void CountEntitlements(std::int32_t* count);
-    Result GetEntitlement(Snowflake entitlementId, Entitlement* entitlement);
-    Result GetEntitlementAt(std::int32_t index, Entitlement* entitlement);
-    Result HasSkuEntitlement(Snowflake skuId, bool* hasEntitlement);
-    void StartPurchase(Snowflake skuId, std::function<void(Result)> callback);
-
-    Event<Entitlement const&> OnEntitlementCreate;
-    Event<Entitlement const&> OnEntitlementDelete;
-
-private:
-    friend class Core;
-
-    StoreManager() = default;
-    StoreManager(StoreManager const& rhs) = delete;
-    StoreManager& operator=(StoreManager const& rhs) = delete;
-    StoreManager(StoreManager&& rhs) = delete;
-    StoreManager& operator=(StoreManager&& rhs) = delete;
-
-    IDiscordStoreManager* internal_;
-    static IDiscordStoreEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/types.cpp

@@ -1,769 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "types.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-void User::SetId(UserId id)
-{
-    internal_.id = id;
-}
-
-UserId User::GetId() const
-{
-    return internal_.id;
-}
-
-void User::SetUsername(char const* username)
-{
-    strncpy(internal_.username, username, 256);
-    internal_.username[256 - 1] = '\0';
-}
-
-char const* User::GetUsername() const
-{
-    return internal_.username;
-}
-
-void User::SetDiscriminator(char const* discriminator)
-{
-    strncpy(internal_.discriminator, discriminator, 8);
-    internal_.discriminator[8 - 1] = '\0';
-}
-
-char const* User::GetDiscriminator() const
-{
-    return internal_.discriminator;
-}
-
-void User::SetAvatar(char const* avatar)
-{
-    strncpy(internal_.avatar, avatar, 128);
-    internal_.avatar[128 - 1] = '\0';
-}
-
-char const* User::GetAvatar() const
-{
-    return internal_.avatar;
-}
-
-void User::SetBot(bool bot)
-{
-    internal_.bot = bot;
-}
-
-bool User::GetBot() const
-{
-    return internal_.bot != 0;
-}
-
-void OAuth2Token::SetAccessToken(char const* accessToken)
-{
-    strncpy(internal_.access_token, accessToken, 128);
-    internal_.access_token[128 - 1] = '\0';
-}
-
-char const* OAuth2Token::GetAccessToken() const
-{
-    return internal_.access_token;
-}
-
-void OAuth2Token::SetScopes(char const* scopes)
-{
-    strncpy(internal_.scopes, scopes, 1024);
-    internal_.scopes[1024 - 1] = '\0';
-}
-
-char const* OAuth2Token::GetScopes() const
-{
-    return internal_.scopes;
-}
-
-void OAuth2Token::SetExpires(Timestamp expires)
-{
-    internal_.expires = expires;
-}
-
-Timestamp OAuth2Token::GetExpires() const
-{
-    return internal_.expires;
-}
-
-void ImageHandle::SetType(ImageType type)
-{
-    internal_.type = static_cast<EDiscordImageType>(type);
-}
-
-ImageType ImageHandle::GetType() const
-{
-    return static_cast<ImageType>(internal_.type);
-}
-
-void ImageHandle::SetId(std::int64_t id)
-{
-    internal_.id = id;
-}
-
-std::int64_t ImageHandle::GetId() const
-{
-    return internal_.id;
-}
-
-void ImageHandle::SetSize(std::uint32_t size)
-{
-    internal_.size = size;
-}
-
-std::uint32_t ImageHandle::GetSize() const
-{
-    return internal_.size;
-}
-
-void ImageDimensions::SetWidth(std::uint32_t width)
-{
-    internal_.width = width;
-}
-
-std::uint32_t ImageDimensions::GetWidth() const
-{
-    return internal_.width;
-}
-
-void ImageDimensions::SetHeight(std::uint32_t height)
-{
-    internal_.height = height;
-}
-
-std::uint32_t ImageDimensions::GetHeight() const
-{
-    return internal_.height;
-}
-
-void ActivityTimestamps::SetStart(Timestamp start)
-{
-    internal_.start = start;
-}
-
-Timestamp ActivityTimestamps::GetStart() const
-{
-    return internal_.start;
-}
-
-void ActivityTimestamps::SetEnd(Timestamp end)
-{
-    internal_.end = end;
-}
-
-Timestamp ActivityTimestamps::GetEnd() const
-{
-    return internal_.end;
-}
-
-void ActivityAssets::SetLargeImage(char const* largeImage)
-{
-    strncpy(internal_.large_image, largeImage, 128);
-    internal_.large_image[128 - 1] = '\0';
-}
-
-char const* ActivityAssets::GetLargeImage() const
-{
-    return internal_.large_image;
-}
-
-void ActivityAssets::SetLargeText(char const* largeText)
-{
-    strncpy(internal_.large_text, largeText, 128);
-    internal_.large_text[128 - 1] = '\0';
-}
-
-char const* ActivityAssets::GetLargeText() const
-{
-    return internal_.large_text;
-}
-
-void ActivityAssets::SetSmallImage(char const* smallImage)
-{
-    strncpy(internal_.small_image, smallImage, 128);
-    internal_.small_image[128 - 1] = '\0';
-}
-
-char const* ActivityAssets::GetSmallImage() const
-{
-    return internal_.small_image;
-}
-
-void ActivityAssets::SetSmallText(char const* smallText)
-{
-    strncpy(internal_.small_text, smallText, 128);
-    internal_.small_text[128 - 1] = '\0';
-}
-
-char const* ActivityAssets::GetSmallText() const
-{
-    return internal_.small_text;
-}
-
-void PartySize::SetCurrentSize(std::int32_t currentSize)
-{
-    internal_.current_size = currentSize;
-}
-
-std::int32_t PartySize::GetCurrentSize() const
-{
-    return internal_.current_size;
-}
-
-void PartySize::SetMaxSize(std::int32_t maxSize)
-{
-    internal_.max_size = maxSize;
-}
-
-std::int32_t PartySize::GetMaxSize() const
-{
-    return internal_.max_size;
-}
-
-void ActivityParty::SetId(char const* id)
-{
-    strncpy(internal_.id, id, 128);
-    internal_.id[128 - 1] = '\0';
-}
-
-char const* ActivityParty::GetId() const
-{
-    return internal_.id;
-}
-
-PartySize& ActivityParty::GetSize()
-{
-    return reinterpret_cast<PartySize&>(internal_.size);
-}
-
-PartySize const& ActivityParty::GetSize() const
-{
-    return reinterpret_cast<PartySize const&>(internal_.size);
-}
-
-void ActivitySecrets::SetMatch(char const* match)
-{
-    strncpy(internal_.match, match, 128);
-    internal_.match[128 - 1] = '\0';
-}
-
-char const* ActivitySecrets::GetMatch() const
-{
-    return internal_.match;
-}
-
-void ActivitySecrets::SetJoin(char const* join)
-{
-    strncpy(internal_.join, join, 128);
-    internal_.join[128 - 1] = '\0';
-}
-
-char const* ActivitySecrets::GetJoin() const
-{
-    return internal_.join;
-}
-
-void ActivitySecrets::SetSpectate(char const* spectate)
-{
-    strncpy(internal_.spectate, spectate, 128);
-    internal_.spectate[128 - 1] = '\0';
-}
-
-char const* ActivitySecrets::GetSpectate() const
-{
-    return internal_.spectate;
-}
-
-void Activity::SetType(ActivityType type)
-{
-    internal_.type = static_cast<EDiscordActivityType>(type);
-}
-
-ActivityType Activity::GetType() const
-{
-    return static_cast<ActivityType>(internal_.type);
-}
-
-void Activity::SetApplicationId(std::int64_t applicationId)
-{
-    internal_.application_id = applicationId;
-}
-
-std::int64_t Activity::GetApplicationId() const
-{
-    return internal_.application_id;
-}
-
-void Activity::SetName(char const* name)
-{
-    strncpy(internal_.name, name, 128);
-    internal_.name[128 - 1] = '\0';
-}
-
-char const* Activity::GetName() const
-{
-    return internal_.name;
-}
-
-void Activity::SetState(char const* state)
-{
-    strncpy(internal_.state, state, 128);
-    internal_.state[128 - 1] = '\0';
-}
-
-char const* Activity::GetState() const
-{
-    return internal_.state;
-}
-
-void Activity::SetDetails(char const* details)
-{
-    strncpy(internal_.details, details, 128);
-    internal_.details[128 - 1] = '\0';
-}
-
-char const* Activity::GetDetails() const
-{
-    return internal_.details;
-}
-
-ActivityTimestamps& Activity::GetTimestamps()
-{
-    return reinterpret_cast<ActivityTimestamps&>(internal_.timestamps);
-}
-
-ActivityTimestamps const& Activity::GetTimestamps() const
-{
-    return reinterpret_cast<ActivityTimestamps const&>(internal_.timestamps);
-}
-
-ActivityAssets& Activity::GetAssets()
-{
-    return reinterpret_cast<ActivityAssets&>(internal_.assets);
-}
-
-ActivityAssets const& Activity::GetAssets() const
-{
-    return reinterpret_cast<ActivityAssets const&>(internal_.assets);
-}
-
-ActivityParty& Activity::GetParty()
-{
-    return reinterpret_cast<ActivityParty&>(internal_.party);
-}
-
-ActivityParty const& Activity::GetParty() const
-{
-    return reinterpret_cast<ActivityParty const&>(internal_.party);
-}
-
-ActivitySecrets& Activity::GetSecrets()
-{
-    return reinterpret_cast<ActivitySecrets&>(internal_.secrets);
-}
-
-ActivitySecrets const& Activity::GetSecrets() const
-{
-    return reinterpret_cast<ActivitySecrets const&>(internal_.secrets);
-}
-
-void Activity::SetInstance(bool instance)
-{
-    internal_.instance = instance;
-}
-
-bool Activity::GetInstance() const
-{
-    return internal_.instance != 0;
-}
-
-void Presence::SetStatus(Status status)
-{
-    internal_.status = static_cast<EDiscordStatus>(status);
-}
-
-Status Presence::GetStatus() const
-{
-    return static_cast<Status>(internal_.status);
-}
-
-Activity& Presence::GetActivity()
-{
-    return reinterpret_cast<Activity&>(internal_.activity);
-}
-
-Activity const& Presence::GetActivity() const
-{
-    return reinterpret_cast<Activity const&>(internal_.activity);
-}
-
-void Relationship::SetType(RelationshipType type)
-{
-    internal_.type = static_cast<EDiscordRelationshipType>(type);
-}
-
-RelationshipType Relationship::GetType() const
-{
-    return static_cast<RelationshipType>(internal_.type);
-}
-
-User& Relationship::GetUser()
-{
-    return reinterpret_cast<User&>(internal_.user);
-}
-
-User const& Relationship::GetUser() const
-{
-    return reinterpret_cast<User const&>(internal_.user);
-}
-
-Presence& Relationship::GetPresence()
-{
-    return reinterpret_cast<Presence&>(internal_.presence);
-}
-
-Presence const& Relationship::GetPresence() const
-{
-    return reinterpret_cast<Presence const&>(internal_.presence);
-}
-
-void Lobby::SetId(LobbyId id)
-{
-    internal_.id = id;
-}
-
-LobbyId Lobby::GetId() const
-{
-    return internal_.id;
-}
-
-void Lobby::SetType(LobbyType type)
-{
-    internal_.type = static_cast<EDiscordLobbyType>(type);
-}
-
-LobbyType Lobby::GetType() const
-{
-    return static_cast<LobbyType>(internal_.type);
-}
-
-void Lobby::SetOwnerId(UserId ownerId)
-{
-    internal_.owner_id = ownerId;
-}
-
-UserId Lobby::GetOwnerId() const
-{
-    return internal_.owner_id;
-}
-
-void Lobby::SetSecret(LobbySecret secret)
-{
-    strncpy(internal_.secret, secret, 128);
-    internal_.secret[128 - 1] = '\0';
-}
-
-LobbySecret Lobby::GetSecret() const
-{
-    return internal_.secret;
-}
-
-void Lobby::SetCapacity(std::uint32_t capacity)
-{
-    internal_.capacity = capacity;
-}
-
-std::uint32_t Lobby::GetCapacity() const
-{
-    return internal_.capacity;
-}
-
-void Lobby::SetLocked(bool locked)
-{
-    internal_.locked = locked;
-}
-
-bool Lobby::GetLocked() const
-{
-    return internal_.locked != 0;
-}
-
-void FileStat::SetFilename(char const* filename)
-{
-    strncpy(internal_.filename, filename, 260);
-    internal_.filename[260 - 1] = '\0';
-}
-
-char const* FileStat::GetFilename() const
-{
-    return internal_.filename;
-}
-
-void FileStat::SetSize(std::uint64_t size)
-{
-    internal_.size = size;
-}
-
-std::uint64_t FileStat::GetSize() const
-{
-    return internal_.size;
-}
-
-void FileStat::SetLastModified(std::uint64_t lastModified)
-{
-    internal_.last_modified = lastModified;
-}
-
-std::uint64_t FileStat::GetLastModified() const
-{
-    return internal_.last_modified;
-}
-
-void Entitlement::SetId(Snowflake id)
-{
-    internal_.id = id;
-}
-
-Snowflake Entitlement::GetId() const
-{
-    return internal_.id;
-}
-
-void Entitlement::SetType(EntitlementType type)
-{
-    internal_.type = static_cast<EDiscordEntitlementType>(type);
-}
-
-EntitlementType Entitlement::GetType() const
-{
-    return static_cast<EntitlementType>(internal_.type);
-}
-
-void Entitlement::SetSkuId(Snowflake skuId)
-{
-    internal_.sku_id = skuId;
-}
-
-Snowflake Entitlement::GetSkuId() const
-{
-    return internal_.sku_id;
-}
-
-void SkuPrice::SetAmount(std::uint32_t amount)
-{
-    internal_.amount = amount;
-}
-
-std::uint32_t SkuPrice::GetAmount() const
-{
-    return internal_.amount;
-}
-
-void SkuPrice::SetCurrency(char const* currency)
-{
-    strncpy(internal_.currency, currency, 16);
-    internal_.currency[16 - 1] = '\0';
-}
-
-char const* SkuPrice::GetCurrency() const
-{
-    return internal_.currency;
-}
-
-void Sku::SetId(Snowflake id)
-{
-    internal_.id = id;
-}
-
-Snowflake Sku::GetId() const
-{
-    return internal_.id;
-}
-
-void Sku::SetType(SkuType type)
-{
-    internal_.type = static_cast<EDiscordSkuType>(type);
-}
-
-SkuType Sku::GetType() const
-{
-    return static_cast<SkuType>(internal_.type);
-}
-
-void Sku::SetName(char const* name)
-{
-    strncpy(internal_.name, name, 256);
-    internal_.name[256 - 1] = '\0';
-}
-
-char const* Sku::GetName() const
-{
-    return internal_.name;
-}
-
-SkuPrice& Sku::GetPrice()
-{
-    return reinterpret_cast<SkuPrice&>(internal_.price);
-}
-
-SkuPrice const& Sku::GetPrice() const
-{
-    return reinterpret_cast<SkuPrice const&>(internal_.price);
-}
-
-void InputMode::SetType(InputModeType type)
-{
-    internal_.type = static_cast<EDiscordInputModeType>(type);
-}
-
-InputModeType InputMode::GetType() const
-{
-    return static_cast<InputModeType>(internal_.type);
-}
-
-void InputMode::SetShortcut(char const* shortcut)
-{
-    strncpy(internal_.shortcut, shortcut, 256);
-    internal_.shortcut[256 - 1] = '\0';
-}
-
-char const* InputMode::GetShortcut() const
-{
-    return internal_.shortcut;
-}
-
-void UserAchievement::SetUserId(Snowflake userId)
-{
-    internal_.user_id = userId;
-}
-
-Snowflake UserAchievement::GetUserId() const
-{
-    return internal_.user_id;
-}
-
-void UserAchievement::SetAchievementId(Snowflake achievementId)
-{
-    internal_.achievement_id = achievementId;
-}
-
-Snowflake UserAchievement::GetAchievementId() const
-{
-    return internal_.achievement_id;
-}
-
-void UserAchievement::SetPercentComplete(std::uint8_t percentComplete)
-{
-    internal_.percent_complete = percentComplete;
-}
-
-std::uint8_t UserAchievement::GetPercentComplete() const
-{
-    return internal_.percent_complete;
-}
-
-void UserAchievement::SetUnlockedAt(DateTime unlockedAt)
-{
-    strncpy(internal_.unlocked_at, unlockedAt, 64);
-    internal_.unlocked_at[64 - 1] = '\0';
-}
-
-DateTime UserAchievement::GetUnlockedAt() const
-{
-    return internal_.unlocked_at;
-}
-
-Result LobbyTransaction::SetType(LobbyType type)
-{
-    auto result = internal_->set_type(internal_, static_cast<EDiscordLobbyType>(type));
-    return static_cast<Result>(result);
-}
-
-Result LobbyTransaction::SetOwner(UserId ownerId)
-{
-    auto result = internal_->set_owner(internal_, ownerId);
-    return static_cast<Result>(result);
-}
-
-Result LobbyTransaction::SetCapacity(std::uint32_t capacity)
-{
-    auto result = internal_->set_capacity(internal_, capacity);
-    return static_cast<Result>(result);
-}
-
-Result LobbyTransaction::SetMetadata(MetadataKey key, MetadataValue value)
-{
-    auto result =
-      internal_->set_metadata(internal_, const_cast<char*>(key), const_cast<char*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbyTransaction::DeleteMetadata(MetadataKey key)
-{
-    auto result = internal_->delete_metadata(internal_, const_cast<char*>(key));
-    return static_cast<Result>(result);
-}
-
-Result LobbyTransaction::SetLocked(bool locked)
-{
-    auto result = internal_->set_locked(internal_, (locked ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result LobbyMemberTransaction::SetMetadata(MetadataKey key, MetadataValue value)
-{
-    auto result =
-      internal_->set_metadata(internal_, const_cast<char*>(key), const_cast<char*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbyMemberTransaction::DeleteMetadata(MetadataKey key)
-{
-    auto result = internal_->delete_metadata(internal_, const_cast<char*>(key));
-    return static_cast<Result>(result);
-}
-
-Result LobbySearchQuery::Filter(MetadataKey key,
-                                LobbySearchComparison comparison,
-                                LobbySearchCast cast,
-                                MetadataValue value)
-{
-    auto result = internal_->filter(internal_,
-                                    const_cast<char*>(key),
-                                    static_cast<EDiscordLobbySearchComparison>(comparison),
-                                    static_cast<EDiscordLobbySearchCast>(cast),
-                                    const_cast<char*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbySearchQuery::Sort(MetadataKey key, LobbySearchCast cast, MetadataValue value)
-{
-    auto result = internal_->sort(internal_,
-                                  const_cast<char*>(key),
-                                  static_cast<EDiscordLobbySearchCast>(cast),
-                                  const_cast<char*>(value));
-    return static_cast<Result>(result);
-}
-
-Result LobbySearchQuery::Limit(std::uint32_t limit)
-{
-    auto result = internal_->limit(internal_, limit);
-    return static_cast<Result>(result);
-}
-
-Result LobbySearchQuery::Distance(LobbySearchDistance distance)
-{
-    auto result =
-      internal_->distance(internal_, static_cast<EDiscordLobbySearchDistance>(distance));
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/types.h

@@ -1,491 +0,0 @@
-#pragma once
-
-#include "ffi.h"
-#include "event.h"
-
-namespace discord {
-
-enum class Result {
-    Ok = 0,
-    ServiceUnavailable = 1,
-    InvalidVersion = 2,
-    LockFailed = 3,
-    InternalError = 4,
-    InvalidPayload = 5,
-    InvalidCommand = 6,
-    InvalidPermissions = 7,
-    NotFetched = 8,
-    NotFound = 9,
-    Conflict = 10,
-    InvalidSecret = 11,
-    InvalidJoinSecret = 12,
-    NoEligibleActivity = 13,
-    InvalidInvite = 14,
-    NotAuthenticated = 15,
-    InvalidAccessToken = 16,
-    ApplicationMismatch = 17,
-    InvalidDataUrl = 18,
-    InvalidBase64 = 19,
-    NotFiltered = 20,
-    LobbyFull = 21,
-    InvalidLobbySecret = 22,
-    InvalidFilename = 23,
-    InvalidFileSize = 24,
-    InvalidEntitlement = 25,
-    NotInstalled = 26,
-    NotRunning = 27,
-    InsufficientBuffer = 28,
-    PurchaseCanceled = 29,
-    InvalidGuild = 30,
-    InvalidEvent = 31,
-    InvalidChannel = 32,
-    InvalidOrigin = 33,
-    RateLimited = 34,
-    OAuth2Error = 35,
-    SelectChannelTimeout = 36,
-    GetGuildTimeout = 37,
-    SelectVoiceForceRequired = 38,
-    CaptureShortcutAlreadyListening = 39,
-    UnauthorizedForAchievement = 40,
-    InvalidGiftCode = 41,
-    PurchaseError = 42,
-    TransactionAborted = 43,
-};
-
-enum class CreateFlags {
-    Default = 0,
-    NoRequireDiscord = 1,
-};
-
-enum class LogLevel {
-    Error = 1,
-    Warn,
-    Info,
-    Debug,
-};
-
-enum class UserFlag {
-    Partner = 2,
-    HypeSquadEvents = 4,
-    HypeSquadHouse1 = 64,
-    HypeSquadHouse2 = 128,
-    HypeSquadHouse3 = 256,
-};
-
-enum class PremiumType {
-    None = 0,
-    Tier1 = 1,
-    Tier2 = 2,
-};
-
-enum class ImageType {
-    User,
-};
-
-enum class ActivityType {
-    Playing,
-    Streaming,
-    Listening,
-    Watching,
-};
-
-enum class ActivityActionType {
-    Join = 1,
-    Spectate,
-};
-
-enum class ActivityJoinRequestReply {
-    No,
-    Yes,
-    Ignore,
-};
-
-enum class Status {
-    Offline = 0,
-    Online = 1,
-    Idle = 2,
-    DoNotDisturb = 3,
-};
-
-enum class RelationshipType {
-    None,
-    Friend,
-    Blocked,
-    PendingIncoming,
-    PendingOutgoing,
-    Implicit,
-};
-
-enum class LobbyType {
-    Private = 1,
-    Public,
-};
-
-enum class LobbySearchComparison {
-    LessThanOrEqual = -2,
-    LessThan,
-    Equal,
-    GreaterThan,
-    GreaterThanOrEqual,
-    NotEqual,
-};
-
-enum class LobbySearchCast {
-    String = 1,
-    Number,
-};
-
-enum class LobbySearchDistance {
-    Local,
-    Default,
-    Extended,
-    Global,
-};
-
-enum class EntitlementType {
-    Purchase = 1,
-    PremiumSubscription,
-    DeveloperGift,
-    TestModePurchase,
-    FreePurchase,
-    UserGift,
-    PremiumPurchase,
-};
-
-enum class SkuType {
-    Application = 1,
-    DLC,
-    Consumable,
-    Bundle,
-};
-
-enum class InputModeType {
-    VoiceActivity = 0,
-    PushToTalk,
-};
-
-using ClientId = std::int64_t;
-using Version = std::int32_t;
-using Snowflake = std::int64_t;
-using Timestamp = std::int64_t;
-using UserId = Snowflake;
-using Locale = char const*;
-using Branch = char const*;
-using LobbyId = Snowflake;
-using LobbySecret = char const*;
-using MetadataKey = char const*;
-using MetadataValue = char const*;
-using NetworkPeerId = std::uint64_t;
-using NetworkChannelId = std::uint8_t;
-using Path = char const*;
-using DateTime = char const*;
-
-class User final {
-public:
-    void SetId(UserId id);
-    UserId GetId() const;
-    void SetUsername(char const* username);
-    char const* GetUsername() const;
-    void SetDiscriminator(char const* discriminator);
-    char const* GetDiscriminator() const;
-    void SetAvatar(char const* avatar);
-    char const* GetAvatar() const;
-    void SetBot(bool bot);
-    bool GetBot() const;
-
-private:
-    DiscordUser internal_;
-};
-
-class OAuth2Token final {
-public:
-    void SetAccessToken(char const* accessToken);
-    char const* GetAccessToken() const;
-    void SetScopes(char const* scopes);
-    char const* GetScopes() const;
-    void SetExpires(Timestamp expires);
-    Timestamp GetExpires() const;
-
-private:
-    DiscordOAuth2Token internal_;
-};
-
-class ImageHandle final {
-public:
-    void SetType(ImageType type);
-    ImageType GetType() const;
-    void SetId(std::int64_t id);
-    std::int64_t GetId() const;
-    void SetSize(std::uint32_t size);
-    std::uint32_t GetSize() const;
-
-private:
-    DiscordImageHandle internal_;
-};
-
-class ImageDimensions final {
-public:
-    void SetWidth(std::uint32_t width);
-    std::uint32_t GetWidth() const;
-    void SetHeight(std::uint32_t height);
-    std::uint32_t GetHeight() const;
-
-private:
-    DiscordImageDimensions internal_;
-};
-
-class ActivityTimestamps final {
-public:
-    void SetStart(Timestamp start);
-    Timestamp GetStart() const;
-    void SetEnd(Timestamp end);
-    Timestamp GetEnd() const;
-
-private:
-    DiscordActivityTimestamps internal_;
-};
-
-class ActivityAssets final {
-public:
-    void SetLargeImage(char const* largeImage);
-    char const* GetLargeImage() const;
-    void SetLargeText(char const* largeText);
-    char const* GetLargeText() const;
-    void SetSmallImage(char const* smallImage);
-    char const* GetSmallImage() const;
-    void SetSmallText(char const* smallText);
-    char const* GetSmallText() const;
-
-private:
-    DiscordActivityAssets internal_;
-};
-
-class PartySize final {
-public:
-    void SetCurrentSize(std::int32_t currentSize);
-    std::int32_t GetCurrentSize() const;
-    void SetMaxSize(std::int32_t maxSize);
-    std::int32_t GetMaxSize() const;
-
-private:
-    DiscordPartySize internal_;
-};
-
-class ActivityParty final {
-public:
-    void SetId(char const* id);
-    char const* GetId() const;
-    PartySize& GetSize();
-    PartySize const& GetSize() const;
-
-private:
-    DiscordActivityParty internal_;
-};
-
-class ActivitySecrets final {
-public:
-    void SetMatch(char const* match);
-    char const* GetMatch() const;
-    void SetJoin(char const* join);
-    char const* GetJoin() const;
-    void SetSpectate(char const* spectate);
-    char const* GetSpectate() const;
-
-private:
-    DiscordActivitySecrets internal_;
-};
-
-class Activity final {
-public:
-    void SetType(ActivityType type);
-    ActivityType GetType() const;
-    void SetApplicationId(std::int64_t applicationId);
-    std::int64_t GetApplicationId() const;
-    void SetName(char const* name);
-    char const* GetName() const;
-    void SetState(char const* state);
-    char const* GetState() const;
-    void SetDetails(char const* details);
-    char const* GetDetails() const;
-    ActivityTimestamps& GetTimestamps();
-    ActivityTimestamps const& GetTimestamps() const;
-    ActivityAssets& GetAssets();
-    ActivityAssets const& GetAssets() const;
-    ActivityParty& GetParty();
-    ActivityParty const& GetParty() const;
-    ActivitySecrets& GetSecrets();
-    ActivitySecrets const& GetSecrets() const;
-    void SetInstance(bool instance);
-    bool GetInstance() const;
-
-private:
-    DiscordActivity internal_;
-};
-
-class Presence final {
-public:
-    void SetStatus(Status status);
-    Status GetStatus() const;
-    Activity& GetActivity();
-    Activity const& GetActivity() const;
-
-private:
-    DiscordPresence internal_;
-};
-
-class Relationship final {
-public:
-    void SetType(RelationshipType type);
-    RelationshipType GetType() const;
-    User& GetUser();
-    User const& GetUser() const;
-    Presence& GetPresence();
-    Presence const& GetPresence() const;
-
-private:
-    DiscordRelationship internal_;
-};
-
-class Lobby final {
-public:
-    void SetId(LobbyId id);
-    LobbyId GetId() const;
-    void SetType(LobbyType type);
-    LobbyType GetType() const;
-    void SetOwnerId(UserId ownerId);
-    UserId GetOwnerId() const;
-    void SetSecret(LobbySecret secret);
-    LobbySecret GetSecret() const;
-    void SetCapacity(std::uint32_t capacity);
-    std::uint32_t GetCapacity() const;
-    void SetLocked(bool locked);
-    bool GetLocked() const;
-
-private:
-    DiscordLobby internal_;
-};
-
-class FileStat final {
-public:
-    void SetFilename(char const* filename);
-    char const* GetFilename() const;
-    void SetSize(std::uint64_t size);
-    std::uint64_t GetSize() const;
-    void SetLastModified(std::uint64_t lastModified);
-    std::uint64_t GetLastModified() const;
-
-private:
-    DiscordFileStat internal_;
-};
-
-class Entitlement final {
-public:
-    void SetId(Snowflake id);
-    Snowflake GetId() const;
-    void SetType(EntitlementType type);
-    EntitlementType GetType() const;
-    void SetSkuId(Snowflake skuId);
-    Snowflake GetSkuId() const;
-
-private:
-    DiscordEntitlement internal_;
-};
-
-class SkuPrice final {
-public:
-    void SetAmount(std::uint32_t amount);
-    std::uint32_t GetAmount() const;
-    void SetCurrency(char const* currency);
-    char const* GetCurrency() const;
-
-private:
-    DiscordSkuPrice internal_;
-};
-
-class Sku final {
-public:
-    void SetId(Snowflake id);
-    Snowflake GetId() const;
-    void SetType(SkuType type);
-    SkuType GetType() const;
-    void SetName(char const* name);
-    char const* GetName() const;
-    SkuPrice& GetPrice();
-    SkuPrice const& GetPrice() const;
-
-private:
-    DiscordSku internal_;
-};
-
-class InputMode final {
-public:
-    void SetType(InputModeType type);
-    InputModeType GetType() const;
-    void SetShortcut(char const* shortcut);
-    char const* GetShortcut() const;
-
-private:
-    DiscordInputMode internal_;
-};
-
-class UserAchievement final {
-public:
-    void SetUserId(Snowflake userId);
-    Snowflake GetUserId() const;
-    void SetAchievementId(Snowflake achievementId);
-    Snowflake GetAchievementId() const;
-    void SetPercentComplete(std::uint8_t percentComplete);
-    std::uint8_t GetPercentComplete() const;
-    void SetUnlockedAt(DateTime unlockedAt);
-    DateTime GetUnlockedAt() const;
-
-private:
-    DiscordUserAchievement internal_;
-};
-
-class LobbyTransaction final {
-public:
-    Result SetType(LobbyType type);
-    Result SetOwner(UserId ownerId);
-    Result SetCapacity(std::uint32_t capacity);
-    Result SetMetadata(MetadataKey key, MetadataValue value);
-    Result DeleteMetadata(MetadataKey key);
-    Result SetLocked(bool locked);
-
-    IDiscordLobbyTransaction** Receive() { return &internal_; }
-    IDiscordLobbyTransaction* Internal() { return internal_; }
-
-private:
-    IDiscordLobbyTransaction* internal_;
-};
-
-class LobbyMemberTransaction final {
-public:
-    Result SetMetadata(MetadataKey key, MetadataValue value);
-    Result DeleteMetadata(MetadataKey key);
-
-    IDiscordLobbyMemberTransaction** Receive() { return &internal_; }
-    IDiscordLobbyMemberTransaction* Internal() { return internal_; }
-
-private:
-    IDiscordLobbyMemberTransaction* internal_;
-};
-
-class LobbySearchQuery final {
-public:
-    Result Filter(MetadataKey key,
-                  LobbySearchComparison comparison,
-                  LobbySearchCast cast,
-                  MetadataValue value);
-    Result Sort(MetadataKey key, LobbySearchCast cast, MetadataValue value);
-    Result Limit(std::uint32_t limit);
-    Result Distance(LobbySearchDistance distance);
-
-    IDiscordLobbySearchQuery** Receive() { return &internal_; }
-    IDiscordLobbySearchQuery* Internal() { return internal_; }
-
-private:
-    IDiscordLobbySearchQuery* internal_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/user_manager.cpp

@@ -1,80 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "user_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class UserEvents final {
-public:
-    static void OnCurrentUserUpdate(void* callbackData)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->UserManager();
-        module.OnCurrentUserUpdate();
-    }
-};
-
-IDiscordUserEvents UserManager::events_{
-  &UserEvents::OnCurrentUserUpdate,
-};
-
-Result UserManager::GetCurrentUser(User* currentUser)
-{
-    if (!currentUser) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_current_user(internal_, reinterpret_cast<DiscordUser*>(currentUser));
-    return static_cast<Result>(result);
-}
-
-void UserManager::GetUser(UserId userId, std::function<void(Result, User const&)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result, DiscordUser* user) -> void {
-        std::unique_ptr<std::function<void(Result, User const&)>> cb(
-          reinterpret_cast<std::function<void(Result, User const&)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result), *reinterpret_cast<User const*>(user));
-    };
-    std::unique_ptr<std::function<void(Result, User const&)>> cb{};
-    cb.reset(new std::function<void(Result, User const&)>(std::move(callback)));
-    internal_->get_user(internal_, userId, cb.release(), wrapper);
-}
-
-Result UserManager::GetCurrentUserPremiumType(PremiumType* premiumType)
-{
-    if (!premiumType) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->get_current_user_premium_type(
-      internal_, reinterpret_cast<EDiscordPremiumType*>(premiumType));
-    return static_cast<Result>(result);
-}
-
-Result UserManager::CurrentUserHasFlag(UserFlag flag, bool* hasFlag)
-{
-    if (!hasFlag) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->current_user_has_flag(
-      internal_, static_cast<EDiscordUserFlag>(flag), reinterpret_cast<bool*>(hasFlag));
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/user_manager.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class UserManager final {
-public:
-    ~UserManager() = default;
-
-    Result GetCurrentUser(User* currentUser);
-    void GetUser(UserId userId, std::function<void(Result, User const&)> callback);
-    Result GetCurrentUserPremiumType(PremiumType* premiumType);
-    Result CurrentUserHasFlag(UserFlag flag, bool* hasFlag);
-
-    Event<> OnCurrentUserUpdate;
-
-private:
-    friend class Core;
-
-    UserManager() = default;
-    UserManager(UserManager const& rhs) = delete;
-    UserManager& operator=(UserManager const& rhs) = delete;
-    UserManager(UserManager&& rhs) = delete;
-    UserManager& operator=(UserManager&& rhs) = delete;
-
-    IDiscordUserManager* internal_;
-    static IDiscordUserEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/cpp/voice_manager.cpp

@@ -1,124 +0,0 @@
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "voice_manager.h"
-
-#include "core.h"
-
-#include <cstring>
-#include <memory>
-
-namespace discord {
-
-class VoiceEvents final {
-public:
-    static void OnSettingsUpdate(void* callbackData)
-    {
-        auto* core = reinterpret_cast<Core*>(callbackData);
-        if (!core) {
-            return;
-        }
-
-        auto& module = core->VoiceManager();
-        module.OnSettingsUpdate();
-    }
-};
-
-IDiscordVoiceEvents VoiceManager::events_{
-  &VoiceEvents::OnSettingsUpdate,
-};
-
-Result VoiceManager::GetInputMode(InputMode* inputMode)
-{
-    if (!inputMode) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_input_mode(internal_, reinterpret_cast<DiscordInputMode*>(inputMode));
-    return static_cast<Result>(result);
-}
-
-void VoiceManager::SetInputMode(InputMode inputMode, std::function<void(Result)> callback)
-{
-    static auto wrapper = [](void* callbackData, EDiscordResult result) -> void {
-        std::unique_ptr<std::function<void(Result)>> cb(
-          reinterpret_cast<std::function<void(Result)>*>(callbackData));
-        if (!cb || !(*cb)) {
-            return;
-        }
-        (*cb)(static_cast<Result>(result));
-    };
-    std::unique_ptr<std::function<void(Result)>> cb{};
-    cb.reset(new std::function<void(Result)>(std::move(callback)));
-    internal_->set_input_mode(
-      internal_, *reinterpret_cast<DiscordInputMode const*>(&inputMode), cb.release(), wrapper);
-}
-
-Result VoiceManager::IsSelfMute(bool* mute)
-{
-    if (!mute) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->is_self_mute(internal_, reinterpret_cast<bool*>(mute));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::SetSelfMute(bool mute)
-{
-    auto result = internal_->set_self_mute(internal_, (mute ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::IsSelfDeaf(bool* deaf)
-{
-    if (!deaf) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->is_self_deaf(internal_, reinterpret_cast<bool*>(deaf));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::SetSelfDeaf(bool deaf)
-{
-    auto result = internal_->set_self_deaf(internal_, (deaf ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::IsLocalMute(Snowflake userId, bool* mute)
-{
-    if (!mute) {
-        return Result::InternalError;
-    }
-
-    auto result = internal_->is_local_mute(internal_, userId, reinterpret_cast<bool*>(mute));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::SetLocalMute(Snowflake userId, bool mute)
-{
-    auto result = internal_->set_local_mute(internal_, userId, (mute ? 1 : 0));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::GetLocalVolume(Snowflake userId, std::uint8_t* volume)
-{
-    if (!volume) {
-        return Result::InternalError;
-    }
-
-    auto result =
-      internal_->get_local_volume(internal_, userId, reinterpret_cast<uint8_t*>(volume));
-    return static_cast<Result>(result);
-}
-
-Result VoiceManager::SetLocalVolume(Snowflake userId, std::uint8_t volume)
-{
-    auto result = internal_->set_local_volume(internal_, userId, volume);
-    return static_cast<Result>(result);
-}
-
-} // namespace discord

libs/discordGameSDK/cpp/voice_manager.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-namespace discord {
-
-class VoiceManager final {
-public:
-    ~VoiceManager() = default;
-
-    Result GetInputMode(InputMode* inputMode);
-    void SetInputMode(InputMode inputMode, std::function<void(Result)> callback);
-    Result IsSelfMute(bool* mute);
-    Result SetSelfMute(bool mute);
-    Result IsSelfDeaf(bool* deaf);
-    Result SetSelfDeaf(bool deaf);
-    Result IsLocalMute(Snowflake userId, bool* mute);
-    Result SetLocalMute(Snowflake userId, bool mute);
-    Result GetLocalVolume(Snowflake userId, std::uint8_t* volume);
-    Result SetLocalVolume(Snowflake userId, std::uint8_t volume);
-
-    Event<> OnSettingsUpdate;
-
-private:
-    friend class Core;
-
-    VoiceManager() = default;
-    VoiceManager(VoiceManager const& rhs) = delete;
-    VoiceManager& operator=(VoiceManager const& rhs) = delete;
-    VoiceManager(VoiceManager&& rhs) = delete;
-    VoiceManager& operator=(VoiceManager&& rhs) = delete;
-
-    IDiscordVoiceManager* internal_;
-    static IDiscordVoiceEvents events_;
-};
-
-} // namespace discord

libs/discordGameSDK/csharp/ActivityManager.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Discord
-{
-    public partial class ActivityManager
-    {
-        public void RegisterCommand()
-        {
-            RegisterCommand(null);
-        }
-    }
-}

libs/discordGameSDK/csharp/Constants.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Discord
-{
-    static class Constants
-    {
-        public const string DllName = "discord_game_sdk";
-    }
-}

libs/discordGameSDK/csharp/ImageManager.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-#if UNITY_EDITOR || UNITY_STANDALONE
-using UnityEngine;
-#endif
-
-namespace Discord
-{
-	public partial struct ImageHandle
-    {
-        static public ImageHandle User(Int64 id)
-        {
-            return User(id, 128);
-        }
-
-        static public ImageHandle User(Int64 id, UInt32 size)
-        {
-            return new ImageHandle
-            {
-                Type = ImageType.User,
-                Id = id,
-                Size = size,
-            };
-        }
-    }
-
-    public partial class ImageManager
-    {
-        public void Fetch(ImageHandle handle, FetchHandler callback)
-        {
-            Fetch(handle, false, callback);
-        }
-
-        public byte[] GetData(ImageHandle handle)
-        {
-            var dimensions = GetDimensions(handle);
-            var data = new byte[dimensions.Width * dimensions.Height * 4];
-            GetData(handle, data);
-            return data;
-        }
-
-#if UNITY_EDITOR || UNITY_STANDALONE
-        public Texture2D GetTexture(ImageHandle handle)
-        {
-            var dimensions = GetDimensions(handle);
-            var texture = new Texture2D((int)dimensions.Width, (int)dimensions.Height, TextureFormat.RGBA32, false, true);
-            texture.LoadRawTextureData(GetData(handle));
-            texture.Apply();
-            return texture;
-        }
-#endif
-    }
-}

libs/discordGameSDK/csharp/LobbyManager.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Discord
-{
-    public partial class LobbyManager
-    {
-        public IEnumerable<User> GetMemberUsers(Int64 lobbyID)
-        {
-            var memberCount = MemberCount(lobbyID);
-            var members = new List<User>();
-            for (var i = 0; i < memberCount; i++)
-            {
-                members.Add(GetMemberUser(lobbyID, GetMemberUserId(lobbyID, i)));
-            }
-            return members;
-        }
-
-        public void SendLobbyMessage(Int64 lobbyID, string data, SendLobbyMessageHandler handler)
-        {
-            SendLobbyMessage(lobbyID, Encoding.UTF8.GetBytes(data), handler);
-        }
-    }
-}

libs/discordGameSDK/csharp/StorageManager.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Discord
-{
-    public partial class StorageManager
-    {
-        public IEnumerable<FileStat> Files()
-        {
-            var fileCount = Count();
-            var files = new List<FileStat>();
-            for (var i = 0; i < fileCount; i++)
-            {
-                files.Add(StatAt(i));
-            }
-            return files;
-        }
-    }
-}

libs/discordGameSDK/csharp/StoreManager.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Discord
-{
-    public partial class StoreManager
-    {
-        public IEnumerable<Entitlement> GetEntitlements()
-        {
-            var count = CountEntitlements();
-            var entitlements = new List<Entitlement>();
-            for (var i = 0; i < count; i++)
-            {
-                entitlements.Add(GetEntitlementAt(i));
-            }
-            return entitlements;
-        }
-
-        public IEnumerable<Sku> GetSkus()
-        {
-            var count = CountSkus();
-            var skus = new List<Sku>();
-            for (var i = 0; i < count; i++)
-            {
-                skus.Add(GetSkuAt(i));
-            }
-            return skus;
-        }
-    }
-}

libs/discordGameSDK/examples/c/main.c

@@ -1,155 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <assert.h>
-#include "discord_game_sdk.h"
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <unistd.h>
-#include <string.h>
-#endif
-
-#define DISCORD_REQUIRE(x) assert(x == DiscordResult_Ok)
-
-struct Application {
-    struct IDiscordCore* core;
-    struct IDiscordUserManager* users;
-    struct IDiscordAchievementManager* achievements;
-    struct IDiscordActivityManager* activities;
-    struct IDiscordRelationshipManager* relationships;
-    struct IDiscordApplicationManager* application;
-    struct IDiscordLobbyManager* lobbies;
-    DiscordUserId user_id;
-};
-
-void UpdateActivityCallback(void* data, enum EDiscordResult result)
-{
-    DISCORD_REQUIRE(result);
-}
-
-int RelationshipPassFilter(void* data, struct DiscordRelationship* relationship)
-{
-    return (relationship->type == DiscordRelationshipType_Friend);
-}
-
-int RelationshipSnowflakeFilter(void* data, struct DiscordRelationship* relationship)
-{
-    struct Application* app = (struct Application*)data;
-
-    return (relationship->type == DiscordRelationshipType_Friend &&
-            relationship->user.id < app->user_id);
-}
-
-void OnRelationshipsRefresh(void* data)
-{
-    struct Application* app = (struct Application*)data;
-    struct IDiscordRelationshipManager* module = app->relationships;
-
-    module->filter(module, app, RelationshipPassFilter);
-
-    int32_t unfiltered_count = 0;
-    DISCORD_REQUIRE(module->count(module, &unfiltered_count));
-
-    module->filter(module, app, RelationshipSnowflakeFilter);
-
-    int32_t filtered_count = 0;
-    DISCORD_REQUIRE(module->count(module, &filtered_count));
-
-    printf("=== Cool Friends ===\n");
-    for (int32_t i = 0; i < filtered_count; i += 1) {
-        struct DiscordRelationship relationship;
-        DISCORD_REQUIRE(module->get_at(module, i, &relationship));
-
-        printf("%lld %s#%s\n",
-               relationship.user.id,
-               relationship.user.username,
-               relationship.user.discriminator);
-    }
-    printf("(%d friends less cool than you omitted)\n", unfiltered_count - filtered_count);
-
-    struct DiscordActivity activity;
-    memset(&activity, 0, sizeof(activity));
-    sprintf(activity.details, "Cooler than %d friends", unfiltered_count - filtered_count);
-    sprintf(activity.state, "%d friends total", unfiltered_count);
-
-    app->activities->update_activity(app->activities, &activity, app, UpdateActivityCallback);
-}
-
-void OnUserUpdated(void* data)
-{
-    struct Application* app = (struct Application*)data;
-    struct DiscordUser user;
-    app->users->get_current_user(app->users, &user);
-    app->user_id = user.id;
-}
-
-void OnOAuth2Token(void* data, enum EDiscordResult result, struct DiscordOAuth2Token* token)
-{
-    if (result == DiscordResult_Ok) {
-        printf("OAuth2 token: %s\n", token->access_token);
-    }
-    else {
-        printf("GetOAuth2Token failed with %d\n", (int)result);
-    }
-}
-
-void OnLobbyConnect(void* data, enum EDiscordResult result, struct DiscordLobby* lobby)
-{
-    printf("LobbyConnect returned %d\n", (int)result);
-}
-
-int main(int argc, char** argv)
-{
-    struct Application app;
-    memset(&app, 0, sizeof(app));
-
-    struct IDiscordUserEvents users_events;
-    memset(&users_events, 0, sizeof(users_events));
-    users_events.on_current_user_update = OnUserUpdated;
-
-    struct IDiscordActivityEvents activities_events;
-    memset(&activities_events, 0, sizeof(activities_events));
-
-    struct IDiscordRelationshipEvents relationships_events;
-    memset(&relationships_events, 0, sizeof(relationships_events));
-    relationships_events.on_refresh = OnRelationshipsRefresh;
-
-    struct DiscordCreateParams params;
-    DiscordCreateParamsSetDefault(&params);
-    params.client_id = 418559331265675294;
-    params.flags = DiscordCreateFlags_Default;
-    params.event_data = &app;
-    params.activity_events = &activities_events;
-    params.relationship_events = &relationships_events;
-    params.user_events = &users_events;
-    DISCORD_REQUIRE(DiscordCreate(DISCORD_VERSION, &params, &app.core));
-
-    app.users = app.core->get_user_manager(app.core);
-    app.achievements = app.core->get_achievement_manager(app.core);
-    app.activities = app.core->get_activity_manager(app.core);
-    app.application = app.core->get_application_manager(app.core);
-    app.lobbies = app.core->get_lobby_manager(app.core);
-
-    app.lobbies->connect_lobby_with_activity_secret(
-      app.lobbies, "invalid_secret", &app, OnLobbyConnect);
-
-    app.application->get_oauth2_token(app.application, &app, OnOAuth2Token);
-
-    DiscordBranch branch;
-    app.application->get_current_branch(app.application, &branch);
-    printf("Current branch %s\n", branch);
-
-    app.relationships = app.core->get_relationship_manager(app.core);
-
-    for (;;) {
-        DISCORD_REQUIRE(app.core->run_callbacks(app.core));
-
-#ifdef _WIN32
-        Sleep(16);
-#else
-        usleep(16 * 1000);
-#endif
-    }
-
-    return 0;
-}

libs/discordGameSDK/examples/cpp/main.cpp

@@ -1,297 +0,0 @@
-#define _CRT_SECURE_NO_WARNINGS
-
-#include <array>
-#include <cassert>
-#include <csignal>
-#include <cstdio>
-#include <cstdlib>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "discord.h"
-
-#if defined(_WIN32)
-#pragma pack(push, 1)
-struct BitmapImageHeader {
-    uint32_t const structSize{sizeof(BitmapImageHeader)};
-    int32_t width{0};
-    int32_t height{0};
-    uint16_t const planes{1};
-    uint16_t const bpp{32};
-    uint32_t const pad0{0};
-    uint32_t const pad1{0};
-    uint32_t const hres{2835};
-    uint32_t const vres{2835};
-    uint32_t const pad4{0};
-    uint32_t const pad5{0};
-
-    BitmapImageHeader& operator=(BitmapImageHeader const&) = delete;
-};
-
-struct BitmapFileHeader {
-    uint8_t const magic0{'B'};
-    uint8_t const magic1{'M'};
-    uint32_t size{0};
-    uint32_t const pad{0};
-    uint32_t const offset{sizeof(BitmapFileHeader) + sizeof(BitmapImageHeader)};
-
-    BitmapFileHeader& operator=(BitmapFileHeader const&) = delete;
-};
-#pragma pack(pop)
-#endif
-
-struct DiscordState {
-    discord::User currentUser;
-
-    std::unique_ptr<discord::Core> core;
-};
-
-namespace {
-volatile bool interrupted{false};
-}
-
-int main(int, char**)
-{
-    DiscordState state{};
-
-    discord::Core* core{};
-    auto result = discord::Core::Create(310270644849737729, DiscordCreateFlags_Default, &core);
-    state.core.reset(core);
-    if (!state.core) {
-        std::cout << "Failed to instantiate discord core! (err " << static_cast<int>(result)
-                  << ")\n";
-        std::exit(-1);
-    }
-
-    state.core->SetLogHook(
-      discord::LogLevel::Debug, [](discord::LogLevel level, const char* message) {
-          std::cerr << "Log(" << static_cast<uint32_t>(level) << "): " << message << "\n";
-      });
-
-    core->UserManager().OnCurrentUserUpdate.Connect([&state]() {
-        state.core->UserManager().GetCurrentUser(&state.currentUser);
-
-        std::cout << "Current user updated: " << state.currentUser.GetUsername() << "#"
-                  << state.currentUser.GetDiscriminator() << "\n";
-
-        state.core->UserManager().GetUser(130050050968518656,
-                                          [](discord::Result result, discord::User const& user) {
-                                              if (result == discord::Result::Ok) {
-                                                  std::cout << "Get " << user.GetUsername() << "\n";
-                                              }
-                                              else {
-                                                  std::cout << "Failed to get David!\n";
-                                              }
-                                          });
-
-        discord::ImageHandle handle{};
-        handle.SetId(state.currentUser.GetId());
-        handle.SetType(discord::ImageType::User);
-        handle.SetSize(256);
-
-        state.core->ImageManager().Fetch(
-          handle, true, [&state](discord::Result res, discord::ImageHandle handle) {
-              if (res == discord::Result::Ok) {
-                  discord::ImageDimensions dims{};
-                  state.core->ImageManager().GetDimensions(handle, &dims);
-                  std::cout << "Fetched " << dims.GetWidth() << "x" << dims.GetHeight()
-                            << " avatar!\n";
-
-                  std::vector<uint8_t> data;
-                  data.reserve(dims.GetWidth() * dims.GetHeight() * 4);
-                  uint8_t* d = data.data();
-                  state.core->ImageManager().GetData(handle, d, data.size());
-
-#if defined(_WIN32)
-                  auto fileSize =
-                    data.size() + sizeof(BitmapImageHeader) + sizeof(BitmapFileHeader);
-
-                  BitmapImageHeader imageHeader;
-                  imageHeader.width = static_cast<int32_t>(dims.GetWidth());
-                  imageHeader.height = static_cast<int32_t>(dims.GetHeight());
-
-                  BitmapFileHeader fileHeader;
-                  fileHeader.size = static_cast<uint32_t>(fileSize);
-
-                  FILE* fp = fopen("avatar.bmp", "wb");
-                  fwrite(&fileHeader, sizeof(BitmapFileHeader), 1, fp);
-                  fwrite(&imageHeader, sizeof(BitmapImageHeader), 1, fp);
-
-                  for (auto y = 0u; y < dims.GetHeight(); ++y) {
-                      auto pixels = reinterpret_cast<uint32_t const*>(data.data());
-                      auto invY = dims.GetHeight() - y - 1;
-                      fwrite(
-                        &pixels[invY * dims.GetWidth()], sizeof(uint32_t) * dims.GetWidth(), 1, fp);
-                  }
-
-                  fflush(fp);
-                  fclose(fp);
-#endif
-              }
-              else {
-                  std::cout << "Failed fetching avatar. (err " << static_cast<int>(res) << ")\n";
-              }
-          });
-    });
-
-    state.core->ActivityManager().RegisterCommand("run/command/foo/bar/baz/here.exe");
-    state.core->ActivityManager().RegisterSteam(123123321);
-
-    state.core->ActivityManager().OnActivityJoin.Connect(
-      [](const char* secret) { std::cout << "Join " << secret << "\n"; });
-    state.core->ActivityManager().OnActivitySpectate.Connect(
-      [](const char* secret) { std::cout << "Spectate " << secret << "\n"; });
-    state.core->ActivityManager().OnActivityJoinRequest.Connect([](discord::User const& user) {
-        std::cout << "Join Request " << user.GetUsername() << "\n";
-    });
-    state.core->ActivityManager().OnActivityInvite.Connect(
-      [](discord::ActivityActionType, discord::User const& user, discord::Activity const&) {
-          std::cout << "Invite " << user.GetUsername() << "\n";
-      });
-
-    state.core->LobbyManager().OnLobbyUpdate.Connect(
-      [](std::int64_t lobbyId) { std::cout << "Lobby update " << lobbyId << "\n"; });
-
-    state.core->LobbyManager().OnLobbyDelete.Connect(
-      [](std::int64_t lobbyId, std::uint32_t reason) {
-          std::cout << "Lobby delete " << lobbyId << " (reason: " << reason << ")\n";
-      });
-
-    state.core->LobbyManager().OnMemberConnect.Connect(
-      [](std::int64_t lobbyId, std::int64_t userId) {
-          std::cout << "Lobby member connect " << lobbyId << " userId " << userId << "\n";
-      });
-
-    state.core->LobbyManager().OnMemberUpdate.Connect(
-      [](std::int64_t lobbyId, std::int64_t userId) {
-          std::cout << "Lobby member update " << lobbyId << " userId " << userId << "\n";
-      });
-
-    state.core->LobbyManager().OnMemberDisconnect.Connect(
-      [](std::int64_t lobbyId, std::int64_t userId) {
-          std::cout << "Lobby member disconnect " << lobbyId << " userId " << userId << "\n";
-      });
-
-    state.core->LobbyManager().OnLobbyMessage.Connect([&](std::int64_t lobbyId,
-                                                          std::int64_t userId,
-                                                          std::uint8_t* payload,
-                                                          std::uint32_t payloadLength) {
-        std::vector<uint8_t> buffer{};
-        buffer.resize(payloadLength);
-        memcpy(buffer.data(), payload, payloadLength);
-        std::cout << "Lobby message " << lobbyId << " from " << userId << " of length "
-                  << payloadLength << " bytes.\n";
-
-        char fourtyNinetySix[4096];
-        state.core->LobbyManager().GetLobbyMetadataValue(lobbyId, "foo", fourtyNinetySix);
-
-        std::cout << "Metadata for key foo is " << fourtyNinetySix << "\n";
-    });
-
-    state.core->LobbyManager().OnSpeaking.Connect(
-      [&](std::int64_t, std::int64_t userId, bool speaking) {
-          std::cout << "User " << userId << " is " << (speaking ? "" : "NOT ") << "speaking.\n";
-      });
-
-    discord::Activity activity{};
-    activity.SetDetails("Fruit Tarts");
-    activity.SetState("Pop Snacks");
-    activity.GetAssets().SetSmallImage("the");
-    activity.GetAssets().SetSmallText("i mage");
-    activity.GetAssets().SetLargeImage("the");
-    activity.GetAssets().SetLargeText("u mage");
-    activity.SetType(discord::ActivityType::Playing);
-    state.core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {
-        std::cout << ((result == discord::Result::Ok) ? "Succeeded" : "Failed")
-                  << " updating activity!\n";
-    });
-
-    discord::LobbyTransaction lobby{};
-    state.core->LobbyManager().GetLobbyCreateTransaction(&lobby);
-    lobby.SetCapacity(2);
-    lobby.SetMetadata("foo", "bar");
-    lobby.SetMetadata("baz", "bat");
-    lobby.SetType(discord::LobbyType::Public);
-    state.core->LobbyManager().CreateLobby(
-      lobby, [&state](discord::Result result, discord::Lobby const& lobby) {
-          if (result == discord::Result::Ok) {
-              std::cout << "Created lobby with secret " << lobby.GetSecret() << "\n";
-              std::array<uint8_t, 234> data{};
-              state.core->LobbyManager().SendLobbyMessage(
-                lobby.GetId(),
-                reinterpret_cast<uint8_t*>(data.data()),
-                data.size(),
-                [](discord::Result result) {
-                    std::cout << "Sent message. Result: " << static_cast<int>(result) << "\n";
-                });
-          }
-          else {
-              std::cout << "Failed creating lobby. (err " << static_cast<int>(result) << ")\n";
-          }
-
-          discord::LobbySearchQuery query{};
-          state.core->LobbyManager().GetSearchQuery(&query);
-          query.Limit(1);
-          state.core->LobbyManager().Search(query, [&state](discord::Result result) {
-              if (result == discord::Result::Ok) {
-                  std::int32_t lobbyCount{};
-                  state.core->LobbyManager().LobbyCount(&lobbyCount);
-                  std::cout << "Lobby search succeeded with " << lobbyCount << " lobbies.\n";
-                  for (auto i = 0; i < lobbyCount; ++i) {
-                      discord::LobbyId lobbyId{};
-                      state.core->LobbyManager().GetLobbyId(i, &lobbyId);
-                      std::cout << "  " << lobbyId << "\n";
-                  }
-              }
-              else {
-                  std::cout << "Lobby search failed. (err " << static_cast<int>(result) << ")\n";
-              }
-          });
-      });
-
-    state.core->RelationshipManager().OnRefresh.Connect([&]() {
-        std::cout << "Relationships refreshed!\n";
-
-        state.core->RelationshipManager().Filter(
-          [](discord::Relationship const& relationship) -> bool {
-              return relationship.GetType() == discord::RelationshipType::Friend;
-          });
-
-        std::int32_t friendCount{0};
-        state.core->RelationshipManager().Count(&friendCount);
-
-        state.core->RelationshipManager().Filter(
-          [&](discord::Relationship const& relationship) -> bool {
-              return relationship.GetType() == discord::RelationshipType::Friend &&
-                relationship.GetUser().GetId() < state.currentUser.GetId();
-          });
-
-        std::int32_t filteredCount{0};
-        state.core->RelationshipManager().Count(&filteredCount);
-
-        discord::Relationship relationship{};
-        for (auto i = 0; i < filteredCount; ++i) {
-            state.core->RelationshipManager().GetAt(i, &relationship);
-            std::cout << relationship.GetUser().GetId() << " "
-                      << relationship.GetUser().GetUsername() << "#"
-                      << relationship.GetUser().GetDiscriminator() << "\n";
-        }
-    });
-
-    state.core->RelationshipManager().OnRelationshipUpdate.Connect(
-      [](discord::Relationship const& relationship) {
-          std::cout << "Relationship with " << relationship.GetUser().GetUsername()
-                    << " updated!\n";
-      });
-
-    std::signal(SIGINT, [](int) { interrupted = true; });
-
-    do {
-        state.core->RunCallbacks();
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(16));
-    } while (!interrupted);
-
-    return 0;
-}

libs/discordGameSDK/examples/csharp/Program.cs

@@ -1,412 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Text;
-using System.Runtime.InteropServices;
-
-class Program
-{
-    // Request user's avatar data. Sizes can be powers of 2 between 16 and 2048
-    static void FetchAvatar(Discord.ImageManager imageManager, Int64 userID)
-    {
-        imageManager.Fetch(Discord.ImageHandle.User(userID), (result, handle) =>
-        {
-            {
-                if (result == Discord.Result.Ok)
-                {
-                    // You can also use GetTexture2D within Unity.
-                    // These return raw RGBA.
-                    var data = imageManager.GetData(handle);
-                    Console.WriteLine("image updated {0} {1}", handle.Id, data.Length);
-                }
-                else
-                {
-                    Console.WriteLine("image error {0}", handle.Id);
-                }
-            }
-        });
-    }
-
-    // Update user's activity for your game.
-    // Party and secrets are vital.
-    // Read https://discordapp.com/developers/docs/rich-presence/how-to for more details.
-    static void UpdateActivity(Discord.Discord discord, Discord.Lobby lobby)
-    {
-        var activityManager = discord.GetActivityManager();
-        var lobbyManager = discord.GetLobbyManager();
-
-        var activity = new Discord.Activity
-        {
-            State = "olleh",
-            Details = "foo details",
-            Timestamps =
-            {
-                Start = 5,
-                End = 6,
-            },
-            Assets =
-            {
-                LargeImage = "foo largeImageKey",
-                LargeText = "foo largeImageText",
-                SmallImage = "foo smallImageKey",
-                SmallText = "foo smallImageText",
-            },
-            Party = {
-               Id = lobby.Id.ToString(),
-               Size = {
-                    CurrentSize = lobbyManager.MemberCount(lobby.Id),
-                    MaxSize = (int)lobby.Capacity,
-                },
-            },
-            Secrets = {
-                Join = lobbyManager.GetLobbyActivitySecret(lobby.Id),
-            },
-            Instance = true,
-        };
-
-        activityManager.UpdateActivity(activity, result =>
-        {
-            Console.WriteLine("Update Activity {0}", result);
-
-            // Send an invite to another user for this activity.
-            // Receiver should see an invite in their DM.
-            // Use a relationship user's ID for this.
-            // activityManager
-            //   .SendInvite(
-            //       364843917537050624,
-            //       Discord.ActivityActionType.Join,
-            //       "",
-            //       inviteResult =>
-            //       {
-            //           Console.WriteLine("Invite {0}", inviteResult);
-            //       }
-            //   );
-        });
-    }
-
-    static void Main(string[] args)
-    {
-        // Use your client ID from Discord's developer site.
-        var clientID = Environment.GetEnvironmentVariable("DISCORD_CLIENT_ID");
-        if (clientID == null)
-        {
-            clientID = "418559331265675294";
-        }
-        var discord = new Discord.Discord(Int64.Parse(clientID), (UInt64)Discord.CreateFlags.Default);
-        discord.SetLogHook(Discord.LogLevel.Debug, (level, message) =>
-        {
-            Console.WriteLine("Log[{0}] {1}", level, message);
-        });
-
-        var applicationManager = discord.GetApplicationManager();
-        // Get the current locale. This can be used to determine what text or audio the user wants.
-        Console.WriteLine("Current Locale: {0}", applicationManager.GetCurrentLocale());
-        // Get the current branch. For example alpha or beta.
-        Console.WriteLine("Current Branch: {0}", applicationManager.GetCurrentBranch());
-        // If you want to verify information from your game's server then you can
-        // grab the access token and send it to your server.
-        //
-        // This automatically looks for an environment variable passed by the Discord client,
-        // if it does not exist the Discord client will focus itself for manual authorization.
-        //
-        // By-default the SDK grants the identify and rpc scopes.
-        // Read more at https://discordapp.com/developers/docs/topics/oauth2
-        // applicationManager.GetOAuth2Token((Discord.Result result, ref Discord.OAuth2Token oauth2Token) =>
-        // {
-        //     Console.WriteLine("Access Token {0}", oauth2Token.AccessToken);
-        // });
-
-        var activityManager = discord.GetActivityManager();
-        var lobbyManager = discord.GetLobbyManager();
-        // Received when someone accepts a request to join or invite.
-        // Use secrets to receive back the information needed to add the user to the group/party/match
-        activityManager.OnActivityJoin += secret =>
-        {
-            Console.WriteLine("OnJoin {0}", secret);
-            lobbyManager.ConnectLobbyWithActivitySecret(secret, (Discord.Result result, ref Discord.Lobby lobby) =>
-            {
-                Console.WriteLine("Connected to lobby: {0}", lobby.Id);
-                lobbyManager.ConnectNetwork(lobby.Id);
-                lobbyManager.OpenNetworkChannel(lobby.Id, 0, true);
-                foreach (var user in lobbyManager.GetMemberUsers(lobby.Id))
-                {
-                    lobbyManager.SendNetworkMessage(lobby.Id, user.Id, 0,
-                        Encoding.UTF8.GetBytes(String.Format("Hello, {0}!", user.Username)));
-                }
-                UpdateActivity(discord, lobby);
-            });
-        };
-        // Received when someone accepts a request to spectate
-        activityManager.OnActivitySpectate += secret =>
-        {
-            Console.WriteLine("OnSpectate {0}", secret);
-        };
-        // A join request has been received. Render the request on the UI.
-        activityManager.OnActivityJoinRequest += (ref Discord.User user) =>
-        {
-            Console.WriteLine("OnJoinRequest {0} {1}", user.Id, user.Username);
-        };
-        // An invite has been received. Consider rendering the user / activity on the UI.
-        activityManager.OnActivityInvite += (Discord.ActivityActionType Type, ref Discord.User user, ref Discord.Activity activity2) =>
-        {
-            Console.WriteLine("OnInvite {0} {1} {2}", Type, user.Username, activity2.Name);
-            // activityManager.AcceptInvite(user.Id, result =>
-            // {
-            //     Console.WriteLine("AcceptInvite {0}", result);
-            // });
-        };
-        // This is used to register the game in the registry such that Discord can find it.
-        // This is only needed by games acquired from other platforms, like Steam.
-        // activityManager.RegisterCommand();
-
-        var imageManager = discord.GetImageManager();
-
-        var userManager = discord.GetUserManager();
-        // The auth manager fires events as information about the current user changes.
-        // This event will fire once on init.
-        //
-        // GetCurrentUser will error until this fires once.
-        userManager.OnCurrentUserUpdate += () =>
-        {
-            var currentUser = userManager.GetCurrentUser();
-            Console.WriteLine(currentUser.Username);
-            Console.WriteLine(currentUser.Id);
-        };
-        // If you store Discord user ids in a central place like a leaderboard and want to render them.
-        // The users manager can be used to fetch arbitrary Discord users. This only provides basic
-        // information and does not automatically update like relationships.
-        userManager.GetUser(450795363658366976, (Discord.Result result, ref Discord.User user) =>
-        {
-            if (result == Discord.Result.Ok)
-            {
-                Console.WriteLine("user fetched: {0}", user.Username);
-
-                // Request users's avatar data.
-                // This can only be done after a user is successfully fetched.
-                FetchAvatar(imageManager, user.Id);
-            }
-            else
-            {
-                Console.WriteLine("user fetch error: {0}", result);
-            }
-        });
-
-        var relationshipManager = discord.GetRelationshipManager();
-        // It is important to assign this handle right away to get the initial relationships refresh.
-        // This callback will only be fired when the whole list is initially loaded or was reset
-        relationshipManager.OnRefresh += () =>
-        {
-            // Filter a user's relationship list to be just friends
-            relationshipManager.Filter((ref Discord.Relationship relationship) => { return relationship.Type == Discord.RelationshipType.Friend; });
-            // Loop over all friends a user has.
-            Console.WriteLine("relationships updated: {0}", relationshipManager.Count());
-            for (var i = 0; i < Math.Min(relationshipManager.Count(), 10); i++)
-            {
-                // Get an individual relationship from the list
-                var r = relationshipManager.GetAt((uint)i);
-                Console.WriteLine("relationships: {0} {1} {2} {3}", r.Type, r.User.Username, r.Presence.Status, r.Presence.Activity.Name);
-
-                // Request relationship's avatar data.
-                FetchAvatar(imageManager, r.User.Id);
-            }
-        };
-        // All following relationship updates are delivered individually.
-        // These are fired when a user gets a new friend, removes a friend, or a relationship's presence changes.
-        relationshipManager.OnRelationshipUpdate += (ref Discord.Relationship r) =>
-        {
-            Console.WriteLine("relationship updated: {0} {1} {2} {3}", r.Type, r.User.Username, r.Presence.Status, r.Presence.Activity.Name);
-        };
-
-        lobbyManager.OnLobbyMessage += (lobbyID, userID, data) =>
-        {
-            Console.WriteLine("lobby message: {0} {1}", lobbyID, Encoding.UTF8.GetString(data));
-        };
-        lobbyManager.OnNetworkMessage += (lobbyId, userId, channelId, data) =>
-        {
-            Console.WriteLine("network message: {0} {1} {2} {3}", lobbyId, userId, channelId, Encoding.UTF8.GetString(data));
-        };
-        lobbyManager.OnSpeaking += (lobbyID, userID, speaking) =>
-        {
-            Console.WriteLine("lobby speaking: {0} {1} {2}", lobbyID, userID, speaking);
-        };
-        // Create a lobby.
-        var transaction = lobbyManager.GetLobbyCreateTransaction();
-        transaction.SetCapacity(6);
-        transaction.SetType(Discord.LobbyType.Public);
-        transaction.SetMetadata("a", "123");
-        transaction.SetMetadata("a", "456");
-        transaction.SetMetadata("b", "111");
-        transaction.SetMetadata("c", "222");
-
-        lobbyManager.CreateLobby(transaction, (Discord.Result result, ref Discord.Lobby lobby) =>
-        {
-            if (result != Discord.Result.Ok)
-            {
-                return;
-            }
-
-            // Check the lobby's configuration.
-            Console.WriteLine("lobby {0} with capacity {1} and secret {2}", lobby.Id, lobby.Capacity, lobby.Secret);
-
-            // Check lobby metadata.
-            foreach (var key in new string[] { "a", "b", "c" })
-            {
-                Console.WriteLine("{0} = {1}", key, lobbyManager.GetLobbyMetadataValue(lobby.Id, key));
-            }
-
-            // Print all the members of the lobby.
-            foreach (var user in lobbyManager.GetMemberUsers(lobby.Id))
-            {
-                Console.WriteLine("lobby member: {0}", user.Username);
-            }
-
-            // Send everyone a message.
-            lobbyManager.SendLobbyMessage(lobby.Id, "Hello from C#!", (_) =>
-            {
-                Console.WriteLine("sent message");
-            });
-
-            // Update lobby.
-            var lobbyTransaction = lobbyManager.GetLobbyUpdateTransaction(lobby.Id);
-            lobbyTransaction.SetMetadata("d", "e");
-            lobbyTransaction.SetCapacity(16);
-            lobbyManager.UpdateLobby(lobby.Id, lobbyTransaction, (_) =>
-            {
-                Console.WriteLine("lobby has been updated");
-            });
-
-            // Update a member.
-            var lobbyID = lobby.Id;
-            var userID = lobby.OwnerId;
-            var memberTransaction = lobbyManager.GetMemberUpdateTransaction(lobbyID, userID);
-            memberTransaction.SetMetadata("hello", "there");
-            lobbyManager.UpdateMember(lobbyID, userID, memberTransaction, (_) =>
-            {
-                Console.WriteLine("lobby member has been updated: {0}", lobbyManager.GetMemberMetadataValue(lobbyID, userID, "hello"));
-            });
-
-            // Search lobbies.
-            var query = lobbyManager.GetSearchQuery();
-            // Filter by a metadata value.
-            query.Filter("metadata.a", Discord.LobbySearchComparison.GreaterThan, Discord.LobbySearchCast.Number, "455");
-            query.Sort("metadata.a", Discord.LobbySearchCast.Number, "0");
-            // Only return 1 result max.
-            query.Limit(1);
-            lobbyManager.Search(query, (_) =>
-            {
-                Console.WriteLine("search returned {0} lobbies", lobbyManager.LobbyCount());
-                if (lobbyManager.LobbyCount() == 1)
-                {
-                    Console.WriteLine("first lobby secret: {0}", lobbyManager.GetLobby(lobbyManager.GetLobbyId(0)).Secret);
-                }
-            });
-
-            // Connect to voice chat.
-            lobbyManager.ConnectVoice(lobby.Id, (_) =>
-            {
-                Console.WriteLine("Connected to voice chat!");
-            });
-
-            // Setup networking.
-            lobbyManager.ConnectNetwork(lobby.Id);
-            lobbyManager.OpenNetworkChannel(lobby.Id, 0, true);
-
-            // Update activity.
-            UpdateActivity(discord, lobby);
-        });
-
-        /*
-        var overlayManager = discord.GetOverlayManager();
-        overlayManager.OnOverlayLocked += locked =>
-        {
-            Console.WriteLine("Overlay Locked: {0}", locked);
-        };
-        overlayManager.SetLocked(false);
-        */
-
-        var storageManager = discord.GetStorageManager();
-        var contents = new byte[20000];
-        var random = new Random();
-        random.NextBytes(contents);
-        Console.WriteLine("storage path: {0}", storageManager.GetPath());
-        storageManager.WriteAsync("foo", contents, res =>
-        {
-            var files = storageManager.Files();
-            foreach (var file in files)
-            {
-                Console.WriteLine("file: {0} size: {1} last_modified: {2}", file.Filename, file.Size, file.LastModified);
-            }
-            storageManager.ReadAsyncPartial("foo", 400, 50, (result, data) =>
-            {
-                Console.WriteLine("partial contents of foo match {0}", Enumerable.SequenceEqual(data, new ArraySegment<byte>(contents, 400, 50)));
-            });
-            storageManager.ReadAsync("foo", (result, data) =>
-            {
-                Console.WriteLine("length of contents {0} data {1}", contents.Length, data.Length);
-                Console.WriteLine("contents of foo match {0}", Enumerable.SequenceEqual(data, contents));
-                Console.WriteLine("foo exists? {0}", storageManager.Exists("foo"));
-                storageManager.Delete("foo");
-                Console.WriteLine("post-delete foo exists? {0}", storageManager.Exists("foo"));
-            });
-        });
-
-        var storeManager = discord.GetStoreManager();
-        storeManager.OnEntitlementCreate += (ref Discord.Entitlement entitlement) =>
-        {
-            Console.WriteLine("Entitlement Create1: {0}", entitlement.Id);
-        };
-
-        // Start a purchase flow.
-        // storeManager.StartPurchase(487507201519255552, result =>
-        // {
-        //     if (result == Discord.Result.Ok)
-        //     {
-        //         Console.WriteLine("Purchase Complete");
-        //     }
-        //     else
-        //     {
-        //         Console.WriteLine("Purchase Canceled");
-        //     }
-        // });
-
-        // Get all entitlements.
-        storeManager.FetchEntitlements(result =>
-        {
-            if (result == Discord.Result.Ok)
-            {
-                foreach (var entitlement in storeManager.GetEntitlements())
-                {
-                    Console.WriteLine("entitlement: {0} - {1} {2}", entitlement.Id, entitlement.Type, entitlement.SkuId);
-                }
-            }
-        });
-
-        // Get all SKUs.
-        storeManager.FetchSkus(result =>
-        {
-            if (result == Discord.Result.Ok)
-            {
-                foreach (var sku in storeManager.GetSkus())
-                {
-                    Console.WriteLine("sku: {0} - {1} {2}", sku.Name, sku.Price.Amount, sku.Price.Currency);
-                }
-            }
-        });
-
-        // Pump the event look to ensure all callbacks continue to get fired.
-        try
-        {
-            while (true)
-            {
-                discord.RunCallbacks();
-                lobbyManager.FlushNetwork();
-                Thread.Sleep(1000 / 60);
-            }
-        }
-        finally
-        {
-            discord.Dispose();
-        }
-
-    }
-}

libs/discordRPC.lua

@@ -24,59 +24,6 @@ if osname == "Linux" then
 elseif osname == "OS X" then
     discordRPClib = ffi.load(source.."/libs/discord-rpc.dylib")
 elseif osname == "Windows" then
-    -- I would strongly advise never touching this. It was not trivial to get correct. -nightmareci
-
-    ffi.cdef[[
-    typedef uint32_t DWORD;
-    typedef char CHAR;
-    typedef CHAR *LPSTR;
-    typedef const CHAR *LPCSTR;
-    typedef wchar_t WCHAR;
-    typedef WCHAR *LPWSTR;
-    typedef LPWSTR PWSTR;
-    typedef const WCHAR *LPCWSTR;
-
-    static const DWORD CP_UTF8 = 65001;
-    int32_t MultiByteToWideChar(
-        DWORD CodePage,
-        DWORD dwFlags,
-        LPCSTR lpMultiByteStr,
-        int32_t cbMultiByte,
-        LPWSTR lpWideCharStr,
-        int32_t cchWideChar
-    );
-
-    int32_t WideCharToMultiByte(
-        DWORD CodePage,
-        DWORD dwFlags,
-        LPCWSTR lpWideCharStr,
-        int32_t cchWideChar,
-        LPSTR lpMultiByteStr,
-        int32_t cbMultiByte,
-        void* lpDefaultChar,
-        void* lpUsedDefaultChar
-    );
-
-    DWORD GetShortPathNameW(
-        LPCWSTR lpszLongPath,
-        LPWSTR lpszShortPath,
-        DWORD cchBuffer
-    );
-    ]]
-
-    local originalWideSize = ffi.C.MultiByteToWideChar(ffi.C.CP_UTF8, 0, source, -1, nil, 0)
-    local originalWide = ffi.new('WCHAR[?]', originalWideSize)
-    ffi.C.MultiByteToWideChar(ffi.C.CP_UTF8, 0, source, -1, originalWide, originalWideSize)
-
-    local sourceSize = ffi.C.GetShortPathNameW(originalWide, nil, 0)
-    local sourceWide = ffi.new('WCHAR[?]', sourceSize)
-    ffi.C.GetShortPathNameW(originalWide, sourceWide, sourceSize)
-
-    local sourceChar = ffi.new('char[?]', sourceSize)
-    ffi.C.WideCharToMultiByte(ffi.C.CP_UTF8, 0, sourceWide, sourceSize, sourceChar, sourceSize, nil, nil)
-
-    source = ffi.string(sourceChar)
-
     discordRPClib = ffi.load(source.."/libs/discord-rpc.dll")
 else
     -- Else it crashes later on

load/bgm.lua

@@ -6,45 +6,34 @@ bgm = {
 }
 
 local current_bgm = nil
-local pitch = 1
 local bgm_locked = false
 
 function switchBGM(sound, subsound)
-	if bgm_locked then
+	if bgm_locked then return end
-		return
-	end
 	if current_bgm ~= nil then
 		current_bgm:stop()
 	end
-	if config.bgm_volume <= 0 then
-		current_bgm = nil
-	elseif sound ~= nil then
 	if subsound ~= nil then
 		current_bgm = bgm[sound][subsound]
-		else
+		resetBGMFadeout()
+	elseif sound ~= nil then
 		current_bgm = bgm[sound]
-		end
+		resetBGMFadeout()
 	else
 		current_bgm = nil
 	end
-	if current_bgm ~= nil then
-		resetBGMFadeout()
-	end
 end
 
 function switchBGMLoop(sound, subsound)
+	if bgm_locked then return end
 	switchBGM(sound, subsound)
-	if current_bgm then current_bgm:setLooping(true) end
+	current_bgm:setLooping(true)
 end
 
 function lockBGM()
 	bgm_locked = true
 end
 
-function unlockBGM()
-	bgm_locked = false
-end
-
 local fading_bgm = false
 local fadeout_time = 0
 local total_fadeout_time = 0
@@ -60,19 +49,17 @@ end
 function resetBGMFadeout(time)
 	current_bgm:setVolume(config.bgm_volume)
 	fading_bgm = false
-	resumeBGM()
+	current_bgm:play()
 end
 
 function processBGMFadeout(dt)
-	if current_bgm and fading_bgm then
+	if fading_bgm then
 		fadeout_time = fadeout_time - dt
 		if fadeout_time < 0 then
 			fadeout_time = 0
 			fading_bgm = false
 		end
-		current_bgm:setVolume(
+		current_bgm:setVolume(fadeout_time * config.bgm_volume / total_fadeout_time)
-			fadeout_time * config.bgm_volume / total_fadeout_time
-		)
 	end
 end
 
@@ -85,13 +72,5 @@ end
 function resumeBGM()
 	if current_bgm ~= nil then
 		current_bgm:play()
-		current_bgm:setPitch(pitch)
-	end
-end
-
-function pitchBGM(new_pitch)
-	pitch = new_pitch
-	if current_bgm ~= nil then
-		current_bgm:setPitch(pitch)
 	end
 end

load/fonts.lua

@@ -26,18 +26,8 @@ font_3x5_4 = love.graphics.newImageFont(
 	-4
 )
 
--- this would be font_8x11 with the other one as 8x11_2
--- but that would break compatibility :(
-font_8x11_small = love.graphics.newImageFont(
-	"res/fonts/8x11.png",
-	" 0123456789:;.,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" ..
-	"?!/\\^@$%<=>()*-+[]_&",
-	1
-)
-
 font_8x11 = love.graphics.newImageFont(
 	"res/fonts/8x11_medium.png",
-	" 0123456789:;.,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" ..
+	"0123456789:.",
-	"?!/\\^@$%<=>()*-+[]_&",
 	1
 )

load/gamesdk.lua

@@ -1,13 +0,0 @@
-
-print("Loading Discord GameSDK...")
-DiscordGameSDK = {
-	loaded = false
-}
-local success, libDiscordGameSDK = pcall(require, "libs.discordGameSDK")
-if success then
-	DiscordGameSDK.loaded = true
-
-	print("Discord GameSDK successfully loaded")
-else
-	print("Discord GameSDK failed to load!")
-end

load/graphics.lua

@@ -1,116 +1,30 @@
-named_backgrounds = {
+backgrounds = {
-	"title", "title_no_icon", "title_night",
+	[0] = love.graphics.newImage("res/backgrounds/0.png"),
-	"snow", "options_input", "options_game"
+	love.graphics.newImage("res/backgrounds/100.png"),
+	love.graphics.newImage("res/backgrounds/200.png"),
+	love.graphics.newImage("res/backgrounds/300.png"),
+	love.graphics.newImage("res/backgrounds/400.png"),
+	love.graphics.newImage("res/backgrounds/500.png"),
+	love.graphics.newImage("res/backgrounds/600.png"),
+	love.graphics.newImage("res/backgrounds/700.png"),
+	love.graphics.newImage("res/backgrounds/800.png"),
+	love.graphics.newImage("res/backgrounds/900.png"),
+	love.graphics.newImage("res/backgrounds/1000.png"),
+	love.graphics.newImage("res/backgrounds/1100.png"),
+	love.graphics.newImage("res/backgrounds/1200.png"),
+	love.graphics.newImage("res/backgrounds/1300.png"),
+	love.graphics.newImage("res/backgrounds/1400.png"),
+	love.graphics.newImage("res/backgrounds/1500.png"),
+	love.graphics.newImage("res/backgrounds/1600.png"),
+	love.graphics.newImage("res/backgrounds/1700.png"),
+	love.graphics.newImage("res/backgrounds/1800.png"),
+	love.graphics.newImage("res/backgrounds/1900.png"),
+	title = love.graphics.newImage("res/backgrounds/title.png"),
+	snow = love.graphics.newImage("res/backgrounds/snow.png"),
+	input_config = love.graphics.newImage("res/backgrounds/options-input.png"),
+	game_config = love.graphics.newImage("res/backgrounds/options-game.png"),
 }
-current_playing_bgs = {}
-extended_bgs = {}
-image_formats = {".jpg", ".png"}
-bgpath = "res/backgrounds/"
-dir = love.filesystem.getDirectoryItems(bgpath)
 
-backgrounds = {}
-
-local function loadExtendedBgs()
-	extended_bgs = require("res.backgrounds.extend_section_bg")
-end
-
--- error handling for if there is no extend_section_bg
-if pcall(loadExtendedBgs) then end
-
--- helper method to populate backgrounds
-local function createBackgroundIfExists(name, file_name)
-	local format_index = 1
-
-	-- see if background is an extension of another background
-	if extended_bgs[file_name] ~= nil then
-		copy_bg = extended_bgs[file_name]
-		copy_bg = copy_bg / 100
-		backgrounds[name] = backgrounds[copy_bg]
-		return true
-	end
-
-	-- try creating image backgrounds
-	while format_index <= #image_formats do
-		for num, existing_file in pairs(dir) do
-			if existing_file == (file_name..image_formats[format_index]) then
-				local tempBgPath = bgpath .. file_name .. image_formats[format_index]
-				backgrounds[name] = love.graphics.newImage(tempBgPath)
-				return true
-			end
-		end
-		format_index = format_index + 1
-	end
-
-	-- try creating video background
-	if love.filesystem.getInfo(bgpath .. file_name .. ".ogv") then
-		for num, existing_file in pairs(dir) do
-			if existing_file == (file_name..".ogv") then
-				local tempBgPath = bgpath .. file_name .. ".ogv"
-				backgrounds[name] = love.graphics.newVideo(
-					tempBgPath, {["audio"] = false}
-				)
-				-- you can set audio to true, but the video will not loop
-				-- properly if audio extends beyond video frames
-				return true
-			end
-		end
-	end
-	return false
-end
-
-local function stopOtherBgs(bg)
-	if #current_playing_bgs == 0 and bg:typeOf("Video") then
-		current_playing_bgs[#current_playing_bgs+1] = bg
-	end
-
-	if #current_playing_bgs >= 1 then
-		while current_playing_bgs[1] ~= bg and #current_playing_bgs >= 1 do
-			current_playing_bgs[1]:pause()
-			current_playing_bgs[1]:rewind()
-			table.remove(current_playing_bgs, 1)
-		end
-	end
-
-end
-
-function fetchBackgroundAndLoop(id)
-	bg = backgrounds[id]
-
-	if bg:typeOf("Video") and not bg:isPlaying() then
-		bg:rewind()
-		bg:play()
-	end
-
-	stopOtherBgs(bg)
-
-	return bg
-end
-
--- create section backgrounds
-local section = 0
-while (createBackgroundIfExists(section, section*100)) do
-	section = section + 1
-end
-
--- create named backgrounds
-local nbgIndex = 1
-while nbgIndex <= #named_backgrounds do
-	createBackgroundIfExists(
-		named_backgrounds[nbgIndex],
-		string.gsub(named_backgrounds[nbgIndex], "_", "-")
-	)
-	nbgIndex = nbgIndex + 1
-end
-
--- in order, the colors are:
--- red, orange, yellow, green, cyan, blue
--- magenta (or purple), white, black
--- the next three don't have colors tied to them
--- F is used for lock flash
--- A is a garbage block
--- X is an invisible "block"
--- don't use these for piece colors when making a ruleset
--- all the others are fine to use
 blocks = {
 	["2tie"] = {
 		R = love.graphics.newImage("res/img/s1.png"),
@@ -120,8 +34,6 @@ blocks = {
 		C = love.graphics.newImage("res/img/s2.png"),
 		B = love.graphics.newImage("res/img/s4.png"),
 		M = love.graphics.newImage("res/img/s5.png"),
-		W = love.graphics.newImage("res/img/s9.png"),
-		D = love.graphics.newImage("res/img/s8.png"),
 		F = love.graphics.newImage("res/img/s9.png"),
 		A = love.graphics.newImage("res/img/s8.png"),
 		X = love.graphics.newImage("res/img/s9.png"),
@@ -134,8 +46,6 @@ blocks = {
 		C = love.graphics.newImage("res/img/bone.png"),
 		B = love.graphics.newImage("res/img/bone.png"),
 		M = love.graphics.newImage("res/img/bone.png"),
-		W = love.graphics.newImage("res/img/bone.png"),
-		D = love.graphics.newImage("res/img/bone.png"),
 		F = love.graphics.newImage("res/img/bone.png"),
 		A = love.graphics.newImage("res/img/bone.png"),
 		X = love.graphics.newImage("res/img/bone.png"),
@@ -148,16 +58,13 @@ blocks = {
 		C = love.graphics.newImage("res/img/gem2.png"),
 		B = love.graphics.newImage("res/img/gem4.png"),
 		M = love.graphics.newImage("res/img/gem5.png"),
-		W = love.graphics.newImage("res/img/gem9.png"),
-		D = love.graphics.newImage("res/img/gem9.png"),
 		F = love.graphics.newImage("res/img/gem9.png"),
 		A = love.graphics.newImage("res/img/gem9.png"),
 		X = love.graphics.newImage("res/img/gem9.png"),
 	},
 	["square"] = {
-		W = love.graphics.newImage("res/img/squares.png"),
-		Y = love.graphics.newImage("res/img/squareg.png"),
 		F = love.graphics.newImage("res/img/squares.png"),
+		Y = love.graphics.newImage("res/img/squareg.png"),
 		X = love.graphics.newImage("res/img/squares.png"),
 	}
 }
@@ -180,7 +87,7 @@ ColourSchemes = {
 		Z = "R",
 		O = "Y",
 		T = "M",
-	}
+	},
 }
 
 for name, blockset in pairs(blocks) do
@@ -195,19 +102,5 @@ misc_graphics = {
 	go = love.graphics.newImage("res/img/go.png"),
 	select_mode = love.graphics.newImage("res/img/select_mode.png"),
 	strike = love.graphics.newImage("res/img/strike.png"),
-	santa = love.graphics.newImage("res/img/santa.png"),
+	santa = love.graphics.newImage("res/img/santa.png")
-	icon = love.graphics.newImage("res/img/cambridge_transparent.png")
 }
-
--- utility function to allow any size background to be used
--- this will stretch the background to 4:3 aspect ratio
-function drawBackground(id)
-	local bg_object = fetchBackgroundAndLoop(id)
-	local width = bg_object:getWidth()
-	local height = bg_object:getHeight()
-	love.graphics.draw(
-		bg_object,
-		0, 0, 0,
-		640 / width, 480 / height
-	)
-end

load/save.lua

@@ -6,51 +6,19 @@ function loadSave()
 end
 
 function loadFromFile(filename)
-	local file_data = love.filesystem.read(filename)
+	local save_data, len = binser.readFile(filename)
-	if file_data == nil then
-		return {} -- new object
-	end
-	local save_data = binser.deserialize(file_data)
 	if save_data == nil then
 		return {} -- new object
 	end
 	return save_data[1]
 end
 
-function initConfig()
-	if not config.das then config.das = 10 end
-	if not config.arr then config.arr = 2 end
-	if not config.dcd then config.dcd = 0 end
-	if not config.sfx_volume then config.sfx_volume = 0.5 end
-	if not config.bgm_volume then config.bgm_volume = 0.5 end
 
-	if config.fullscreen == nil then config.fullscreen = false end
-	if config.secret == nil then config.secret = false end
-
-	if not config.gamesettings then config.gamesettings = {} end
-	for _, option in ipairs(GameConfigScene.options) do
-		if not config.gamesettings[option[1]] then
-			config.gamesettings[option[1]] = 1
-		end
-	end
-	
-	if not config.input then
-		scene = InputConfigScene()
-	else
-		if config.current_mode then current_mode = config.current_mode end
-		if config.current_ruleset then current_ruleset = config.current_ruleset end
-		scene = TitleScene()
-	end
-end
 
 function saveConfig()
-	love.filesystem.write(
+	binser.writeFile('config.sav', config)
-		'config.sav', binser.serialize(config)
-	)
 end
 
 function saveHighscores()
-	love.filesystem.write(
+	binser.writeFile('highscores.sav', highscores)
-		'highscores.sav', binser.serialize(highscores)
-	)
 end

load/sounds.lua

@@ -1,98 +1,59 @@
-sound_paths = {
+sounds = {
 	blocks = {
-		I = "res/se/piece_i.wav",
+		I = love.audio.newSource("res/se/piece_i.wav", "static"),
-		J = "res/se/piece_j.wav",
+		J = love.audio.newSource("res/se/piece_j.wav", "static"),
-		L = "res/se/piece_l.wav",
+		L = love.audio.newSource("res/se/piece_l.wav", "static"),
-		O = "res/se/piece_o.wav",
+		O = love.audio.newSource("res/se/piece_o.wav", "static"),
-		S = "res/se/piece_s.wav",
+		S = love.audio.newSource("res/se/piece_s.wav", "static"),
-		T = "res/se/piece_t.wav",
+		T = love.audio.newSource("res/se/piece_t.wav", "static"),
-		Z = "res/se/piece_z.wav"
+		Z = love.audio.newSource("res/se/piece_z.wav", "static")
 	},
-	move = "res/se/move.wav",
+	move = love.audio.newSource("res/se/move.wav", "static"),
-	rotate = "res/se/rotate.wav",
+	bottom = love.audio.newSource("res/se/bottom.wav", "static"),
-	kick = "res/se/kick.wav",
+	cursor = love.audio.newSource("res/se/cursor.wav", "static"),
-	bottom = "res/se/bottom.wav",
+	cursor_lr = love.audio.newSource("res/se/cursor_lr.wav", "static"),
-	cursor = "res/se/cursor.wav",
+	main_decide = love.audio.newSource("res/se/main_decide.wav", "static"),
-	cursor_lr = "res/se/cursor_lr.wav",
+	mode_decide = love.audio.newSource("res/se/mode_decide.wav", "static"),
-	main_decide = "res/se/main_decide.wav",
+	lock = love.audio.newSource("res/se/lock.wav", "static"),
-	mode_decide = "res/se/mode_decide.wav",
+	hold = love.audio.newSource("res/se/hold.wav", "static"),
-	lock = "res/se/lock.wav",
+	erase = love.audio.newSource("res/se/erase.wav", "static"),
-	hold = "res/se/hold.wav",
+	fall = love.audio.newSource("res/se/fall.wav", "static"),
-	erase = {
+	ready = love.audio.newSource("res/se/ready.wav", "static"),
-		single = "res/se/single.wav",
+	go = love.audio.newSource("res/se/go.wav", "static"),
-		double = "res/se/double.wav",
+	irs = love.audio.newSource("res/se/irs.wav", "static"),
-		triple = "res/se/triple.wav",
+	ihs = love.audio.newSource("res/se/ihs.wav", "static"),
-		quad = "res/se/quad.wav"
-	},
-	fall = "res/se/fall.wav",
-	ready = "res/se/ready.wav",
-	go = "res/se/go.wav",
-	irs = "res/se/irs.wav",
-	ihs = "res/se/ihs.wav",
 	-- a secret sound!
-	welcome = "res/se/welcomeToCambridge.wav",
+	welcome = love.audio.newSource("res/se/welcomeToCambridge.wav", "static"),
 }
 
-sounds = {}
--- Replace each sound effect string with its love audiosource counterpart, but only if it exists. This lets the game handle missing SFX.
-for k,v in pairs(sound_paths) do
-	if(type(v) == "table") then
-		-- list of subsounds
-		for k2,v2 in pairs(v) do
-			if(love.filesystem.getInfo(sound_paths[k][k2])) then
-				-- this file exists
-				sounds[k] = sounds[k] or {}
-				sounds[k][k2] = love.audio.newSource(sound_paths[k][k2], "static")
-			end
-		end
-	else
-		if(love.filesystem.getInfo(sound_paths[k])) then
-			-- this file exists
-			sounds[k] = love.audio.newSource(sound_paths[k], "static")
-		end
-	end
-end
-
 function playSE(sound, subsound)
-	if sound ~= nil then
+	if subsound == nil then
-		if sounds[sound] then
+		sounds[sound]:setVolume(config.sfx_volume)
-			if subsound ~= nil then
+		if sounds[sound]:isPlaying() then
-				if sounds[sound][subsound] then
+			sounds[sound]:stop()
+		end
+		sounds[sound]:play()
+	else
 		sounds[sound][subsound]:setVolume(config.sfx_volume)
 		if sounds[sound][subsound]:isPlaying() then
 			sounds[sound][subsound]:stop()
 		end
 		sounds[sound][subsound]:play()
 	end
-			else
-				sounds[sound]:setVolume(config.sfx_volume)
-				if sounds[sound]:isPlaying() then
-					sounds[sound]:stop()
-				end
-				sounds[sound]:play()
-			end
-		end
-	end
 end
 
 function playSEOnce(sound, subsound)
-	if sound ~= nil then
+	if subsound == nil then
-		if sounds[sound] then
+		sounds[sound]:setVolume(config.sfx_volume)
-			if subsound ~= nil then
+		if sounds[sound]:isPlaying() then
-				if sounds[sound][subsound] then
+			return
+		end
+		sounds[sound]:play()
+	else
 		sounds[sound][subsound]:setVolume(config.sfx_volume)
 		if sounds[sound][subsound]:isPlaying() then
 			return
 		end
 		sounds[sound][subsound]:play()
 	end
-			else
-				sounds[sound]:setVolume(config.sfx_volume)
-				if sounds[sound]:isPlaying() then
-					return
-				end
-				sounds[sound]:play()
-			end
-		end
-	end
 end

load/version.lua

@@ -1 +0,0 @@
-version = "v0.3.4"

main.lua

@@ -1,6 +1,6 @@
 function love.load()
+	math.randomseed(os.time())
 	highscores = {}
-	love.graphics.setDefaultFilter("linear", "nearest")
 	require "load.rpc"
 	require "load.graphics"
 	require "load.fonts"
@@ -8,50 +8,58 @@ function love.load()
 	require "load.bgm"
 	require "load.save"
 	require "load.bigint"
-	require "load.version"
 	loadSave()
-	require "funcs"
 	require "scene"
-	
 	--config["side_next"] = false
 	--config["reverse_rotate"] = true
-	--config["das_last_key"] = false
+	config["fullscreen"] = false
-	--config["fullscreen"] = false
 
 	love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
     
     -- used for screenshots
     GLOBAL_CANVAS = love.graphics.newCanvas()
 
-	-- aliasing to prevent people using math.random by accident
-	math.random = love.math.random
-	math.randomseed = love.math.setRandomSeed
-	math.randomseed(os.time())
-
 	-- init config
-	initConfig()
+	if not config.das then config.das = 10 end
+	if not config.arr then config.arr = 2 end
+	if not config.dcd then config.dcd = 0 end
+	if not config.sfx_volume then config.sfx_volume = 0.5 end
+	if not config.bgm_volume then config.bgm_volume = 0.5 end
 	
-	love.window.setFullscreen(config["fullscreen"])
+	if config.secret == nil then config.secret = false
-	if config.secret then playSE("welcome") end
+	elseif config.secret == true then playSE("welcome") end
 
-	-- import custom modules
+	if not config.gamesettings then
-	initModules()
+		config.gamesettings = {}
+		config["das_last_key"] = false
+	else
+		config["das_last_key"] = config.gamesettings.das_last_key == 2
+	end
+	for _, option in ipairs(GameConfigScene.options) do
+		if not config.gamesettings[option[1]] then
+			config.gamesettings[option[1]] = 1
+		end
+	end
+	
+	if not config.input then
+		scene = InputConfigScene()
+	else
+		if config.current_mode then current_mode = config.current_mode end
+		if config.current_ruleset then current_ruleset = config.current_ruleset end
+		scene = TitleScene()
 	end
 
-function initModules()
-	-- replays are not loaded here, but they are cleared
-	replays = {}
 	game_modes = {}
 	mode_list = love.filesystem.getDirectoryItems("tetris/modes")
 	for i=1,#mode_list do
-		if(mode_list[i] ~= "gamemode.lua" and string.sub(mode_list[i], -4) == ".lua") then
+		if(mode_list[i] ~= "gamemode.lua" and mode_list[i] ~= "unrefactored_modes") then
 			game_modes[#game_modes+1] = require ("tetris.modes."..string.sub(mode_list[i],1,-5))
 		end
 	end
 	rulesets = {}
 	rule_list = love.filesystem.getDirectoryItems("tetris/rulesets")
 	for i=1,#rule_list do
-		if(rule_list[i] ~= "ruleset.lua" and string.sub(rule_list[i], -4) == ".lua") then
+		if(rule_list[i] ~= "ruleset.lua" and rule_list[i] ~= "unrefactored_rulesets") then
 			rulesets[#rulesets+1] = require ("tetris.rulesets."..string.sub(rule_list[i],1,-5))
 		end
 	end
@@ -61,6 +69,45 @@ function initModules()
 	return tostring(a.name):gsub("%d+",padnum) < tostring(b.name):gsub("%d+",padnum) end)
 	table.sort(rulesets, function(a,b)
 	return tostring(a.name):gsub("%d+",padnum) < tostring(b.name):gsub("%d+",padnum) end)
+	
+end
+
+local TARGET_FPS = 60
+local SAMPLE_SIZE = 60
+
+local rolling_samples = {}
+local rolling_total = 0
+local average_n = 0
+local frame = 0
+
+function getSmoothedDt(dt)
+	rolling_total = rolling_total + dt
+	frame = frame + 1
+	if frame > SAMPLE_SIZE then frame = frame - SAMPLE_SIZE end
+	if average_n == SAMPLE_SIZE then
+		rolling_total = rolling_total - rolling_samples[frame]
+	else
+		average_n = average_n + 1
+	end
+	rolling_samples[frame] = dt
+	return rolling_total / average_n
+end
+
+local update_time = 0.52
+
+function love.update(dt)
+	processBGMFadeout(dt)
+	local old_update_time = update_time
+	update_time = update_time + getSmoothedDt(dt) * TARGET_FPS
+	updates = 0
+	while (update_time >= 1.02) do
+		scene:update()
+		updates = updates + 1
+		update_time = update_time - 1
+	end
+	if math.abs(update_time - old_update_time) < 0.02 then
+		update_time = old_update_time
+	end
 end
 
 function love.draw()
@@ -70,6 +117,7 @@ function love.draw()
     love.graphics.push()
 
 	-- get offset matrix
+	love.graphics.setDefaultFilter("linear", "nearest")
 	local width = love.graphics.getWidth()
 	local height = love.graphics.getHeight()
 	local scale_factor = math.min(width / 640, height / 480)
@@ -80,16 +128,6 @@ function love.draw()
 	love.graphics.scale(scale_factor)
     
 	scene:render()
-
-	if config.gamesettings.display_gamemode == 1 or scene.title == "Title" then
-		love.graphics.setFont(font_3x5_2)
-		love.graphics.setColor(1, 1, 1, 1)
-		love.graphics.printf(
-			string.format("%.2f", 1.0 / love.timer.getAverageDelta()) ..
-			"fps - " .. version, 0, 460, 635, "right"
-		)
-	end
-	
 	love.graphics.pop()
     
     love.graphics.setCanvas()
@@ -99,30 +137,26 @@ end
 
 function love.keypressed(key, scancode)
 	-- global hotkeys
-	if scancode == "f11" then
+	if scancode == "f4" then
 		config["fullscreen"] = not config["fullscreen"]
-		saveConfig()
 		love.window.setFullscreen(config["fullscreen"])
 	elseif scancode == "f2" and scene.title ~= "Input Config" and scene.title ~= "Game" then
 		scene = InputConfigScene()
 		switchBGM(nil)
-		loadSave()
 	-- secret sound playing :eyes:
 	elseif scancode == "f8" and scene.title == "Title" then
 		config.secret = not config.secret
 		saveConfig()
 		scene.restart_message = true
 		if config.secret then playSE("mode_decide")
-		else playSE("erase", "single") end
+		else playSE("erase") end
     -- f12 is reserved for saving screenshots
     elseif scancode == "f12" then
         local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
-		local info = love.filesystem.getInfo("ss", "directory")
+        if not love.filesystem.getInfo("ss") then
-		if not info then
-			love.filesystem.remove("ss")
             love.filesystem.createDirectory("ss")
         end
-		print("Saving screenshot as "..love.filesystem.getSaveDirectory().."/"..ss_name)
+        print("Saving screenshot as "..ss_name)
         GLOBAL_CANVAS:newImageData():encode("png", ss_name)
 	-- function keys are reserved
 	elseif string.match(scancode, "^f[1-9]$") or string.match(scancode, "^f[1-9][0-9]+$") then
@@ -194,13 +228,13 @@ function love.joystickaxis(joystick, axis, value)
 		config.input.joysticks[joystick:getName()].axes and
 		config.input.joysticks[joystick:getName()].axes[axis] 
 	then
-		if math.abs(value) >= 1 then
+		if math.abs(value) >= 0.5 then
-			input_pressed = config.input.joysticks[joystick:getName()].axes[axis][value >= 1 and "positive" or "negative"]
+			input_pressed = config.input.joysticks[joystick:getName()].axes[axis][value >= 0.5 and "positive" or "negative"]
 		end
 		positive_released = config.input.joysticks[joystick:getName()].axes[axis].positive
 		negative_released = config.input.joysticks[joystick:getName()].axes[axis].negative
 	end
-	if math.abs(value) >= 1 then
+	if math.abs(value) >= 0.5 then
 		scene:onInputPress({input=input_pressed, type="joyaxis", name=joystick:getName(), axis=axis, value=value})
 	else
 		scene:onInputRelease({input=positive_released, type="joyaxis", name=joystick:getName(), axis=axis, value=value})
@@ -208,14 +242,6 @@ function love.joystickaxis(joystick, axis, value)
 	end
 end
 
-local last_hat_direction = ""
-local directions = {
-	["u"] = "up",
-	["d"] = "down",
-	["l"] = "left",
-	["r"] = "right",
-}
-
 function love.joystickhat(joystick, hat, direction)
 	local input_pressed = nil
 	local has_hat = false
@@ -232,127 +258,29 @@ function love.joystickhat(joystick, hat, direction)
 		has_hat = true
 	end
 	if input_pressed then
-		for i = 1, #direction do
+		scene:onInputPress({input=input_pressed, type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
-			local char = direction:sub(i, i)
-			local _, count = last_hat_direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputPress({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		for i = 1, #last_hat_direction do
-			local char = last_hat_direction:sub(i, i)
-			local _, count = direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		last_hat_direction = direction
 	elseif has_hat then
 		for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do
 			scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][direction], type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
 		end
-		last_hat_direction = ""
 	elseif direction ~= "c" then
-		for i = 1, #direction do
+		scene:onInputPress({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
-			local char = direction:sub(i, i)
-			local _, count = last_hat_direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputPress({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		for i = 1, #last_hat_direction do
-			local char = last_hat_direction:sub(i, i)
-			local _, count = direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputRelease({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		last_hat_direction = direction
 	else
 		for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do
 			scene:onInputRelease({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
 		end
-		last_hat_direction = ""
 	end
 end
 
-function love.wheelmoved(x, y)
+function love.focus(f)
-	scene:onInputPress({input=nil, type="wheel", x=x, y=y})
+	if f and (scene.title ~= "Game" or not scene.paused) then
+		resumeBGM()
+	else
+		pauseBGM()
+	end
 end
 
 function love.resize(w, h)
     GLOBAL_CANVAS:release()
     GLOBAL_CANVAS = love.graphics.newCanvas(w, h)
 end
-
--- higher values of TARGET_FPS will make the game run "faster"
--- since the game is mostly designed for 60 FPS
-local TARGET_FPS = 60
-local FRAME_DURATION = 1.0 / TARGET_FPS
-
--- custom run function; optimizes game by syncing draw/update calls
-function love.run()
-	if love.load then love.load(love.arg.parseGameArguments(arg), arg) end
-
-	if love.timer then love.timer.step() end
-
-	local dt = 0
-
-	local last_time = love.timer.getTime()
-	local time_accumulator = 0.0
-	return function()
-		if love.event then
-			love.event.pump()
-			for name, a,b,c,d,e,f in love.event.poll() do
-				if name == "quit" then
-					if not love.quit or not love.quit() then
-						return a or 0
-					end
-				end
-				love.handlers[name](a,b,c,d,e,f)
-			end
-		end
-
-		if love.timer then
-			processBGMFadeout(love.timer.step())
-		end
-		
-		if scene and scene.update and love.timer then
-			scene:update()
-
-			if time_accumulator < FRAME_DURATION then
-				if love.graphics and love.graphics.isActive() and love.draw then
-					love.graphics.origin()
-					love.graphics.clear(love.graphics.getBackgroundColor())
-					love.draw()
-					love.graphics.present()
-				end
-
-				-- request 1ms delays first but stop short of overshooting, then do "0ms" delays without overshooting (0ms requests generally do a delay of some nonzero amount of time, but maybe less than 1ms)
-				for milliseconds=0.001,0.000,-0.001 do
-					local max_delay = 0.0
-					while max_delay < FRAME_DURATION do
-						local delay_start_time = love.timer.getTime()
-						if delay_start_time - last_time < FRAME_DURATION - max_delay then
-							love.timer.sleep(milliseconds)
-							local last_delay = love.timer.getTime() - delay_start_time
-							if last_delay > max_delay then
-								max_delay = last_delay
-							end
-						else
-							break
-						end
-					end
-				end
-				while love.timer.getTime() - last_time < FRAME_DURATION do
-					-- busy loop, do nothing here until delay is finished; delays above stop short of finishing, so this part can finish it off precisely
-				end
-			end
-
-			local finish_delay_time = love.timer.getTime()
-			local real_frame_duration = finish_delay_time - last_time
-			time_accumulator = time_accumulator + real_frame_duration - FRAME_DURATION
-			last_time = finish_delay_time
-		end
-	end
-end

package

@@ -1,3 +1 @@
-#!/bin/sh
-
 zip -r cambridge.love libs load res scene tetris conf.lua main.lua scene.lua funcs.lua

release

@@ -1,13 +1,9 @@
-#!/bin/sh
+./package
-
-./package-love.sh
 mkdir dist
 mkdir dist/windows
 mkdir dist/win32
-mkdir dist/other
+cp cambridge.love dist/
 cat dist/windows/love.exe cambridge.love > dist/windows/cambridge.exe
 zip dist/cambridge-windows.zip dist/windows/* SOURCES.md LICENSE.md
 cat dist/win32/love.exe cambridge.love > dist/win32/cambridge.exe
 zip dist/cambridge-win32.zip dist/win32/* SOURCES.md LICENSE.md
-cp cambridge.love dist/other/
-zip dist/cambridge-other.zip cambridge.love libs/discord-rpc.* SOURCES.md LICENSE.md

release.bat

@@ -5,23 +5,17 @@ mkdir dist\windows
 mkdir dist\windows\libs
 mkdir dist\win32
 mkdir dist\win32\libs
-mkdir dist\other
-mkdir dist\other\libs
 
 copy /b dist\windows\love.exe+cambridge.love dist\windows\cambridge.exe
 copy /b dist\win32\love.exe+cambridge.love dist\win32\cambridge.exe
-copy /b cambridge.love dist\other\cambridge.love
 
 copy libs\discord-rpc.dll dist\windows\libs
 copy libs\discord-rpc.dll dist\win32\libs
-copy libs\discord-rpc.* dist\other\libs
 
 copy SOURCES.md dist\windows
 copy LICENSE.md dist\windows
 copy SOURCES.md dist\win32
 copy LICENSE.md dist\win32
-copy SOURCES.md dist\other
-copy LICENSE.md dist\other
 
 cd dist\windows
 tar -a -c -f ..\cambridge-windows.zip cambridge.exe *.dll libs *.md
@@ -30,7 +24,3 @@ cd ..\..
 cd dist\win32
 tar -a -c -f ..\cambridge-win32.zip cambridge.exe *.dll libs *.md
 cd ..\..
-
-cd dist\other
-tar -a -c -f ..\cambridge-other.zip cambridge.love libs *.md
-cd ..\..

res/backgrounds/extend_section_bg.lua

@@ -1,14 +0,0 @@
--- ex: extend_section_bg[100] = 0
---     extend_section_bg[200] = 0
--- the video background associated with section 0 will continue playing into 100 and 200 without restarting.
--- will also cause any existing level 100, 200 backgrounds specified to NOT render.
-
--- please also note that you cannot currently extend any "named" backgrounds, such as "title" and "options-input"
-
-extend_section_bg = {}
-
--- extend_section_bg[100] = 0
--- extend_section_bg[200] = 0
--- remove the dashes 
-
-return extend_section_bg