stjr
/
Kart-Public
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Little fixes

This commit is contained in:
Sally Coolatta 2020-08-16 21:31:03 -04:00
parent c8fa1dcfb5
commit 07c916f6d2
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian-template/source/options
View File

@ -2,10 +2,7 @@ tar-ignore = "assets/*.srb"
tar-ignore = "assets/*.pk3" tar-ignore = "assets/*.pk3"
tar-ignore = "assets/*.dta" tar-ignore = "assets/*.dta"
tar-ignore = "assets/*.wad" tar-ignore = "assets/*.wad"
<<<<<<< HEAD:debian-template/source/options
tar-ignore = "assets/*.kart" tar-ignore = "assets/*.kart"
=======
>>>>>>> e251f9c230beda984cdcdea7e903d765f1c68f6f:debian-template/source/options
tar-ignore = "assets/debian/${PACKAGE_NAME}-data/*" tar-ignore = "assets/debian/${PACKAGE_NAME}-data/*"
tar-ignore = "assets/debian/tmp/*" tar-ignore = "assets/debian/tmp/*"
tar-ignore = "*.obj" tar-ignore = "*.obj"

37
src/discord.c
View File

@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2 // SONIC ROBO BLAST 2 KART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2012-2018 by Sally "TehRealSalt" Cochenour. // Copyright (C) 2018-2020 by Sally "TehRealSalt" Cochenour.
// Copyright (C) 2012-2016 by Sonic Team Junior. // Copyright (C) 2018-2020 by Kart Krew.
// //
// This program is free software distributed under the // This program is free software distributed under the
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
@ -25,7 +25,7 @@
#include "discord.h" #include "discord.h"
#include "doomdef.h" #include "doomdef.h"
#define DISCORD_APPID "503531144395096085" // Feel free to provide your own, if you care. #define DISCORD_APPID "503531144395096085" // Feel free to use your own, if you care.
// //
// DRPC_Handle's // DRPC_Handle's
@ -42,7 +42,7 @@ static inline void DRPC_HandleDisconnect(int err, const char *msg)
static inline void DRPC_HandleError(int err, const char *msg) static inline void DRPC_HandleError(int err, const char *msg)
{ {
CONS_Printf("Discord: error (%d, %s)\n", err, msg); CONS_Alert(CONS_WARNING, "Discord: error (%d, %s)\n", err, msg);
} }
static inline void DRPC_HandleJoin(const char *secret) static inline void DRPC_HandleJoin(const char *secret)
@ -91,25 +91,28 @@ void DRPC_UpdatePresence(void)
case -1: discordPresence.state = "Private"; break; // Private server case -1: discordPresence.state = "Private"; break; // Private server
case 33: discordPresence.state = "Standard"; break; case 33: discordPresence.state = "Standard"; break;
case 28: discordPresence.state = "Casual"; break; case 28: discordPresence.state = "Casual"; break;
default: discordPresence.state = "???"; break; // How? default: discordPresence.state = "???"; break; // HOW
} }
discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field! if (ms_RoomId != -1)
// Grab the host's IP for joining.
if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
{ {
discordPresence.joinSecret = address; discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field!
CONS_Printf("%s\n", address);
}
discordPresence.partySize = D_NumPlayers(); // Players in server // Grab the host's IP for joining.
discordPresence.partyMax = cv_maxplayers.value; // Max players (turned into a netvar for this, FOR NOW!) if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
{
discordPresence.joinSecret = address;
CONS_Printf("%s\n", address);
}
discordPresence.partySize = D_NumPlayers(); // Players in server
discordPresence.partyMax = cv_maxplayers.value; // Max players (turned into a netvar for this, FOR NOW!)
}
} }
else if (Playing()) else if (Playing())
discordPresence.state = "Offline"; discordPresence.state = "Offline";
else if (demoplayback) else if (demo.playback)
discordPresence.state = "Watching Demo"; discordPresence.state = "Watching Replay";
else else
discordPresence.state = "Menu"; discordPresence.state = "Menu";

1
src/k_kart.h
View File

@ -56,6 +56,7 @@ INT32 K_GetKartDriftSparkValue(player_t *player);
void K_KartUpdatePosition(player_t *player); void K_KartUpdatePosition(player_t *player);
void K_DropItems(player_t *player); void K_DropItems(player_t *player);
void K_DropRocketSneaker(player_t *player); void K_DropRocketSneaker(player_t *player);
void K_DropKitchenSink(player_t *player);
void K_StripItems(player_t *player); void K_StripItems(player_t *player);
void K_StripOther(player_t *player); void K_StripOther(player_t *player);
void K_MomentumToFacing(player_t *player); void K_MomentumToFacing(player_t *player);