diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
index 53cd2f2c19..801f7153dc 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -414,7 +414,11 @@ if(BuildMPEngine)
elseif(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${OpenJKLibDir}/discord-rpc/include)
set(MPEngineDefines ${MPEngineDefines} "DISCORD")
- set(MPEngineLibraries ${MPEngineLibraries} ${OpenJKLibDir}/discord-rpc/lib/discord-rpc.lib)
+ set(MPEngineLibraries ${MPEngineLibraries} ${OpenJKLibDir}/discord-rpc/lib/x86/discord-rpc.lib)
+ elseif(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${OpenJKLibDir}/discord-rpc/include)
+ set(MPEngineDefines ${MPEngineDefines} "DISCORD")
+ set(MPEngineLibraries ${MPEngineLibraries} ${OpenJKLibDir}/discord-rpc/lib/x64/discord-rpc.lib)
endif()
endif(BuildDiscordRichPresence)
diff --git a/codemp/cgame/cg_local.h b/codemp/cgame/cg_local.h
index c2925551d8..b2082b9ccc 100644
--- a/codemp/cgame/cg_local.h
+++ b/codemp/cgame/cg_local.h
@@ -318,7 +318,7 @@ typedef struct playerEntity_s {
#define DEFAULT_MALE_SOUNDPATH "chars/mp_generic_male/misc"//"chars/kyle/misc"
//Let's use 14 bytes because OpenJK and JA++ game modules both use 16 bytes buffer for color1, so if we support up to 16 only, we can pretty much use this on any server.
-//The remaining 2 bytes are to support the actual saber colors, since EternalJK supports up to 12 colors, we need to reserve 2 bytes for the color.
+//The remaining 2 bytes are to support the actual saber colors, since TaystJK supports up to 12 colors, we need to reserve 2 bytes for the color.
#define MAX_COSMETIC_LENGTH 14
#define COSMETIC_HATS_PATH "models/cosmetics/hats/"
diff --git a/codemp/cgame/hud_strafehelper.h b/codemp/cgame/hud_strafehelper.h
index 27df85b9db..b311d9feba 100644
--- a/codemp/cgame/hud_strafehelper.h
+++ b/codemp/cgame/hud_strafehelper.h
@@ -25,8 +25,8 @@ along with this program; if not, see .
===========================================================================
*/
-#ifndef ETERNALJK_HUD_STRAFEHELPER_H
-#define ETERNALJK_HUD_STRAFEHELPER_H
+#ifndef TAYSTJK_HUD_STRAFEHELPER_H
+#define TAYSTJK_HUD_STRAFEHELPER_H
#include "cg_local.h"
#include "../ui/ui_shared.h"
@@ -333,4 +333,4 @@ int maxSpeedSample;
dfstate state;
speedgraph_t speedgraph;
-#endif //ETERNALJK_HUD_STRAFEHELPER_H
+#endif //TAYSTJK_HUD_STRAFEHELPER_H
diff --git a/codemp/cgame/hud_tribes.h b/codemp/cgame/hud_tribes.h
index dbd1feb02b..5052c1236a 100644
--- a/codemp/cgame/hud_tribes.h
+++ b/codemp/cgame/hud_tribes.h
@@ -1,5 +1,5 @@
-#ifndef ETERNALJK_HUD_TRIBES_H
-#define ETERNALJK_HUD_TRIBES_H
+#ifndef TAYSTJK_HUD_TRIBES_H
+#define TAYSTJK_HUD_TRIBES_H
//includes
#include "cg_local.h"
diff --git a/codemp/client/cl_discordrpc.cpp b/codemp/client/cl_discordrpc.cpp
index 58447eac1a..709a7fbd5c 100644
--- a/codemp/client/cl_discordrpc.cpp
+++ b/codemp/client/cl_discordrpc.cpp
@@ -11,7 +11,7 @@ You need to link the static library also 'discord_rpc.lib'.
//Author: Blackwolf
//This is my Application ID of the Discord Developer section, feel free to use it.
-static const char* APPLICATION_ID = "459923453139746816";
+static const char* APPLICATION_ID = "1235827127321100338";
typedef struct statusIcon_s {
char *string;
diff --git a/codemp/ui/ui_local.h b/codemp/ui/ui_local.h
index 520715015a..473e3d200d 100644
--- a/codemp/ui/ui_local.h
+++ b/codemp/ui/ui_local.h
@@ -155,7 +155,7 @@ typedef struct playerInfo_s {
#define MAX_SCROLLTEXT_LINES 64
//Let's use 14 bytes because OpenJK and JA++ game modules both use 16 bytes buffer for color1, so if we support up to 16 only, we can pretty much use this on any server.
-//The remaining 2 bytes are to support the actual saber colors, since EternalJK supports up to 12 colors, we need to reserve 2 bytes for the color.
+//The remaining 2 bytes are to support the actual saber colors, since TaystJK supports up to 12 colors, we need to reserve 2 bytes for the color.
#define MAX_COSMETIC_LENGTH 14
typedef struct aliasInfo_s {
diff --git a/codemp/ui/ui_xcvar.h b/codemp/ui/ui_xcvar.h
index 76f66c20b6..cf785669a4 100644
--- a/codemp/ui/ui_xcvar.h
+++ b/codemp/ui/ui_xcvar.h
@@ -34,7 +34,7 @@ along with this program; if not, see .
#endif
XCVAR_DEF( capturelimit, "0", NULL, CVAR_ARCHIVE|CVAR_NORESTART|CVAR_SERVERINFO ) // fixme init'd to 8 in game module
-XCVAR_DEF( cl_ratioFix, "1", UI_Set2DRatio, CVAR_ARCHIVE ) //cvar name is shared in jaPRO cgame & EternalJK engine
+XCVAR_DEF( cl_ratioFix, "1", UI_Set2DRatio, CVAR_ARCHIVE ) //cvar name is shared in jaPRO cgame & TaystJK engine
XCVAR_DEF( cg_drawCrosshair, "1", NULL, CVAR_ARCHIVE )
XCVAR_DEF( cg_drawCrosshairNames, "1", NULL, CVAR_ARCHIVE )
XCVAR_DEF( cg_marks, "1", NULL, CVAR_ARCHIVE )
diff --git a/codemp/ui/ui_xdocs.complete.h b/codemp/ui/ui_xdocs.complete.h
index ca7841bd11..a19060e25e 100644
--- a/codemp/ui/ui_xdocs.complete.h
+++ b/codemp/ui/ui_xdocs.complete.h
@@ -77,7 +77,7 @@
/* --------------------------------------------------- */
/* CVARS */
-// EternalJK HUD cvars:
+// TaystJK HUD cvars:
//XDOCS_CVAR_DEF("cg_", "Description",
//"More somethings if needed." NL
@@ -345,7 +345,7 @@ XDOCS_CVAR_DEF("cg_teamChatsOnly", "Hide non-team chat messages",
/* --------------------------------------------------- */
/* COMMANDS */
-// EternalJK commands:
+// TaystJK commands:
XDOCS_CMD_DEF("clientlist", "Displays a list of all connected clients and their real client numbers")
diff --git a/codemp/ui/ui_xdocs.h b/codemp/ui/ui_xdocs.h
index aed15ab3a8..14c89d9849 100644
--- a/codemp/ui/ui_xdocs.h
+++ b/codemp/ui/ui_xdocs.h
@@ -70,7 +70,7 @@
/* --------------------------------------------------- */
/* CVARS */
-// EternalJK HUD cvars:
+// TaystJK HUD cvars:
//XDOCS_CVAR_DEF("cg_", "Description",
//"More somethings if needed." NL
//SETTING("0", "something something probably (Base behavior)") NL
@@ -554,7 +554,7 @@ XDOCS_CVAR_DEF("cg_pitchHudRgba", "Color of the pitch HUD",""
/* --------------------------------------------------- */
/* COMMANDS */
-// EternalJK console commands:
+// TaystJK console commands:
XDOCS_CMD_DEF("clientlist", "Displays a list of all connected clients and their real client numbers")
diff --git a/lib/discord-rpc/lib/x64/discord-rpc.lib b/lib/discord-rpc/lib/x64/discord-rpc.lib
new file mode 100644
index 0000000000..e722fbfb68
Binary files /dev/null and b/lib/discord-rpc/lib/x64/discord-rpc.lib differ
diff --git a/lib/discord-rpc/lib/discord-rpc.lib b/lib/discord-rpc/lib/x86/discord-rpc.lib
similarity index 100%
rename from lib/discord-rpc/lib/discord-rpc.lib
rename to lib/discord-rpc/lib/x86/discord-rpc.lib
diff --git a/shared/sys/sys_main.cpp b/shared/sys/sys_main.cpp
index 5386e46480..07cb0d136d 100644
--- a/shared/sys/sys_main.cpp
+++ b/shared/sys/sys_main.cpp
@@ -385,7 +385,7 @@ enum SearchPathFlag
{
SEARCH_PATH_MOD = 1 << 0,
SEARCH_PATH_BASE = 1 << 1,
- SEARCH_PATH_ETERNALJK = 1 << 2,
+ SEARCH_PATH_TAYSTJK = 1 << 2,
SEARCH_PATH_ROOT = 1 << 3
};
@@ -412,7 +412,7 @@ static void *Sys_LoadDllFromPaths( const char *filename, const char *gamedir, co
}
}
- if (searchFlags & SEARCH_PATH_ETERNALJK)
+ if (searchFlags & SEARCH_PATH_TAYSTJK)
{
for (size_t i = 0; i < numPaths; i++)
{
@@ -530,7 +530,7 @@ void *Sys_LoadLegacyGameDll( const char *name, VMMainProc **vmMain, SystemCallPr
};
size_t numPaths = ARRAY_LEN( searchPaths );
- libHandle = Sys_LoadDllFromPaths( filename, gamedir, searchPaths, numPaths, SEARCH_PATH_BASE | SEARCH_PATH_ETERNALJK | SEARCH_PATH_MOD, __FUNCTION__ );
+ libHandle = Sys_LoadDllFromPaths( filename, gamedir, searchPaths, numPaths, SEARCH_PATH_BASE | SEARCH_PATH_TAYSTJK | SEARCH_PATH_MOD, __FUNCTION__ );
if ( !libHandle )
return NULL;
}
@@ -612,7 +612,7 @@ void *Sys_LoadGameDll( const char *name, GetModuleAPIProc **moduleAPI )
};
size_t numPaths = ARRAY_LEN( searchPaths );
- libHandle = Sys_LoadDllFromPaths( filename, gamedir, searchPaths, numPaths, SEARCH_PATH_BASE | SEARCH_PATH_ETERNALJK | SEARCH_PATH_MOD, __FUNCTION__ );
+ libHandle = Sys_LoadDllFromPaths( filename, gamedir, searchPaths, numPaths, SEARCH_PATH_BASE | SEARCH_PATH_TAYSTJK | SEARCH_PATH_MOD, __FUNCTION__ );
if ( !libHandle )
return NULL;
}