Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • STJr/SRB2
  • Sryder/SRB2
  • wolfy852/SRB2
  • Alpha2244/SRB2
  • Inuyasha/SRB2
  • yoshibot/SRB2
  • TehRealSalt/SRB2
  • PrisimaTF/SRB2
  • Hatninja/SRB2
  • SteelT/SRB2
  • james/SRB2
  • ShaderWraith/SRB2
  • SinnamonLat/SRB2
  • mazmazz_/SRB2
  • filpAM/SRB2
  • chaoloveicemdboy/SRB2
  • Whooa21/SRB2
  • Machturne/SRB2
  • Golden/SRB2
  • Tatsuru/SRB2
  • Snu/SRB2
  • Zwip-Zwap_Zapony/SRB2
  • fickleheart/SRB2
  • alphaRexJames/SRB2
  • JJK/SRB2
  • diskpoppy/SRB2
  • Hannu_Hanhi/SRB2
  • ZipperQR/SRB2
  • kays/SRB2
  • spherallic/SRB2
  • Zippy_Zolton/SRB2
  • namiishere/SRB2
  • Ors/SRB2
  • SMS_Alfredo/SRB2
  • sonic_edge/SRB2
  • lavla/SRB2
  • ashi/SRB2
  • X.organic/SRB2
  • Fafabis/SRB2
  • Meziu/SRB2
  • v-rob/SRB2
  • tertu/SRB2
  • bitten2up/SRB2
  • flarn2006/SRB2
  • Krabs/SRB2
  • clairebun/SRB2
  • Lactozilla/SRB2
  • thehackstack/SRB2
  • Spice/SRB2
  • win8linux/SRB2
  • JohnFrostFox/SRB2
  • talktoneon726/SRB2
  • Wane/SRB2
  • Lamibe/SRB2
  • spectrumuk2/srb-2
  • nerdyminer18/srb-2
  • 256nil/SRB2
  • ARJr/SRB2
  • Alam/SRB2
  • Zenya/srb-2-marathon-demos
  • Acelite/srb-2-archivedmodifications
  • MIDIMan/SRB2
  • Lach/SRB2
  • Frostiikin/bounce-tweaks
  • Jaden/SRB2
  • Tyron/SRB2
  • Astronight/SRB2
  • Mari0shi06/SRB2
  • aiire/SRB2
  • Galactice/SRB2
  • srb2-ports/srb2-dreamcast
  • sdasdas/SRB2
  • chreas/srb-2-vr
  • StarManiaKG/the-story-of-sinically-rocketing-and-botching-the-2nd
  • LoganAir/SRB2
  • NepDisk/srb-2
  • alufolie91/SRB2
  • Felicia.iso/SRB2
  • twi/SRB2
  • BarrelsOFun/SRB2
  • Speed2411/SRB2
  • Leather_Realms/SRB2
  • Ayemar/SRB2
  • Acelite/SRB2
  • VladDoc/SRB2
  • kaldrum/model-features
  • strawberryfox417/SRB2
  • Lugent/SRB2
  • Rem/SRB2
  • Refrag/SRB2
  • Henry_3230/srb-3230
  • TehPuertoRicanSpartan2/tprs-srb2
  • Leminn/srb-2-marathon-stuff
  • chromaticpipe2/SRB2
  • MiguelGustavo15/SRB2
  • Maru/srb-2-tests
  • SilicDev/SRB2
  • UnmatchedBracket/SRB2
  • HybridDog/SRB2
  • xordspar0/SRB2
  • jsjhbewfhh/SRB2
  • Fancy2209/SRB2
  • Lorsoen/SRB2
  • shindoukin/SRB2
  • GamerOfDays/SRB2
  • Craftyawesome/SRB2
  • tenshi-tensai-tennoji/SRB2
  • Scarfdudebalder/SRB2
  • luigi-budd/srb-2-fix-interplag-lockon
  • mskluesner/SRB2
  • johnpetersa19/SRB2
  • Pheazant/SRB2
  • chromaticpipe2/srb2classic
  • romoney5/SRB2
  • PAS/SRB2Classic
  • BlueStaggo/SRB2
  • Jisk/srb-2-beef-jerky
117 results
Select Git revision
Show changes
Commits on Source (6)
...@@ -641,6 +641,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) ...@@ -641,6 +641,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
msg = (char *)*p; msg = (char *)*p;
SKIPSTRINGL(*p, HU_MAXMSGLEN + 1); SKIPSTRINGL(*p, HU_MAXMSGLEN + 1);
// check if player is sending a say command while muted
// or if they are sending a csay and are not an admin
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum))) if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
{ {
CONS_Alert(CONS_WARNING, cv_mute.value ? CONS_Alert(CONS_WARNING, cv_mute.value ?
...@@ -680,6 +682,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) ...@@ -680,6 +682,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
stop_spamming[playernum] = 4; // you can hold off for 4 tics, can you? stop_spamming[playernum] = 4; // you can hold off for 4 tics, can you?
// run the lua hook even if we were supposed to eat the msg, netgame consistency goes first. // run the lua hook even if we were supposed to eat the msg, netgame consistency goes first.
// bitten's note: look into this if bugs can occure from this
if (LUA_HookPlayerMsg(playernum, target, flags, msg)) if (LUA_HookPlayerMsg(playernum, target, flags, msg))
return; return;
...@@ -711,6 +714,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) ...@@ -711,6 +714,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
// Clean up message a bit // Clean up message a bit
// If you use a \r character, you can remove your name // If you use a \r character, you can remove your name
// from before the text and then pretend to be someone else! // from before the text and then pretend to be someone else!
// bitten's note: i need to look into this, but you could just use \n to the same effect, why just filter \r
ptr = msg; ptr = msg;
while (*ptr != '\0') while (*ptr != '\0')
{ {
......
...@@ -39,7 +39,8 @@ void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum)) ...@@ -39,7 +39,8 @@ void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum))
void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam) void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam)
{ {
if (localtextcmd[0]+2+nparam > MAXTEXTCMD) // +1 for the size and another +1 for the ID.
if (localtextcmd[0] + 2 + nparam > MAXTEXTCMD)
{ {
// for future reference: if (cv_debug) != debug disabled. // for future reference: if (cv_debug) != debug disabled.
CONS_Alert(CONS_ERROR, M_GetText("NetXCmd buffer full, cannot add netcmd %d! (size: %d, needed: %s)\n"), id, localtextcmd[0], sizeu1(nparam)); CONS_Alert(CONS_ERROR, M_GetText("NetXCmd buffer full, cannot add netcmd %d! (size: %d, needed: %s)\n"), id, localtextcmd[0], sizeu1(nparam));
...@@ -57,7 +58,8 @@ void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam) ...@@ -57,7 +58,8 @@ void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam)
// splitscreen player // splitscreen player
void SendNetXCmd2(netxcmd_t id, const void *param, size_t nparam) void SendNetXCmd2(netxcmd_t id, const void *param, size_t nparam)
{ {
if (localtextcmd2[0]+2+nparam > MAXTEXTCMD) // +1 for the size and another +1 for the ID.
if (localtextcmd2[0] + 2 + nparam > MAXTEXTCMD)
{ {
I_Error("No more place in the buffer for netcmd %d\n",id); I_Error("No more place in the buffer for netcmd %d\n",id);
return; return;
......