From a8e350aed8597e009a120a42a5cabfe931696641 Mon Sep 17 00:00:00 2001 From: Boondorl Date: Fri, 5 Jan 2024 14:38:33 -0500 Subject: [PATCH] Renamed Networking Functions New names more appropriately match the size of the value they write to/read from the stream. --- src/console/c_cmds.cpp | 124 ++++++++++++++-------------- src/ct_chat.cpp | 4 +- src/d_main.cpp | 6 +- src/d_net.cpp | 106 ++++++++++++------------ src/d_net.h | 6 +- src/d_netinfo.cpp | 24 +++--- src/d_protocol.cpp | 82 +++++++++---------- src/d_protocol.h | 12 +-- src/events.cpp | 138 ++++++++++++++++---------------- src/events.h | 18 ++--- src/g_dumpinfo.cpp | 2 +- src/g_game.cpp | 66 +++++++-------- src/g_level.cpp | 2 +- src/gamedata/a_weapons.cpp | 38 ++++----- src/gamedata/info.cpp | 10 +-- src/gamedata/statistics.cpp | 2 +- src/m_cheat.cpp | 2 +- src/p_conversation.cpp | 14 ++-- src/playsim/bots/b_bot.cpp | 6 +- src/playsim/bots/b_game.cpp | 22 ++--- src/playsim/p_interaction.cpp | 14 ++-- src/playsim/p_lnspec.cpp | 2 +- src/playsim/p_user.cpp | 10 +-- src/st_stuff.cpp | 4 +- wadsrc/static/zscript/events.zs | 22 ++--- 25 files changed, 368 insertions(+), 368 deletions(-) diff --git a/src/console/c_cmds.cpp b/src/console/c_cmds.cpp index 0a54fde26..3871b47dd 100644 --- a/src/console/c_cmds.cpp +++ b/src/console/c_cmds.cpp @@ -120,8 +120,8 @@ CCMD (god) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_GOD); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_GOD); } CCMD(god2) @@ -129,8 +129,8 @@ CCMD(god2) if (CheckCheatmode()) return; - Net_WriteByte(DEM_GENERICCHEAT); - Net_WriteByte(CHT_GOD2); + Net_WriteInt8(DEM_GENERICCHEAT); + Net_WriteInt8(CHT_GOD2); } CCMD (iddqd) @@ -138,8 +138,8 @@ CCMD (iddqd) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_IDDQD); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_IDDQD); } CCMD (buddha) @@ -147,8 +147,8 @@ CCMD (buddha) if (CheckCheatmode()) return; - Net_WriteByte(DEM_GENERICCHEAT); - Net_WriteByte(CHT_BUDDHA); + Net_WriteInt8(DEM_GENERICCHEAT); + Net_WriteInt8(CHT_BUDDHA); } CCMD(buddha2) @@ -156,8 +156,8 @@ CCMD(buddha2) if (CheckCheatmode()) return; - Net_WriteByte(DEM_GENERICCHEAT); - Net_WriteByte(CHT_BUDDHA2); + Net_WriteInt8(DEM_GENERICCHEAT); + Net_WriteInt8(CHT_BUDDHA2); } CCMD (notarget) @@ -165,8 +165,8 @@ CCMD (notarget) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_NOTARGET); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_NOTARGET); } CCMD (fly) @@ -174,8 +174,8 @@ CCMD (fly) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_FLY); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_FLY); } /* @@ -190,8 +190,8 @@ CCMD (noclip) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_NOCLIP); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_NOCLIP); } CCMD (noclip2) @@ -199,8 +199,8 @@ CCMD (noclip2) if (CheckCheatmode()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_NOCLIP2); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_NOCLIP2); } CCMD (powerup) @@ -208,8 +208,8 @@ CCMD (powerup) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_POWER); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_POWER); } CCMD (morphme) @@ -219,12 +219,12 @@ CCMD (morphme) if (argv.argc() == 1) { - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_MORPH); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_MORPH); } else { - Net_WriteByte (DEM_MORPHEX); + Net_WriteInt8 (DEM_MORPHEX); Net_WriteString (argv[1]); } } @@ -234,8 +234,8 @@ CCMD (anubis) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_ANUBIS); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_ANUBIS); } // [GRB] @@ -244,8 +244,8 @@ CCMD (resurrect) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_RESSURECT); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_RESSURECT); } EXTERN_CVAR (Bool, chasedemo) @@ -276,8 +276,8 @@ CCMD (chase) if (gamestate != GS_LEVEL || (!(dmflags2 & DF2_CHASECAM) && deathmatch && CheckCheatmode ())) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_CHASECAM); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_CHASECAM); } } @@ -386,12 +386,12 @@ CCMD (changemap) { if (argv.argc() > 2) { - Net_WriteByte (DEM_CHANGEMAP2); - Net_WriteByte (atoi(argv[2])); + Net_WriteInt8 (DEM_CHANGEMAP2); + Net_WriteInt8 (atoi(argv[2])); } else { - Net_WriteByte (DEM_CHANGEMAP); + Net_WriteInt8 (DEM_CHANGEMAP); } Net_WriteString (mapname); } @@ -446,12 +446,12 @@ CCMD (give) if (CheckCheatmode () || argv.argc() < 2) return; - Net_WriteByte (DEM_GIVECHEAT); + Net_WriteInt8 (DEM_GIVECHEAT); Net_WriteString (argv[1]); if (argv.argc() > 2) - Net_WriteLong(atoi(argv[2])); + Net_WriteInt32(atoi(argv[2])); else - Net_WriteLong(0); + Net_WriteInt32(0); } CCMD (take) @@ -459,12 +459,12 @@ CCMD (take) if (CheckCheatmode () || argv.argc() < 2) return; - Net_WriteByte (DEM_TAKECHEAT); + Net_WriteInt8 (DEM_TAKECHEAT); Net_WriteString (argv[1]); if (argv.argc() > 2) - Net_WriteLong(atoi (argv[2])); + Net_WriteInt32(atoi (argv[2])); else - Net_WriteLong (0); + Net_WriteInt32 (0); } CCMD(setinv) @@ -472,17 +472,17 @@ CCMD(setinv) if (CheckCheatmode() || argv.argc() < 2) return; - Net_WriteByte(DEM_SETINV); + Net_WriteInt8(DEM_SETINV); Net_WriteString(argv[1]); if (argv.argc() > 2) - Net_WriteLong(atoi(argv[2])); + Net_WriteInt32(atoi(argv[2])); else - Net_WriteLong(0); + Net_WriteInt32(0); if (argv.argc() > 3) - Net_WriteByte(!!atoi(argv[3])); + Net_WriteInt8(!!atoi(argv[3])); else - Net_WriteByte(0); + Net_WriteInt8(0); } @@ -513,18 +513,18 @@ CCMD (puke) if (script > 0) { - Net_WriteByte (DEM_RUNSCRIPT); - Net_WriteWord (script); + Net_WriteInt8 (DEM_RUNSCRIPT); + Net_WriteInt16 (script); } else { - Net_WriteByte (DEM_RUNSCRIPT2); - Net_WriteWord (-script); + Net_WriteInt8 (DEM_RUNSCRIPT2); + Net_WriteInt16 (-script); } - Net_WriteByte (argn); + Net_WriteInt8 (argn); for (i = 0; i < argn; ++i) { - Net_WriteLong (arg[i]); + Net_WriteInt32 (arg[i]); } } } @@ -557,12 +557,12 @@ CCMD (pukename) arg[i] = atoi(argv[argstart + i]); } } - Net_WriteByte(DEM_RUNNAMEDSCRIPT); + Net_WriteInt8(DEM_RUNNAMEDSCRIPT); Net_WriteString(argv[1]); - Net_WriteByte(argn | (always << 7)); + Net_WriteInt8(argn | (always << 7)); for (i = 0; i < argn; ++i) { - Net_WriteLong(arg[i]); + Net_WriteInt32(arg[i]); } } } @@ -603,12 +603,12 @@ CCMD (special) return; } } - Net_WriteByte(DEM_RUNSPECIAL); - Net_WriteWord(specnum); - Net_WriteByte(argc - 2); + Net_WriteInt8(DEM_RUNSPECIAL); + Net_WriteInt16(specnum); + Net_WriteInt8(argc - 2); for (int i = 2; i < argc; ++i) { - Net_WriteLong(atoi(argv[i])); + Net_WriteInt32(atoi(argv[i])); } } } @@ -639,10 +639,10 @@ CCMD (warp) } else { - Net_WriteByte (DEM_WARPCHEAT); - Net_WriteWord (atoi (argv[1])); - Net_WriteWord (atoi (argv[2])); - Net_WriteWord (argv.argc() == 3 ? ONFLOORZ/65536 : atoi (argv[3])); + Net_WriteInt8 (DEM_WARPCHEAT); + Net_WriteInt16 (atoi (argv[1])); + Net_WriteInt16 (atoi (argv[2])); + Net_WriteInt16 (argv.argc() == 3 ? ONFLOORZ/65536 : atoi (argv[3])); } } @@ -951,8 +951,8 @@ CCMD(thaw) if (CheckCheatmode()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_CLEARFROZENPROPS); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_CLEARFROZENPROPS); } //----------------------------------------------------------------------------- diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp index ad4c99484..4175c0652 100644 --- a/src/ct_chat.cpp +++ b/src/ct_chat.cpp @@ -371,8 +371,8 @@ static void ShoveChatStr (const char *str, uint8_t who) who |= 2; } - Net_WriteByte (DEM_SAY); - Net_WriteByte (who); + Net_WriteInt8 (DEM_SAY); + Net_WriteInt8 (who); if (chat_substitution && DoSubstitution (substBuff, str)) { diff --git a/src/d_main.cpp b/src/d_main.cpp index cdc4f35cb..496bb6d27 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -428,14 +428,14 @@ CUSTOM_CVAR (Int, dmflags, 0, CVAR_SERVERINFO | CVAR_NOINITCALL) if (self & DF_NO_FREELOOK) { - Net_WriteByte (DEM_CENTERVIEW); + Net_WriteInt8 (DEM_CENTERVIEW); } // If nofov is set, force everybody to the arbitrator's FOV. if ((self & DF_NO_FOV) && consoleplayer == Net_Arbitrator) { float fov; - Net_WriteByte (DEM_FOV); + Net_WriteInt8 (DEM_FOV); // If the game is started with DF_NO_FOV set, the arbitrator's // DesiredFOV will not be set when this callback is run, so @@ -2629,7 +2629,7 @@ void Mlook_ReleaseHandler() { if (lookspring) { - Net_WriteByte(DEM_CENTERVIEW); + Net_WriteInt8(DEM_CENTERVIEW); } } diff --git a/src/d_net.cpp b/src/d_net.cpp index 6400ea058..83204dbc2 100644 --- a/src/d_net.cpp +++ b/src/d_net.cpp @@ -264,7 +264,7 @@ static struct TicSpecial if (streamptr) { CheckSpace (1); - WriteByte (it, &streamptr); + WriteInt8 (it, &streamptr); } return *this; } @@ -274,7 +274,7 @@ static struct TicSpecial if (streamptr) { CheckSpace (2); - WriteWord (it, &streamptr); + WriteInt16 (it, &streamptr); } return *this; } @@ -284,7 +284,7 @@ static struct TicSpecial if (streamptr) { CheckSpace (4); - WriteLong (it, &streamptr); + WriteInt32 (it, &streamptr); } return *this; } @@ -791,7 +791,7 @@ void GetPackets (void) { if (playeringame[i]) { - int resend = ReadLong (&foo); + int resend = ReadInt32 (&foo); if (i != consoleplayer) { resendto[nodeforplayer[i]] = resend; @@ -1246,7 +1246,7 @@ void NetUpdate (void) // the other players. if (l == 0) { - WriteWord (localcmds[localstart].consistancy, &cmddata); + WriteInt16 (localcmds[localstart].consistancy, &cmddata); // [RH] Write out special "ticcmds" before real ticcmd if (specials.used[start]) { @@ -1261,7 +1261,7 @@ void NetUpdate (void) int len; uint8_t *spec; - WriteWord (netcmds[playerbytes[l]][start].consistancy, &cmddata); + WriteInt16 (netcmds[playerbytes[l]][start].consistancy, &cmddata); spec = NetSpecs[playerbytes[l]][start].GetData (&len); if (spec != NULL) { @@ -1468,7 +1468,7 @@ bool DoArbitrate (void *userdata) stream = &netbuffer[3]; startmap = ReadStringConst(&stream); - rngseed = ReadLong (&stream); + rngseed = ReadInt32 (&stream); C_ReadCVars (&stream); } else if (netbuffer[0] == NCMD_SETUP+3) @@ -1536,7 +1536,7 @@ bool DoArbitrate (void *userdata) netbuffer[2] = NetMode; stream = &netbuffer[3]; WriteString (startmap.GetChars(), &stream); - WriteLong (rngseed, &stream); + WriteInt32 (rngseed, &stream); C_WriteCVars (&stream, CVAR_SERVERINFO, true); SendSetup (data->playersdetected, data->gotsetup, int(stream - netbuffer)); @@ -1779,7 +1779,7 @@ void D_QuitNetGame (void) for (i = 0; i < MAXPLAYERS; ++i) { if (playeringame[i] && i != consoleplayer) - WriteLong (resendto[nodeforplayer[i]], &foo); + WriteInt32 (resendto[nodeforplayer[i]], &foo); } k = int(foo - netbuffer); } @@ -2047,17 +2047,17 @@ void Net_NewMakeTic (void) specials.NewMakeTic (); } -void Net_WriteByte (uint8_t it) +void Net_WriteInt8 (uint8_t it) { specials << it; } -void Net_WriteWord (short it) +void Net_WriteInt16 (short it) { specials << it; } -void Net_WriteLong (int it) +void Net_WriteInt32 (int it) { specials << it; } @@ -2171,7 +2171,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_SAY: { const char *name = players[player].userinfo.GetName(); - uint8_t who = ReadByte (stream); + uint8_t who = ReadInt8 (stream); s = ReadStringConst(stream); if (((who & 1) == 0) || players[player].userinfo.GetTeam() == TEAM_NONE) @@ -2227,7 +2227,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_GIVECHEAT: s = ReadStringConst(stream); - cht_Give (&players[player], s, ReadLong (stream)); + cht_Give (&players[player], s, ReadInt32 (stream)); if (player != consoleplayer) { FString message = GStrings("TXT_X_CHEATS"); @@ -2239,31 +2239,31 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_TAKECHEAT: s = ReadStringConst(stream); - cht_Take (&players[player], s, ReadLong (stream)); + cht_Take (&players[player], s, ReadInt32 (stream)); break; case DEM_SETINV: s = ReadStringConst(stream); - i = ReadLong(stream); - cht_SetInv(&players[player], s, i, !!ReadByte(stream)); + i = ReadInt32(stream); + cht_SetInv(&players[player], s, i, !!ReadInt8(stream)); break; case DEM_WARPCHEAT: { int x, y, z; - x = ReadWord (stream); - y = ReadWord (stream); - z = ReadWord (stream); + x = ReadInt16 (stream); + y = ReadInt16 (stream); + z = ReadInt16 (stream); P_TeleportMove (players[player].mo, DVector3(x, y, z), true); } break; case DEM_GENERICCHEAT: - cht_DoCheat (&players[player], ReadByte (stream)); + cht_DoCheat (&players[player], ReadInt8 (stream)); break; case DEM_CHANGEMAP2: - pos = ReadByte (stream); + pos = ReadInt8 (stream); /* intentional fall-through */ case DEM_CHANGEMAP: // Change to another map without disconnecting other players @@ -2312,10 +2312,10 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_INVUSE: case DEM_INVDROP: { - uint32_t which = ReadLong (stream); + uint32_t which = ReadInt32 (stream); int amt = -1; - if (type == DEM_INVDROP) amt = ReadLong(stream); + if (type == DEM_INVDROP) amt = ReadInt32(stream); if (gamestate == GS_LEVEL && !paused && players[player].playerstate != PST_DEAD) @@ -2357,10 +2357,10 @@ void Net_DoCommand (int type, uint8_t **stream, int player) s = ReadStringConst(stream); if (type >= DEM_SUMMON2 && type <= DEM_SUMMONFOE2) { - angle = ReadWord(stream); - tid = ReadWord(stream); - special = ReadByte(stream); - for(i = 0; i < 5; i++) args[i] = ReadLong(stream); + angle = ReadInt16(stream); + tid = ReadInt16(stream); + special = ReadInt8(stream); + for(i = 0; i < 5; i++) args[i] = ReadInt32(stream); } typeinfo = PClass::FindActor(s); @@ -2471,7 +2471,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) { break; } - Net_WriteByte (DEM_DOAUTOSAVE); + Net_WriteInt8 (DEM_DOAUTOSAVE); break; case DEM_DOAUTOSAVE: @@ -2506,8 +2506,8 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_RUNSCRIPT: case DEM_RUNSCRIPT2: { - int snum = ReadWord (stream); - int argn = ReadByte (stream); + int snum = ReadInt16 (stream); + int argn = ReadInt8 (stream); RunScript(stream, players[player].mo, snum, argn, (type == DEM_RUNSCRIPT2) ? ACS_ALWAYS : 0); } @@ -2516,7 +2516,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_RUNNAMEDSCRIPT: { s = ReadStringConst(stream); - int argn = ReadByte(stream); + int argn = ReadInt8(stream); RunScript(stream, players[player].mo, -FName(s).GetIndex(), argn & 127, (argn & 128) ? ACS_ALWAYS : 0); } @@ -2524,13 +2524,13 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_RUNSPECIAL: { - int snum = ReadWord(stream); - int argn = ReadByte(stream); + int snum = ReadInt16(stream); + int argn = ReadInt8(stream); int arg[5] = { 0, 0, 0, 0, 0 }; for (i = 0; i < argn; ++i) { - int argval = ReadLong(stream); + int argval = ReadInt32(stream); if ((unsigned)i < countof(arg)) { arg[i] = argval; @@ -2565,7 +2565,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_ADDCONTROLLER: { - uint8_t playernum = ReadByte (stream); + uint8_t playernum = ReadInt8 (stream); players[playernum].settings_controller = true; if (consoleplayer == playernum || consoleplayer == Net_Arbitrator) @@ -2575,7 +2575,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_DELCONTROLLER: { - uint8_t playernum = ReadByte (stream); + uint8_t playernum = ReadInt8 (stream); players[playernum].settings_controller = false; if (consoleplayer == playernum || consoleplayer == Net_Arbitrator) @@ -2640,14 +2640,14 @@ void Net_DoCommand (int type, uint8_t **stream, int player) int pnum; if (type == DEM_SETSLOTPNUM) { - pnum = ReadByte(stream); + pnum = ReadInt8(stream); } else { pnum = player; } - unsigned int slot = ReadByte(stream); - int count = ReadByte(stream); + unsigned int slot = ReadInt8(stream); + int count = ReadInt8(stream); if (slot < NUM_WEAPON_SLOTS) { players[pnum].weapons.ClearSlot(slot); @@ -2662,7 +2662,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_ADDSLOT: { - int slot = ReadByte(stream); + int slot = ReadInt8(stream); PClassActor *wpn = Net_ReadWeapon(stream); players[player].weapons.AddSlot(slot, wpn, player == consoleplayer); } @@ -2670,15 +2670,15 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_ADDSLOTDEFAULT: { - int slot = ReadByte(stream); + int slot = ReadInt8(stream); PClassActor *wpn = Net_ReadWeapon(stream); players[player].weapons.AddSlotDefault(slot, wpn, player == consoleplayer); } break; case DEM_SETPITCHLIMIT: - players[player].MinPitch = DAngle::fromDeg(-ReadByte(stream)); // up - players[player].MaxPitch = DAngle::fromDeg(ReadByte(stream)); // down + players[player].MinPitch = DAngle::fromDeg(-ReadInt8(stream)); // up + players[player].MaxPitch = DAngle::fromDeg(ReadInt8(stream)); // down break; case DEM_REVERTCAMERA: @@ -2693,11 +2693,11 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_NETEVENT: { s = ReadStringConst(stream); - int argn = ReadByte(stream); + int argn = ReadInt8(stream); int arg[3] = { 0, 0, 0 }; for (int i = 0; i < 3; i++) - arg[i] = ReadLong(stream); - bool manual = !!ReadByte(stream); + arg[i] = ReadInt32(stream); + bool manual = !!ReadInt8(stream); primaryLevel->localEventManager->Console(player, s, arg[0], arg[1], arg[2], manual, false); } break; @@ -2709,14 +2709,14 @@ void Net_DoCommand (int type, uint8_t **stream, int player) case DEM_ZSC_CMD: { FName cmd = ReadStringConst(stream); - unsigned int size = ReadWord(stream); + unsigned int size = ReadInt16(stream); TArray buffer = {}; if (size) { buffer.Grow(size); for (unsigned int i = 0u; i < size; ++i) - buffer.Push(ReadByte(stream)); + buffer.Push(ReadInt8(stream)); } FNetworkCommand netCmd = { player, cmd, buffer }; @@ -2744,7 +2744,7 @@ static void RunScript(uint8_t **stream, AActor *pawn, int snum, int argn, int al for (i = 0; i < argn; ++i) { - int argval = ReadLong(stream); + int argval = ReadInt32(stream); if ((unsigned)i < countof(arg)) { arg[i] = argval; @@ -2993,11 +2993,11 @@ static void Network_Controller (int playernum, bool add) } if (add) - Net_WriteByte (DEM_ADDCONTROLLER); + Net_WriteInt8 (DEM_ADDCONTROLLER); else - Net_WriteByte (DEM_DELCONTROLLER); + Net_WriteInt8 (DEM_DELCONTROLLER); - Net_WriteByte (playernum); + Net_WriteInt8 (playernum); } //========================================================================== diff --git a/src/d_net.h b/src/d_net.h index 309ea4d34..99020f091 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -64,9 +64,9 @@ void Net_CheckLastReceived(int); // [RH] Functions for making and using special "ticcmds" void Net_NewMakeTic (); -void Net_WriteByte (uint8_t); -void Net_WriteWord (short); -void Net_WriteLong (int); +void Net_WriteInt8 (uint8_t); +void Net_WriteInt16 (short); +void Net_WriteInt32 (int); void Net_WriteFloat (float); void Net_WriteString (const char *); void Net_WriteBytes (const uint8_t *, int len); diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index a20f1e9fb..5c2e4cfa8 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -571,7 +571,7 @@ void D_UserInfoChanged (FBaseCVar *cvar) mysnprintf (foo, countof(foo), "\\%s\\%s", cvar->GetName(), escaped_val.GetChars()); - Net_WriteByte (DEM_UINFCHANGED); + Net_WriteInt8 (DEM_UINFCHANGED); Net_WriteString (foo); } @@ -592,7 +592,7 @@ static const char *SetServerVar (char *name, ECVarType type, uint8_t **stream, b { return NULL; } - bitdata = ReadByte (stream); + bitdata = ReadInt8 (stream); mask = 1 << (bitdata & 31); if (bitdata & 32) { @@ -608,8 +608,8 @@ static const char *SetServerVar (char *name, ECVarType type, uint8_t **stream, b { switch (type) { - case CVAR_Bool: value.Bool = ReadByte (stream) ? 1 : 0; break; - case CVAR_Int: value.Int = ReadLong (stream); break; + case CVAR_Bool: value.Bool = ReadInt8 (stream) ? 1 : 0; break; + case CVAR_Int: value.Int = ReadInt32 (stream); break; case CVAR_Float: value.Float = ReadFloat (stream); break; case CVAR_String: value.String = ReadString (stream); break; default: break; // Silence GCC @@ -665,13 +665,13 @@ bool D_SendServerInfoChange (FBaseCVar *cvar, UCVarValue value, ECVarType type) namelen = strlen(cvar->GetName()); - Net_WriteByte(DEM_SINFCHANGED); - Net_WriteByte((uint8_t)(namelen | (type << 6))); + Net_WriteInt8(DEM_SINFCHANGED); + Net_WriteInt8((uint8_t)(namelen | (type << 6))); Net_WriteBytes((uint8_t*)cvar->GetName(), (int)namelen); switch (type) { - case CVAR_Bool: Net_WriteByte(value.Bool); break; - case CVAR_Int: Net_WriteLong(value.Int); break; + case CVAR_Bool: Net_WriteInt8(value.Bool); break; + case CVAR_Int: Net_WriteInt32(value.Int); break; case CVAR_Float: Net_WriteFloat(value.Float); break; case CVAR_String: Net_WriteString(value.String); break; default: break; // Silence GCC @@ -696,10 +696,10 @@ bool D_SendServerFlagChange (FBaseCVar *cvar, int bitnum, bool set, bool silent) int namelen = (int)strlen(cvar->GetName()); - Net_WriteByte(DEM_SINFCHANGEDXOR); - Net_WriteByte((uint8_t)namelen); + Net_WriteInt8(DEM_SINFCHANGEDXOR); + Net_WriteInt8((uint8_t)namelen); Net_WriteBytes((uint8_t*)cvar->GetName(), namelen); - Net_WriteByte(uint8_t(bitnum | (set << 5))); + Net_WriteInt8(uint8_t(bitnum | (set << 5))); return true; } return false; @@ -712,7 +712,7 @@ void D_DoServerInfoChange (uint8_t **stream, bool singlebit) int len; int type; - len = ReadByte (stream); + len = ReadInt8 (stream); type = len >> 6; len &= 0x3f; if (len == 0) diff --git a/src/d_protocol.cpp b/src/d_protocol.cpp index 107941976..367de19b7 100644 --- a/src/d_protocol.cpp +++ b/src/d_protocol.cpp @@ -55,21 +55,21 @@ const char *ReadStringConst(uint8_t **stream) return string; } -int ReadByte (uint8_t **stream) +int ReadInt8 (uint8_t **stream) { uint8_t v = **stream; *stream += 1; return v; } -int ReadWord (uint8_t **stream) +int ReadInt16 (uint8_t **stream) { short v = (((*stream)[0]) << 8) | (((*stream)[1])); *stream += 2; return v; } -int ReadLong (uint8_t **stream) +int ReadInt32 (uint8_t **stream) { int v = (((*stream)[0]) << 24) | (((*stream)[1]) << 16) | (((*stream)[2]) << 8) | (((*stream)[3])); *stream += 4; @@ -83,7 +83,7 @@ float ReadFloat (uint8_t **stream) int i; float f; } fakeint; - fakeint.i = ReadLong (stream); + fakeint.i = ReadInt32 (stream); return fakeint.f; } @@ -100,20 +100,20 @@ void WriteString (const char *string, uint8_t **stream) } -void WriteByte (uint8_t v, uint8_t **stream) +void WriteInt8 (uint8_t v, uint8_t **stream) { **stream = v; *stream += 1; } -void WriteWord (short v, uint8_t **stream) +void WriteInt16 (short v, uint8_t **stream) { (*stream)[0] = v >> 8; (*stream)[1] = v & 255; *stream += 2; } -void WriteLong (int v, uint8_t **stream) +void WriteInt32 (int v, uint8_t **stream) { (*stream)[0] = v >> 24; (*stream)[1] = (v >> 16) & 255; @@ -130,7 +130,7 @@ void WriteFloat (float v, uint8_t **stream) float f; } fakeint; fakeint.f = v; - WriteLong (fakeint.i, stream); + WriteInt32 (fakeint.i, stream); } // Returns the number of bytes read @@ -151,7 +151,7 @@ int UnpackUserCmd (usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream) memset (ucmd, 0, sizeof(usercmd_t)); } - flags = ReadByte (stream); + flags = ReadInt8 (stream); if (flags) { @@ -159,20 +159,20 @@ int UnpackUserCmd (usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream) if (flags & UCMDF_BUTTONS) { uint32_t buttons = ucmd->buttons; - uint8_t in = ReadByte(stream); + uint8_t in = ReadInt8(stream); buttons = (buttons & ~0x7F) | (in & 0x7F); if (in & 0x80) { - in = ReadByte(stream); + in = ReadInt8(stream); buttons = (buttons & ~(0x7F << 7)) | ((in & 0x7F) << 7); if (in & 0x80) { - in = ReadByte(stream); + in = ReadInt8(stream); buttons = (buttons & ~(0x7F << 14)) | ((in & 0x7F) << 14); if (in & 0x80) { - in = ReadByte(stream); + in = ReadInt8(stream); buttons = (buttons & ~(0xFF << 21)) | (in << 21); } } @@ -180,17 +180,17 @@ int UnpackUserCmd (usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream) ucmd->buttons = buttons; } if (flags & UCMDF_PITCH) - ucmd->pitch = ReadWord (stream); + ucmd->pitch = ReadInt16 (stream); if (flags & UCMDF_YAW) - ucmd->yaw = ReadWord (stream); + ucmd->yaw = ReadInt16 (stream); if (flags & UCMDF_FORWARDMOVE) - ucmd->forwardmove = ReadWord (stream); + ucmd->forwardmove = ReadInt16 (stream); if (flags & UCMDF_SIDEMOVE) - ucmd->sidemove = ReadWord (stream); + ucmd->sidemove = ReadInt16 (stream); if (flags & UCMDF_UPMOVE) - ucmd->upmove = ReadWord (stream); + ucmd->upmove = ReadInt16 (stream); if (flags & UCMDF_ROLL) - ucmd->roll = ReadWord (stream); + ucmd->roll = ReadInt16 (stream); } return int(*stream - start); @@ -211,7 +211,7 @@ int PackUserCmd (const usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream basis = ␣ } - WriteByte (0, stream); // Make room for the packing bits + WriteInt8 (0, stream); // Make room for the packing bits buttons_changed = ucmd->buttons ^ basis->buttons; if (buttons_changed != 0) @@ -235,16 +235,16 @@ int PackUserCmd (const usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream } } } - WriteByte (bytes[0], stream); + WriteInt8 (bytes[0], stream); if (bytes[0] & 0x80) { - WriteByte (bytes[1], stream); + WriteInt8 (bytes[1], stream); if (bytes[1] & 0x80) { - WriteByte (bytes[2], stream); + WriteInt8 (bytes[2], stream); if (bytes[2] & 0x80) { - WriteByte (bytes[3], stream); + WriteInt8 (bytes[3], stream); } } } @@ -252,36 +252,36 @@ int PackUserCmd (const usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stream if (ucmd->pitch != basis->pitch) { flags |= UCMDF_PITCH; - WriteWord (ucmd->pitch, stream); + WriteInt16 (ucmd->pitch, stream); } if (ucmd->yaw != basis->yaw) { flags |= UCMDF_YAW; - WriteWord (ucmd->yaw, stream); + WriteInt16 (ucmd->yaw, stream); } if (ucmd->forwardmove != basis->forwardmove) { flags |= UCMDF_FORWARDMOVE; - WriteWord (ucmd->forwardmove, stream); + WriteInt16 (ucmd->forwardmove, stream); } if (ucmd->sidemove != basis->sidemove) { flags |= UCMDF_SIDEMOVE; - WriteWord (ucmd->sidemove, stream); + WriteInt16 (ucmd->sidemove, stream); } if (ucmd->upmove != basis->upmove) { flags |= UCMDF_UPMOVE; - WriteWord (ucmd->upmove, stream); + WriteInt16 (ucmd->upmove, stream); } if (ucmd->roll != basis->roll) { flags |= UCMDF_ROLL; - WriteWord (ucmd->roll, stream); + WriteInt16 (ucmd->roll, stream); } // Write the packing bits - WriteByte (flags, &temp); + WriteInt8 (flags, &temp); return int(*stream - start); } @@ -329,7 +329,7 @@ int WriteUserCmdMessage (usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stre ucmd->upmove != 0 || ucmd->roll != 0) { - WriteByte (DEM_USERCMD, stream); + WriteInt8 (DEM_USERCMD, stream); return PackUserCmd (ucmd, basis, stream) + 1; } } @@ -342,11 +342,11 @@ int WriteUserCmdMessage (usercmd_t *ucmd, const usercmd_t *basis, uint8_t **stre ucmd->upmove != basis->upmove || ucmd->roll != basis->roll) { - WriteByte (DEM_USERCMD, stream); + WriteInt8 (DEM_USERCMD, stream); return PackUserCmd (ucmd, basis, stream) + 1; } - WriteByte (DEM_EMPTYUSERCMD, stream); + WriteInt8 (DEM_EMPTYUSERCMD, stream); return 1; } @@ -417,11 +417,11 @@ void ReadTicCmd (uint8_t **stream, int player, int tic) int ticmod = tic % BACKUPTICS; tcmd = &netcmds[player][ticmod]; - tcmd->consistancy = ReadWord (stream); + tcmd->consistancy = ReadInt16 (stream); start = *stream; - while ((type = ReadByte (stream)) != DEM_USERCMD && type != DEM_EMPTYUSERCMD) + while ((type = ReadInt8 (stream)) != DEM_USERCMD && type != DEM_EMPTYUSERCMD) Net_SkipCommand (type, stream); NetSpecs[player][ticmod].SetData (start, int(*stream - start - 1)); @@ -460,7 +460,7 @@ void RunNetSpecs (int player, int buf) uint8_t *end = stream + len; while (stream < end) { - int type = ReadByte (&stream); + int type = ReadInt8 (&stream); Net_DoCommand (type, &stream, player); } if (!demorecording) @@ -475,7 +475,7 @@ uint8_t *lenspot; // for the length field. void StartChunk (int id, uint8_t **stream) { - WriteLong (id, stream); + WriteInt32 (id, stream); lenspot = *stream; *stream += 4; } @@ -490,9 +490,9 @@ void FinishChunk (uint8_t **stream) return; len = int(*stream - lenspot - 4); - WriteLong (len, &lenspot); + WriteInt32 (len, &lenspot); if (len & 1) - WriteByte (0, stream); + WriteInt8 (0, stream); lenspot = NULL; } @@ -503,6 +503,6 @@ void SkipChunk (uint8_t **stream) { int len; - len = ReadLong (stream); + len = ReadInt32 (stream); *stream += len + (len & 1); } diff --git a/src/d_protocol.h b/src/d_protocol.h index 86ecce127..d00f3f908 100644 --- a/src/d_protocol.h +++ b/src/d_protocol.h @@ -247,15 +247,15 @@ int SkipTicCmd (uint8_t **stream, int count); void ReadTicCmd (uint8_t **stream, int player, int tic); void RunNetSpecs (int player, int buf); -int ReadByte (uint8_t **stream); -int ReadWord (uint8_t **stream); -int ReadLong (uint8_t **stream); +int ReadInt8 (uint8_t **stream); +int ReadInt16 (uint8_t **stream); +int ReadInt32 (uint8_t **stream); float ReadFloat (uint8_t **stream); char *ReadString (uint8_t **stream); const char *ReadStringConst(uint8_t **stream); -void WriteByte (uint8_t val, uint8_t **stream); -void WriteWord (short val, uint8_t **stream); -void WriteLong (int val, uint8_t **stream); +void WriteInt8 (uint8_t val, uint8_t **stream); +void WriteInt16 (short val, uint8_t **stream); +void WriteInt32 (int val, uint8_t **stream); void WriteFloat (float val, uint8_t **stream); void WriteString (const char *string, uint8_t **stream); diff --git a/src/events.cpp b/src/events.cpp index 97b03f720..e68eaf0b0 100755 --- a/src/events.cpp +++ b/src/events.cpp @@ -91,22 +91,22 @@ static const FString* ListGetString(VMVa_List& tags) IMPLEMENT_CLASS(DNetworkBuffer, false, false); -void DNetworkBuffer::AddByte(int byte) +void DNetworkBuffer::AddInt8(int byte) { ++_size; - _buffer.Push({ NET_BYTE, byte }); + _buffer.Push({ NET_INT8, byte }); } -void DNetworkBuffer::AddWord(int word) +void DNetworkBuffer::AddInt16(int word) { _size += 2u; - _buffer.Push({ NET_WORD, word }); + _buffer.Push({ NET_INT16, word }); } -void DNetworkBuffer::AddLong(int msg) +void DNetworkBuffer::AddInt(int msg) { _size += 4u; - _buffer.Push({ NET_LONG, msg }); + _buffer.Push({ NET_INT, msg }); } void DNetworkBuffer::AddFloat(double msg) @@ -201,27 +201,27 @@ void DNetworkBuffer::Serialize(FSerializer& arc) { switch (type) { - case NET_BYTE: + case NET_INT8: { int i = 0; arc(nullptr, i); - AddByte(i); + AddInt8(i); break; } - case NET_WORD: + case NET_INT16: { int i = 0; arc(nullptr, i); - AddWord(i); + AddInt16(i); break; } - case NET_LONG: + case NET_INT: { int i = 0; arc(nullptr, i); - AddLong(i); + AddInt(i); break; } @@ -368,13 +368,13 @@ bool EventManager::SendNetworkEvent(FString name, int arg1, int arg2, int arg3, if (gamestate != GS_LEVEL && gamestate != GS_TITLELEVEL) return false; - Net_WriteByte(DEM_NETEVENT); + Net_WriteInt8(DEM_NETEVENT); Net_WriteString(name.GetChars()); - Net_WriteByte(3); - Net_WriteLong(arg1); - Net_WriteLong(arg2); - Net_WriteLong(arg3); - Net_WriteByte(manual); + Net_WriteInt8(3); + Net_WriteInt32(arg1); + Net_WriteInt32(arg2); + Net_WriteInt32(arg3); + Net_WriteInt8(manual); return true; } @@ -391,15 +391,15 @@ bool EventManager::SendNetworkCommand(const FName& cmd, VMVa_List& args) { switch (tag) { - case NET_BYTE: + case NET_INT8: ++bytes; break; - case NET_WORD: + case NET_INT16: bytes += 2u; break; - case NET_LONG: + case NET_INT: case NET_FLOAT: bytes += 4u; break; @@ -420,9 +420,9 @@ bool EventManager::SendNetworkCommand(const FName& cmd, VMVa_List& args) tag = ListGetInt(args); } - Net_WriteByte(DEM_ZSC_CMD); + Net_WriteInt8(DEM_ZSC_CMD); Net_WriteString(cmd.GetChars()); - Net_WriteWord(bytes); + Net_WriteInt16(bytes); constexpr char Default[] = ""; @@ -436,16 +436,16 @@ bool EventManager::SendNetworkCommand(const FName& cmd, VMVa_List& args) ++args.curindex; break; - case NET_BYTE: - Net_WriteByte(ListGetInt(args)); + case NET_INT8: + Net_WriteInt8(ListGetInt(args)); break; - case NET_WORD: - Net_WriteWord(ListGetInt(args)); + case NET_INT16: + Net_WriteInt16(ListGetInt(args)); break; - case NET_LONG: - Net_WriteLong(ListGetInt(args)); + case NET_INT: + Net_WriteInt32(ListGetInt(args)); break; case NET_FLOAT: @@ -474,9 +474,9 @@ bool EventManager::SendNetworkBuffer(const FName& cmd, const DNetworkBuffer* buf if (gamestate != GS_LEVEL && gamestate != GS_TITLELEVEL) return false; - Net_WriteByte(DEM_ZSC_CMD); + Net_WriteInt8(DEM_ZSC_CMD); Net_WriteString(cmd.GetChars()); - Net_WriteWord(buffer != nullptr ? buffer->GetBytes() : 0); + Net_WriteInt16(buffer != nullptr ? buffer->GetBytes() : 0); if (buffer != nullptr) { @@ -485,16 +485,16 @@ bool EventManager::SendNetworkBuffer(const FName& cmd, const DNetworkBuffer* buf const auto& value = buffer->GetValue(i); switch (value.GetType()) { - case NET_BYTE: - Net_WriteByte(value.GetInt()); + case NET_INT8: + Net_WriteInt8(value.GetInt()); break; - case NET_WORD: - Net_WriteWord(value.GetInt()); + case NET_INT16: + Net_WriteInt16(value.GetInt()); break; - case NET_LONG: - Net_WriteLong(value.GetInt()); + case NET_INT: + Net_WriteInt32(value.GetInt()); break; case NET_FLOAT: @@ -1019,25 +1019,25 @@ DEFINE_FIELD_X(ReplacedEvent, FReplacedEvent, IsFinal) DEFINE_FIELD_X(NetworkCommand, FNetworkCommand, Player) DEFINE_FIELD_X(NetworkCommand, FNetworkCommand, Command) -DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadByte) +DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadInt8) { PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); - ACTION_RETURN_INT(self->ReadByte()); + ACTION_RETURN_INT(self->ReadInt8()); } -DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadWord) +DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadInt16) { PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); - ACTION_RETURN_INT(self->ReadWord()); + ACTION_RETURN_INT(self->ReadInt16()); } -DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadLong) +DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadInt) { PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); - ACTION_RETURN_INT(self->ReadLong()); + ACTION_RETURN_INT(self->ReadInt()); } DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadFloat) @@ -1076,14 +1076,14 @@ DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadMapUnit) PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); constexpr double FixedToFloat = 1.0 / (1 << 16); - ACTION_RETURN_FLOAT(self->ReadLong() * FixedToFloat); + ACTION_RETURN_FLOAT(self->ReadInt() * FixedToFloat); } DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadAngle) { PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); - const DAngle bam = DAngle::fromBam(self->ReadLong()); + const DAngle bam = DAngle::fromBam(self->ReadInt()); ACTION_RETURN_FLOAT(bam.Degrees()); } @@ -1138,21 +1138,21 @@ DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadIntArray) PARAM_OUTPOINTER(values, TArray); PARAM_INT(type) - unsigned int size = self->ReadLong(); + unsigned int size = self->ReadInt(); for (unsigned int i = 0u; i < size; ++i) { switch (type) { - case NET_BYTE: - values->Push(self->ReadByte()); + case NET_INT8: + values->Push(self->ReadInt8()); break; - case NET_WORD: - values->Push(self->ReadWord()); + case NET_INT16: + values->Push(self->ReadInt16()); break; default: - values->Push(self->ReadLong()); + values->Push(self->ReadInt()); break; } } @@ -1165,7 +1165,7 @@ DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadFloatArray) PARAM_SELF_STRUCT_PROLOGUE(FNetworkCommand); PARAM_OUTPOINTER(values, TArray); - unsigned int size = self->ReadLong(); + unsigned int size = self->ReadInt(); for (unsigned int i = 0u; i < size; ++i) values->Push(self->ReadFloat()); @@ -1178,7 +1178,7 @@ DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadStringArray) PARAM_OUTPOINTER(values, TArray); PARAM_BOOL(skipEmpty); - unsigned int size = self->ReadLong(); + unsigned int size = self->ReadInt(); for (unsigned int i = 0u; i < size; ++i) { FString res = {}; @@ -1193,27 +1193,27 @@ DEFINE_ACTION_FUNCTION(FNetworkCommand, ReadStringArray) return 0; } -DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddByte) +DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddInt8) { PARAM_SELF_PROLOGUE(DNetworkBuffer); PARAM_INT(value); - self->AddByte(value); + self->AddInt8(value); return 0; } -DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddWord) +DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddInt16) { PARAM_SELF_PROLOGUE(DNetworkBuffer); PARAM_INT(value); - self->AddWord(value); + self->AddInt16(value); return 0; } -DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddLong) +DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddInt) { PARAM_SELF_PROLOGUE(DNetworkBuffer); PARAM_INT(value); - self->AddLong(value); + self->AddInt(value); return 0; } @@ -1247,7 +1247,7 @@ DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddMapUnit) PARAM_FLOAT(value); constexpr int FloatToFixed = 1 << 16; - self->AddLong(static_cast(value * FloatToFixed)); + self->AddInt(static_cast(value * FloatToFixed)); return 0; } @@ -1255,7 +1255,7 @@ DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddAngle) { PARAM_SELF_PROLOGUE(DNetworkBuffer); PARAM_ANGLE(value); - self->AddLong(value.BAMs()); + self->AddInt(value.BAMs()); return 0; } @@ -1316,21 +1316,21 @@ DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddIntArray) PARAM_INT(type); unsigned int size = values->Size(); - self->AddLong(size); + self->AddInt(size); for (unsigned int i = 0u; i < size; ++i) { switch (type) { - case NET_BYTE: - self->AddByte((*values)[i]); + case NET_INT8: + self->AddInt8((*values)[i]); break; - case NET_WORD: - self->AddWord((*values)[i]); + case NET_INT16: + self->AddInt16((*values)[i]); break; default: - self->AddLong((*values)[i]); + self->AddInt((*values)[i]); break; } } @@ -1344,7 +1344,7 @@ DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddFloatArray) PARAM_POINTER(values, TArray); unsigned int size = values->Size(); - self->AddLong(size); + self->AddInt(size); for (unsigned int i = 0u; i < size; ++i) self->AddFloat((*values)[i]); @@ -1357,7 +1357,7 @@ DEFINE_ACTION_FUNCTION(DNetworkBuffer, AddStringArray) PARAM_POINTER(values, TArray); unsigned int size = values->Size(); - self->AddLong(size); + self->AddInt(size); for (unsigned int i = 0u; i < size; ++i) self->AddString((*values)[i]); diff --git a/src/events.h b/src/events.h index 39edbe95f..dc27eed1b 100755 --- a/src/events.h +++ b/src/events.h @@ -22,9 +22,9 @@ enum class EventHandlerType enum ENetCmd { - NET_BYTE = 1, - NET_WORD, - NET_LONG, + NET_INT8 = 1, + NET_INT16, + NET_INT, NET_FLOAT, NET_STRING, }; @@ -54,7 +54,7 @@ public: _index = 0; } - int ReadByte() + int ReadInt8() { if (!IsValid()) return 0; @@ -63,7 +63,7 @@ public: } // If a value has to cut off early, just treat the previous value as the full one. - int ReadWord() + int ReadInt16() { if (!IsValid()) return 0; @@ -75,7 +75,7 @@ public: return value; } - int ReadLong() + int ReadInt() { if (!IsValid()) return 0; @@ -190,9 +190,9 @@ public: return _buffer[i]; } - void AddByte(int byte); - void AddWord(int word); - void AddLong(int msg); + void AddInt8(int byte); + void AddInt16(int word); + void AddInt(int msg); void AddFloat(double msg); void AddString(const FString& msg); void OnDestroy() override; diff --git a/src/g_dumpinfo.cpp b/src/g_dumpinfo.cpp index 768733d44..227b98f50 100644 --- a/src/g_dumpinfo.cpp +++ b/src/g_dumpinfo.cpp @@ -129,7 +129,7 @@ CCMD (spray) return; } - Net_WriteByte (DEM_SPRAY); + Net_WriteInt8 (DEM_SPRAY); Net_WriteString (argv[1]); } diff --git a/src/g_game.cpp b/src/g_game.cpp index 81d12d080..30abb152e 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -335,12 +335,12 @@ CCMD (centerview) { if ((players[consoleplayer].cheats & CF_TOTALLYFROZEN)) return; - Net_WriteByte (DEM_CENTERVIEW); + Net_WriteInt8 (DEM_CENTERVIEW); } CCMD(crouch) { - Net_WriteByte(DEM_CROUCH); + Net_WriteInt8(DEM_CROUCH); } CCMD (land) @@ -768,32 +768,32 @@ void G_BuildTiccmd (ticcmd_t *cmd) if (sendpause) { sendpause = false; - Net_WriteByte (DEM_PAUSE); + Net_WriteInt8 (DEM_PAUSE); } if (sendsave) { sendsave = false; - Net_WriteByte (DEM_SAVEGAME); + Net_WriteInt8 (DEM_SAVEGAME); Net_WriteString (savegamefile.GetChars()); Net_WriteString (savedescription.GetChars()); savegamefile = ""; } if (SendItemUse == (const AActor *)1) { - Net_WriteByte (DEM_INVUSEALL); + Net_WriteInt8 (DEM_INVUSEALL); SendItemUse = NULL; } else if (SendItemUse != NULL) { - Net_WriteByte (DEM_INVUSE); - Net_WriteLong (SendItemUse->InventoryID); + Net_WriteInt8 (DEM_INVUSE); + Net_WriteInt32 (SendItemUse->InventoryID); SendItemUse = NULL; } if (SendItemDrop != NULL) { - Net_WriteByte (DEM_INVDROP); - Net_WriteLong (SendItemDrop->InventoryID); - Net_WriteLong(SendItemDropAmount); + Net_WriteInt8 (DEM_INVDROP); + Net_WriteInt32 (SendItemDrop->InventoryID); + Net_WriteInt32(SendItemDropAmount); SendItemDrop = NULL; } @@ -903,7 +903,7 @@ static void ChangeSpy (int changespy) // has done this for you, since it could desync otherwise. if (!demoplayback) { - Net_WriteByte(DEM_REVERTCAMERA); + Net_WriteInt8(DEM_REVERTCAMERA); } return; } @@ -1331,7 +1331,7 @@ void G_Ticker () if (ScreenJobTick()) { // synchronize termination with the playsim. - Net_WriteByte(DEM_ENDSCREENJOB); + Net_WriteInt8(DEM_ENDSCREENJOB); } break; @@ -2502,7 +2502,7 @@ void G_ReadDemoTiccmd (ticcmd_t *cmd, int player) break; } - id = ReadByte (&demo_p); + id = ReadInt8 (&demo_p); switch (id) { @@ -2521,7 +2521,7 @@ void G_ReadDemoTiccmd (ticcmd_t *cmd, int player) case DEM_DROPPLAYER: { - uint8_t i = ReadByte (&demo_p); + uint8_t i = ReadInt8 (&demo_p); if (i < MAXPLAYERS) { playeringame[i] = false; @@ -2619,19 +2619,19 @@ void G_BeginRecording (const char *startmap) } demo_p = demobuffer; - WriteLong (FORM_ID, &demo_p); // Write FORM ID + WriteInt32 (FORM_ID, &demo_p); // Write FORM ID demo_p += 4; // Leave space for len - WriteLong (ZDEM_ID, &demo_p); // Write ZDEM ID + WriteInt32 (ZDEM_ID, &demo_p); // Write ZDEM ID // Write header chunk StartChunk (ZDHD_ID, &demo_p); - WriteWord (DEMOGAMEVERSION, &demo_p); // Write ZDoom version + WriteInt16 (DEMOGAMEVERSION, &demo_p); // Write ZDoom version *demo_p++ = 2; // Write minimum version needed to use this demo. *demo_p++ = 3; // (Useful?) strcpy((char*)demo_p, startmap); // Write name of map demo was recorded on. demo_p += strlen(startmap) + 1; - WriteLong(rngseed, &demo_p); // Write RNG seed + WriteInt32(rngseed, &demo_p); // Write RNG seed *demo_p++ = consoleplayer; FinishChunk (&demo_p); @@ -2641,7 +2641,7 @@ void G_BeginRecording (const char *startmap) if (playeringame[i]) { StartChunk(UINF_ID, &demo_p); - WriteByte((uint8_t)i, &demo_p); + WriteInt8((uint8_t)i, &demo_p); auto str = D_GetUserInfoStrings(i); memcpy(demo_p, str.GetChars(), str.Len() + 1); demo_p += str.Len(); @@ -2671,7 +2671,7 @@ void G_BeginRecording (const char *startmap) // Indicate body is compressed StartChunk (COMP_ID, &demo_p); democompspot = demo_p; - WriteLong (0, &demo_p); + WriteInt32 (0, &demo_p); FinishChunk (&demo_p); // Begin BODY chunk @@ -2736,13 +2736,13 @@ bool G_ProcessIFFDemo (FString &mapname) for (i = 0; i < MAXPLAYERS; i++) playeringame[i] = 0; - len = ReadLong (&demo_p); + len = ReadInt32 (&demo_p); zdemformend = demo_p + len + (len & 1); // Check to make sure this is a ZDEM chunk file. // TODO: Support multiple FORM ZDEMs in a CAT. Might be useful. - id = ReadLong (&demo_p); + id = ReadInt32 (&demo_p); if (id != ZDEM_ID) { Printf ("Not a " GAMENAME " demo file!\n"); @@ -2753,8 +2753,8 @@ bool G_ProcessIFFDemo (FString &mapname) while (demo_p < zdemformend && !bodyHit) { - id = ReadLong (&demo_p); - len = ReadLong (&demo_p); + id = ReadInt32 (&demo_p); + len = ReadInt32 (&demo_p); nextchunk = demo_p + len + (len & 1); if (nextchunk > zdemformend) { @@ -2767,13 +2767,13 @@ bool G_ProcessIFFDemo (FString &mapname) case ZDHD_ID: headerHit = true; - demover = ReadWord (&demo_p); // ZDoom version demo was created with + demover = ReadInt16 (&demo_p); // ZDoom version demo was created with if (demover < MINDEMOVERSION) { Printf ("Demo requires an older version of " GAMENAME "!\n"); //return true; } - if (ReadWord (&demo_p) > DEMOGAMEVERSION) // Minimum ZDoom version + if (ReadInt16 (&demo_p) > DEMOGAMEVERSION) // Minimum ZDoom version { Printf ("Demo requires a newer version of " GAMENAME "!\n"); return true; @@ -2788,7 +2788,7 @@ bool G_ProcessIFFDemo (FString &mapname) mapname = FString((char*)demo_p, 8); demo_p += 8; } - rngseed = ReadLong (&demo_p); + rngseed = ReadInt32 (&demo_p); // Only reset the RNG if this demo is not in conjunction with a savegame. if (mapname[0] != 0) { @@ -2802,7 +2802,7 @@ bool G_ProcessIFFDemo (FString &mapname) break; case UINF_ID: - i = ReadByte (&demo_p); + i = ReadInt8 (&demo_p); if (!playeringame[i]) { playeringame[i] = 1; @@ -2825,7 +2825,7 @@ bool G_ProcessIFFDemo (FString &mapname) break; case COMP_ID: - uncompSize = ReadLong (&demo_p); + uncompSize = ReadInt32 (&demo_p); break; } @@ -2910,7 +2910,7 @@ void G_DoPlayDemo (void) C_BackupCVars (); // [RH] Save cvars that might be affected by demo - if (ReadLong (&demo_p) != FORM_ID) + if (ReadInt32 (&demo_p) != FORM_ID) { const char *eek = "Cannot play non-" GAMENAME " demos.\n"; @@ -3044,7 +3044,7 @@ bool G_CheckDemoStatus (void) { uint8_t *formlen; - WriteByte (DEM_STOP, &demo_p); + WriteInt8 (DEM_STOP, &demo_p); if (demo_compress) { @@ -3059,14 +3059,14 @@ bool G_CheckDemoStatus (void) if (r == Z_OK && outlen < len) { formlen = democompspot; - WriteLong (len, &democompspot); + WriteInt32 (len, &democompspot); memcpy (demobodyspot, compressed.Data(), outlen); demo_p = demobodyspot + outlen; } } FinishChunk (&demo_p); formlen = demobuffer + 4; - WriteLong (int(demo_p - demobuffer - 8), &formlen); + WriteInt32 (int(demo_p - demobuffer - 8), &formlen); auto fw = FileWriter::Open(demoname.GetChars()); bool saved = false; diff --git a/src/g_level.cpp b/src/g_level.cpp index 266820fab..ff42656da 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -1320,7 +1320,7 @@ IMPLEMENT_CLASS(DAutosaver, false, false) void DAutosaver::Tick () { - Net_WriteByte (DEM_CHECKAUTOSAVE); + Net_WriteInt8 (DEM_CHECKAUTOSAVE); Destroy (); } diff --git a/src/gamedata/a_weapons.cpp b/src/gamedata/a_weapons.cpp index 5aa147386..93768fd54 100644 --- a/src/gamedata/a_weapons.cpp +++ b/src/gamedata/a_weapons.cpp @@ -450,15 +450,15 @@ void FWeaponSlots::SendDifferences(int playernum, const FWeaponSlots &other) // The slots differ. Send mine. if (playernum == consoleplayer) { - Net_WriteByte(DEM_SETSLOT); + Net_WriteInt8(DEM_SETSLOT); } else { - Net_WriteByte(DEM_SETSLOTPNUM); - Net_WriteByte(playernum); + Net_WriteInt8(DEM_SETSLOTPNUM); + Net_WriteInt8(playernum); } - Net_WriteByte(i); - Net_WriteByte(Slots[i].Size()); + Net_WriteInt8(i); + Net_WriteInt8(Slots[i].Size()); for (j = 0; j < Slots[i].Size(); ++j) { Net_WriteWeapon(Slots[i].GetWeapon(j)); @@ -596,9 +596,9 @@ CCMD (setslot) Printf ("Slot %d cleared\n", slot); } - Net_WriteByte(DEM_SETSLOT); - Net_WriteByte(slot); - Net_WriteByte(argv.argc()-2); + Net_WriteInt8(DEM_SETSLOT); + Net_WriteInt8(slot); + Net_WriteInt8(argv.argc()-2); for (int i = 2; i < argv.argc(); i++) { Net_WriteWeapon(PClass::FindActor(argv[i])); @@ -647,8 +647,8 @@ CCMD (addslot) } else { - Net_WriteByte(DEM_ADDSLOT); - Net_WriteByte(slot); + Net_WriteInt8(DEM_ADDSLOT); + Net_WriteInt8(slot); Net_WriteWeapon(type); } } @@ -723,8 +723,8 @@ CCMD (addslotdefault) } else { - Net_WriteByte(DEM_ADDSLOTDEFAULT); - Net_WriteByte(slot); + Net_WriteInt8(DEM_ADDSLOTDEFAULT); + Net_WriteInt8(slot); Net_WriteWeapon(type); } } @@ -857,7 +857,7 @@ static int ntoh_cmp(const void *a, const void *b) void P_WriteDemoWeaponsChunk(uint8_t **demo) { - WriteWord(Weapons_ntoh.Size(), demo); + WriteInt16(Weapons_ntoh.Size(), demo); for (unsigned int i = 1; i < Weapons_ntoh.Size(); ++i) { WriteString(Weapons_ntoh[i]->TypeName.GetChars(), demo); @@ -879,7 +879,7 @@ void P_ReadDemoWeaponsChunk(uint8_t **demo) PClassActor *type; const char *s; - count = ReadWord(demo); + count = ReadInt16(demo); Weapons_ntoh.Resize(count); Weapons_hton.Clear(count); @@ -923,12 +923,12 @@ void Net_WriteWeapon(PClassActor *type) assert(index >= 0 && index <= 32767); if (index < 128) { - Net_WriteByte(index); + Net_WriteInt8(index); } else { - Net_WriteByte(0x80 | index); - Net_WriteByte(index >> 7); + Net_WriteInt8(0x80 | index); + Net_WriteInt8(index >> 7); } } @@ -942,10 +942,10 @@ PClassActor *Net_ReadWeapon(uint8_t **stream) { int index; - index = ReadByte(stream); + index = ReadInt8(stream); if (index & 0x80) { - index = (index & 0x7F) | (ReadByte(stream) << 7); + index = (index & 0x7F) | (ReadInt8(stream) << 7); } if ((unsigned)index >= Weapons_ntoh.Size()) { diff --git a/src/gamedata/info.cpp b/src/gamedata/info.cpp index 5942ae2d3..67fb87f67 100644 --- a/src/gamedata/info.cpp +++ b/src/gamedata/info.cpp @@ -785,17 +785,17 @@ static void SummonActor (int command, int command2, FCommandLine argv) Printf ("Unknown actor '%s'\n", argv[1]); return; } - Net_WriteByte (argv.argc() > 2 ? command2 : command); + Net_WriteInt8 (argv.argc() > 2 ? command2 : command); Net_WriteString (type->TypeName.GetChars()); if (argv.argc () > 2) { - Net_WriteWord (atoi (argv[2])); // angle - Net_WriteWord ((argv.argc() > 3) ? atoi(argv[3]) : 0); // TID - Net_WriteByte ((argv.argc() > 4) ? atoi(argv[4]) : 0); // special + Net_WriteInt16 (atoi (argv[2])); // angle + Net_WriteInt16 ((argv.argc() > 3) ? atoi(argv[3]) : 0); // TID + Net_WriteInt8 ((argv.argc() > 4) ? atoi(argv[4]) : 0); // special for (int i = 5; i < 10; i++) { // args[5] - Net_WriteLong((i < argv.argc()) ? atoi(argv[i]) : 0); + Net_WriteInt32((i < argv.argc()) ? atoi(argv[i]) : 0); } } } diff --git a/src/gamedata/statistics.cpp b/src/gamedata/statistics.cpp index f1ebbd483..64c33567e 100644 --- a/src/gamedata/statistics.cpp +++ b/src/gamedata/statistics.cpp @@ -602,7 +602,7 @@ CCMD(finishgame) return; } // This CCMD simulates an end-of-game action and exists to end mods that never exit their last Level-> - Net_WriteByte(DEM_FINISHGAME); + Net_WriteInt8(DEM_FINISHGAME); } ADD_STAT(statistics) diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp index a4ac6bc39..2ed4ddf62 100644 --- a/src/m_cheat.cpp +++ b/src/m_cheat.cpp @@ -676,6 +676,6 @@ CCMD (mdk) return; const char *name = argv.argc() > 1 ? argv[1] : ""; - Net_WriteByte (DEM_MDK); + Net_WriteInt8 (DEM_MDK); Net_WriteString(name); } diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index a772c1dd3..20a873477 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -276,17 +276,17 @@ DEFINE_ACTION_FUNCTION(DConversationMenu, SendConversationReply) switch (node) { case -1: - Net_WriteByte(DEM_CONVNULL); + Net_WriteInt8(DEM_CONVNULL); break; case -2: - Net_WriteByte(DEM_CONVCLOSE); + Net_WriteInt8(DEM_CONVCLOSE); break; default: - Net_WriteByte(DEM_CONVREPLY); - Net_WriteWord(node); - Net_WriteByte(reply); + Net_WriteInt8(DEM_CONVREPLY); + Net_WriteInt16(node); + Net_WriteInt8(reply); break; } StaticLastReply = reply; @@ -677,8 +677,8 @@ void P_ConversationCommand (int netcode, int pnum, uint8_t **stream) } if (netcode == DEM_CONVREPLY) { - int nodenum = ReadWord(stream); - int replynum = ReadByte(stream); + int nodenum = ReadInt16(stream); + int replynum = ReadInt8(stream); HandleReply(player, pnum == consoleplayer, nodenum, replynum); } else diff --git a/src/playsim/bots/b_bot.cpp b/src/playsim/bots/b_bot.cpp index 744bcc428..56a12b75e 100644 --- a/src/playsim/bots/b_bot.cpp +++ b/src/playsim/bots/b_bot.cpp @@ -214,7 +214,7 @@ CCMD (removebots) return; } - Net_WriteByte (DEM_KILLBOTS); + Net_WriteInt8 (DEM_KILLBOTS); } CCMD (freeze) @@ -228,8 +228,8 @@ CCMD (freeze) return; } - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_FREEZE); + Net_WriteInt8(DEM_GENERICCHEAT); + Net_WriteInt8(CHT_FREEZE); } CCMD (listbots) diff --git a/src/playsim/bots/b_game.cpp b/src/playsim/bots/b_game.cpp index 9cdde72ab..198692c1f 100644 --- a/src/playsim/bots/b_game.cpp +++ b/src/playsim/bots/b_game.cpp @@ -296,8 +296,8 @@ bool FCajunMaster::SpawnBot (const char *name, int color) thebot->inuse = BOTINUSE_Waiting; - Net_WriteByte (DEM_ADDBOT); - Net_WriteByte (botshift); + Net_WriteInt8 (DEM_ADDBOT); + Net_WriteInt8 (botshift); { //Set color. FString concat = thebot->Info; @@ -311,23 +311,23 @@ bool FCajunMaster::SpawnBot (const char *name, int color) } Net_WriteString (concat.GetChars()); } - Net_WriteByte(thebot->skill.aiming); - Net_WriteByte(thebot->skill.perfection); - Net_WriteByte(thebot->skill.reaction); - Net_WriteByte(thebot->skill.isp); + Net_WriteInt8(thebot->skill.aiming); + Net_WriteInt8(thebot->skill.perfection); + Net_WriteInt8(thebot->skill.reaction); + Net_WriteInt8(thebot->skill.isp); return true; } void FCajunMaster::TryAddBot (FLevelLocals *Level, uint8_t **stream, int player) { - int botshift = ReadByte (stream); + int botshift = ReadInt8 (stream); char *info = ReadString (stream); botskill_t skill; - skill.aiming = ReadByte (stream); - skill.perfection = ReadByte (stream); - skill.reaction = ReadByte (stream); - skill.isp = ReadByte (stream); + skill.aiming = ReadInt8 (stream); + skill.perfection = ReadInt8 (stream); + skill.reaction = ReadInt8 (stream); + skill.isp = ReadInt8 (stream); botinfo_t *thebot = NULL; diff --git a/src/playsim/p_interaction.cpp b/src/playsim/p_interaction.cpp index e80194622..88326acb5 100644 --- a/src/playsim/p_interaction.cpp +++ b/src/playsim/p_interaction.cpp @@ -1883,8 +1883,8 @@ CCMD (kill) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_MASSACRE); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_MASSACRE); } else if (!stricmp (argv[1], "baddies")) { @@ -1892,12 +1892,12 @@ CCMD (kill) if (CheckCheatmode ()) return; - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (CHT_MASSACRE2); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (CHT_MASSACRE2); } else { - Net_WriteByte (DEM_KILLCLASSCHEAT); + Net_WriteInt8 (DEM_KILLCLASSCHEAT); Net_WriteString (argv[1]); } } @@ -1908,7 +1908,7 @@ CCMD (kill) return; // Kill the player - Net_WriteByte (DEM_SUICIDE); + Net_WriteInt8 (DEM_SUICIDE); } C_HideConsole (); } @@ -1920,7 +1920,7 @@ CCMD(remove) if (CheckCheatmode()) return; - Net_WriteByte(DEM_REMOVE); + Net_WriteInt8(DEM_REMOVE); Net_WriteString(argv[1]); C_HideConsole(); } diff --git a/src/playsim/p_lnspec.cpp b/src/playsim/p_lnspec.cpp index 4eb379f72..5fb7c026d 100644 --- a/src/playsim/p_lnspec.cpp +++ b/src/playsim/p_lnspec.cpp @@ -3180,7 +3180,7 @@ FUNC(LS_Autosave) if (gameaction != ga_savegame) { Level->flags2 &= ~LEVEL2_NOAUTOSAVEHINT; - Net_WriteByte (DEM_CHECKAUTOSAVE); + Net_WriteInt8 (DEM_CHECKAUTOSAVE); } return true; } diff --git a/src/playsim/p_user.cpp b/src/playsim/p_user.cpp index 1ce3e3445..a4e2c6485 100644 --- a/src/playsim/p_user.cpp +++ b/src/playsim/p_user.cpp @@ -478,7 +478,7 @@ void player_t::SetFOV(float fov) { if (consoleplayer == Net_Arbitrator) { - Net_WriteByte(DEM_MYFOV); + Net_WriteInt8(DEM_MYFOV); } else { @@ -488,7 +488,7 @@ void player_t::SetFOV(float fov) } else { - Net_WriteByte(DEM_MYFOV); + Net_WriteInt8(DEM_MYFOV); } Net_WriteFloat(clamp(fov, 5.f, 179.f)); } @@ -637,9 +637,9 @@ void player_t::SendPitchLimits() const uppitch = downpitch = (int)maxviewpitch; } - Net_WriteByte(DEM_SETPITCHLIMIT); - Net_WriteByte(uppitch); - Net_WriteByte(downpitch); + Net_WriteInt8(DEM_SETPITCHLIMIT); + Net_WriteInt8(uppitch); + Net_WriteInt8(downpitch); } } diff --git a/src/st_stuff.cpp b/src/st_stuff.cpp index 9fd7500cc..098adda4d 100644 --- a/src/st_stuff.cpp +++ b/src/st_stuff.cpp @@ -439,8 +439,8 @@ static bool CheatAddKey (cheatseq_t *cheat, uint8_t key, bool *eat) static bool Cht_Generic (cheatseq_t *cheat) { - Net_WriteByte (DEM_GENERICCHEAT); - Net_WriteByte (cheat->Args[0]); + Net_WriteInt8 (DEM_GENERICCHEAT); + Net_WriteInt8 (cheat->Args[0]); return true; } diff --git a/wadsrc/static/zscript/events.zs b/wadsrc/static/zscript/events.zs index 6c07dc378..438b249dc 100644 --- a/wadsrc/static/zscript/events.zs +++ b/wadsrc/static/zscript/events.zs @@ -1,8 +1,8 @@ enum ENetCmd { - NET_BYTE = 1, - NET_WORD, - NET_LONG, + NET_INT8 = 1, + NET_INT16, + NET_INT, NET_FLOAT, NET_STRING, } @@ -12,9 +12,9 @@ struct NetworkCommand native play version("4.12") native readonly int Player; native readonly Name Command; - native int ReadByte(); - native int ReadWord(); - native int ReadLong(); + native int ReadInt8(); + native int ReadInt16(); + native int ReadInt(); native double ReadFloat(); native string ReadString(); @@ -26,16 +26,16 @@ struct NetworkCommand native play version("4.12") native Vector3 ReadVector3(); native Vector4 ReadVector4(); native Quat ReadQuat(); - native void ReadIntArray(out Array values, ENetCmd intSize = NET_LONG); + native void ReadIntArray(out Array values, ENetCmd intSize = NET_INT); native void ReadFloatArray(out Array values); native void ReadStringArray(out Array values, bool skipEmpty = false); } class NetworkBuffer native version("4.12") { - native void AddByte(int value); - native void AddWord(int value); - native void AddLong(int value); + native void AddInt8(int value); + native void AddInt16(int value); + native void AddInt(int value); native void AddFloat(double value); native void AddString(string value); @@ -47,7 +47,7 @@ class NetworkBuffer native version("4.12") native void AddVector3(Vector3 value); native void AddVector4(Vector4 value); native void AddQuat(Quat value); - native void AddIntArray(Array values, ENetCmd intSize = NET_LONG); + native void AddIntArray(Array values, ENetCmd intSize = NET_INT); native void AddFloatArray(Array values); native void AddStringArray(Array values); }