1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
Description: Completely disable Discord integration
Forwarded: not-needed
--- a/code/source_groups.cmake
+++ b/code/source_groups.cmake
@@ -718,13 +718,8 @@
libs/antlr/ErrorListener.cpp
libs/antlr/ErrorListener.h
)
-add_file_folder("Libs\\\\Discord"
- libs/discord/discord.cpp
- libs/discord/discord.h
-)
-
if (FSO_BUILD_WITH_FFMPEG)
add_file_folder("Libs\\\\FFmpeg"
libs/ffmpeg/FFmpeg.cpp
libs/ffmpeg/FFmpeg.h
--- a/freespace2/freespace.cpp
+++ b/freespace2/freespace.cpp
@@ -2043,11 +2043,8 @@
if ( !Is_standalone ) {
#ifdef WITH_FFMPEG
libs::ffmpeg::initialize();
#endif
- if (Discord_presence) {
- libs::discord::init();
- }
}
nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));
nprintf(("General", "Weapons.tbl is : %s\n", Game_weapons_tbl_valid ? "VALID" : "INVALID!!!!"));
--- a/code/mod_table/mod_table.cpp
+++ b/code/mod_table/mod_table.cpp
@@ -157,19 +157,8 @@
.default_val(Discord_presence)
.level(options::ExpertLevel::Advanced)
.importance(55)
.change_listener([](bool val, bool) {
- if(Discord_presence){
- if (!val) {
- Discord_presence = false;
- libs::discord::shutdown();
- }
- } else {
- if (val) {
- Discord_presence = true;
- libs::discord::init();
- }
- }
return true;
})
.finish();
--- a/code/scripting/api/libs/base.cpp
+++ b/code/scripting/api/libs/base.cpp
@@ -751,15 +751,17 @@
if (!ade_get_args(L, "s|b", &text, &gp)) {
return ADE_RETURN_NIL;
}
+/**
if (gp) {
if ((Game_mode & GM_IN_MISSION) != 0){
libs::discord::set_presence_gameplay();
}
} else {
libs::discord::set_presence_string(text);
}
+*/
return ADE_RETURN_NIL;
}
|
