diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp index d8105b3ef2..249439d8a8 100644 --- a/source/games/blood/src/player.cpp +++ b/source/games/blood/src/player.cpp @@ -822,7 +822,6 @@ void playerStart(int nPlayer, int bNewLevel) actor->SetBurnSource(nullptr); pPlayer->actor->xspr.health = pDudeInfo->startHealth << 4; pPlayer->actor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE; - pPlayer->bloodlust = 0; pPlayer->actor->spr.Angles.Pitch = pPlayer->Angles.ViewAngles.Pitch = nullAngle; pPlayer->slope = 0; pPlayer->fragger = nullptr; @@ -2406,7 +2405,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER* arc("spritenum", w.actor) ("angles", w.Angles) ("newweapon", w.newWeapon) - ("used1", w.used1) ("weaponqav", w.weaponQav) ("qavcallback", w.qavCallback) ("isrunning", w.isRunning) @@ -2416,13 +2414,11 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER* ("bobamp", w.bobAmp) ("bobheight", w.bobHeight) ("bobwidth", w.bobWidth) - ("swayphase", w.swayPhase) ("swayamp", w.swayAmp) ("swayheight", w.swayHeight) ("swaywidth", w.swayWidth) ("nplayer", w.nPlayer) ("lifemode", w.lifeMode) - ("bloodlust", w.bloodlust) ("zview", w.zView) ("zviewvel", w.zViewVel) ("zweapon", w.zWeapon) @@ -2578,7 +2574,6 @@ DEFINE_FIELD_X(BloodPlayer, PLAYER, bobPhase) DEFINE_FIELD_X(BloodPlayer, PLAYER, bobAmp) DEFINE_FIELD_X(BloodPlayer, PLAYER, bobHeight) DEFINE_FIELD_X(BloodPlayer, PLAYER, bobWidth) -DEFINE_FIELD_X(BloodPlayer, PLAYER, swayPhase) DEFINE_FIELD_X(BloodPlayer, PLAYER, swayAmp) DEFINE_FIELD_X(BloodPlayer, PLAYER, swayHeight) DEFINE_FIELD_X(BloodPlayer, PLAYER, swayWidth) diff --git a/source/games/blood/src/player.h b/source/games/blood/src/player.h index 37268622c9..702ca9b305 100644 --- a/source/games/blood/src/player.h +++ b/source/games/blood/src/player.h @@ -85,7 +85,6 @@ struct PLAYER InputPacket input; PlayerAngles Angles; uint8_t newWeapon; - int used1; // something related to game checksum int weaponQav; int qavCallback; bool isRunning; @@ -97,7 +96,6 @@ struct PLAYER double bobWidth; double obobHeight; double obobWidth; - int swayPhase; int swayAmp; double swayHeight; double swayWidth; @@ -105,7 +103,6 @@ struct PLAYER double oswayWidth; int nPlayer; // Connect id int lifeMode; - int bloodlust; // ---> useless double zView; double ozView; double zViewVel; diff --git a/source/games/blood/src/prediction.cpp b/source/games/blood/src/prediction.cpp index c39d04bd9f..ef168e7dac 100644 --- a/source/games/blood/src/prediction.cpp +++ b/source/games/blood/src/prediction.cpp @@ -72,7 +72,6 @@ void viewInitializePrediction(void) predict.Kills = gMe->bobAmp; predict.bobHeight = gMe->bobHeight; predict.bobWidth = gMe->bobWidth; - predict.swayPhase = gMe->swayPhase; predict.swayAmp = gMe->swayAmp; predict.shakeBobY = gMe->swayHeight; predict.shakeBobX = gMe->swayWidth; diff --git a/wadsrc/static/zscript/games/blood/bloodgame.zs b/wadsrc/static/zscript/games/blood/bloodgame.zs index da7fbe4003..2b83635a89 100644 --- a/wadsrc/static/zscript/games/blood/bloodgame.zs +++ b/wadsrc/static/zscript/games/blood/bloodgame.zs @@ -86,7 +86,6 @@ struct BloodPlayer native native int bobAmp; native double bobHeight; native double bobWidth; - native int swayPhase; native int swayAmp; native double swayHeight; native double swayWidth;