0004181: [Patch] +NOMORPHLIMITATIONS feature from QZandronum

diff -r 4f775318d2ec src/cl_main.cpp --- a/src/cl_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/cl_main.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -7252,7 +7252,8 @@ } */ // [BB] Prevent the client from trying to switch to a different weapon while morphed. - if ( players[ulPlayer].morphTics ) + // [geNia] unless +NOMORPHLIMITATIONS is used + if ( player->morphTics && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) players[ulPlayer].PendingWeapon = WP_NOCHANGE; // Since an item displayed on the HUD may have been given, refresh the HUD. diff -r 4f775318d2ec src/d_player.h --- a/src/d_player.h Wed Dec 20 22:00:46 2023 -0500 +++ b/src/d_player.h Fri Jan 05 06:43:08 2024 -0800 @@ -192,6 +192,8 @@ PPF_NOTHRUSTWHENINVUL = 1, // Attacks do not thrust the player if they are invulnerable. PPF_CANSUPERMORPH = 2, // Being remorphed into this class can give you a Tome of Power PPF_CROUCHABLEMORPH = 4, // This morphed player can crouch + // [geNia] Removes morph limitations, like not playing land sounds, or not switching weapons, or not being affected by speed powerups + PPF_NOMORPHLIMITATIONS = 8, }; // diff -r 4f775318d2ec src/g_shared/a_morph.cpp --- a/src/g_shared/a_morph.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/g_shared/a_morph.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -97,6 +97,13 @@ p->PremorphWeapon = p->ReadyWeapon; morphed->special2 = actor->flags & ~MF_JUSTHIT; morphed->player = p; + if (morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + morphed->velx = actor->velx; + morphed->vely = actor->vely; + morphed->velz = actor->velz; + morphed->pitch = actor->pitch; + } if (actor->renderflags & RF_INVISIBLE) { morphed->special2 |= MF_JUSTHIT; @@ -127,7 +134,10 @@ p->MorphExitFlash = (exit_flash) ? exit_flash : RUNTIME_CLASS(ATeleportFog); p->health = morphed->health; p->mo = morphed; - p->velx = p->vely = 0; + if (!(morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS)) + { + p->velx = p->vely = 0; + } morphed->ObtainInventory (actor); // Remove all armor for (item = morphed->Inventory; item != NULL; ) @@ -178,6 +188,11 @@ SERVERCOMMANDS_SetThingFlags( morphed, FLAGSET_FLAGS3 ); if ( morphed->tid != 0 ) SERVERCOMMANDS_SetThingTID( morphed ); + if ( morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS ) + { + SERVERCOMMANDS_MoveLocalPlayer( ulPlayer ); + SERVERCOMMANDS_MovePlayer( ulPlayer, ulPlayer, SVCF_SKIPTHISCLIENT ); + } } return true; @@ -253,10 +268,20 @@ mo->player = player; mo->reactiontime = 18; mo->flags = pmo->special2 & ~MF_JUSTHIT; - mo->velx = 0; - mo->vely = 0; - player->velx = 0; - player->vely = 0; + if (pmo->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + mo->velx = pmo->velx; + mo->vely = pmo->vely; + mo->velz = pmo->velz; + mo->pitch = pmo->pitch; + } + else + { + mo->velx = 0; + mo->vely = 0; + player->velx = 0; + player->vely = 0; + } mo->velz = pmo->velz; if (!(pmo->special2 & MF_JUSTHIT)) { diff -r 4f775318d2ec src/p_mobj.cpp --- a/src/p_mobj.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_mobj.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -3354,7 +3354,8 @@ // [RH] only make noise if alive // [WS/BB] As client only play the sound for the consoleplayer. - if (!mo->player->morphTics && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) + bool canPlayLandSound = ( !mo->player->morphTics || (mo->player->mo && mo->player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ); + if ( canPlayLandSound && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) { grunted = false; // Why should this number vary by gravity? diff -r 4f775318d2ec src/p_pspr.cpp --- a/src/p_pspr.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_pspr.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -858,8 +858,9 @@ return; } if ((player->WeaponState & WF_DISABLESWITCH) || // Weapon changing has been disabled. - player->morphTics != 0) // Morphed classes cannot change weapons. + ( player->morphTics != 0 && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) )) // Morphed classes cannot change weapons. { // ...so throw away any pending weapon requests. + // [geNia] unless +NOMORPHLIMITATIONS is used player->PendingWeapon = WP_NOCHANGE; } @@ -1016,7 +1017,7 @@ return; } - if (player->morphTics || player->cheats & CF_INSTANTWEAPSWITCH) + if ( ( player->morphTics && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) || player->cheats & CF_INSTANTWEAPSWITCH) { psp->sy = WEAPONBOTTOM; } diff -r 4f775318d2ec src/p_user.cpp --- a/src/p_user.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_user.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -2266,7 +2266,7 @@ } // [BC] This comes out to 50%, so we can use this for the turbosphere. - if (!player->morphTics && Inventory != NULL) + if (( !player->morphTics || ( PlayerFlags & PPF_NOMORPHLIMITATIONS ) ) && Inventory != NULL) { fixed_t factor = Inventory->GetSpeedFactor (); forward = FixedMul(forward, factor); diff -r 4f775318d2ec src/sv_main.cpp --- a/src/sv_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/sv_main.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -6278,7 +6278,7 @@ } // [BB] Morph workaround: If the player is morphed, he can't change his weapon. - if ( players[ulClient].morphTics ) + if ( players[ulClient].morphTics && !( players[ulClient].mo && (players[ulClient].mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) return false; // [BB] Since the server is not giving the player a weapon while spawning, P_BringUpWeapon doesn't call A_Raise for diff -r 4f775318d2ec src/thingdef/thingdef_data.cpp --- a/src/thingdef/thingdef_data.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/thingdef/thingdef_data.cpp Fri Jan 05 06:43:08 2024 -0800 @@ -393,6 +393,7 @@ DEFINE_FLAG(PPF, NOTHRUSTWHENINVUL, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CANSUPERMORPH, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CROUCHABLEMORPH, APlayerPawn, PlayerFlags), + DEFINE_FLAG(PPF, NOMORPHLIMITATIONS, APlayerPawn, PlayerFlags), }; static FFlagDef PowerSpeedFlags[] =

# HG changeset patch # User Binary Code # Date 1704731852 28800 # Mon Jan 08 08:37:32 2024 -0800 # Node ID ec589e766849b517b91c4b6ede7cf2c7b3043df9 # Parent 4f775318d2ecf6db1d7e93a967964defdea7eb19 Added +NOMORPHLIMITATIONS flag from Q-Zandronum, allowing morphs to switch weapons, play sounds, and be affected by speed powerups. diff -r 4f775318d2ec -r ec589e766849 docs/zandronum-history.txt --- a/docs/zandronum-history.txt Wed Dec 20 22:00:46 2023 -0500 +++ b/docs/zandronum-history.txt Mon Jan 08 08:37:32 2024 -0800 @@ -18,6 +18,7 @@ *+ - Added the new AUTHINFO lump, allowing modders to define their own list of lumps to be authenticated. [Kaminsky] *+ - Revamped the scoreboard, and added the new SCORINFO lump that allows full customization of the scoreboard. [Kaminsky] *+ - Added support for custom vote types using the new VOTEINFO lump. [Dusk] ++ - Added the +NOMORPHLIMITATIONS flag, allowing morphs to switch weapons, play sounds, and be affected by speed powerups. [geNia/Binary] + - Added CVars: "con_interpolate" and "con_speed" which interpolates and controls how fast the console moves. Based on featues from ZCC. [Kaminsky] + - Added ACS functions: "GetCurrentMapPosition", "GetEventResult", "GetActorSectorLocation", and "ChangeTeamScore". [Kaminsky] + - Added an optional parameter to the ACS function GetChatMessage to let color codes to stay in chat messages. [Kaminsky] diff -r 4f775318d2ec -r ec589e766849 src/cl_main.cpp --- a/src/cl_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/cl_main.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -7252,7 +7252,8 @@ } */ // [BB] Prevent the client from trying to switch to a different weapon while morphed. - if ( players[ulPlayer].morphTics ) + // [geNia] unless +NOMORPHLIMITATIONS is used + if ( player->morphTics && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) players[ulPlayer].PendingWeapon = WP_NOCHANGE; // Since an item displayed on the HUD may have been given, refresh the HUD. diff -r 4f775318d2ec -r ec589e766849 src/d_player.h --- a/src/d_player.h Wed Dec 20 22:00:46 2023 -0500 +++ b/src/d_player.h Mon Jan 08 08:37:32 2024 -0800 @@ -192,6 +192,7 @@ PPF_NOTHRUSTWHENINVUL = 1, // Attacks do not thrust the player if they are invulnerable. PPF_CANSUPERMORPH = 2, // Being remorphed into this class can give you a Tome of Power PPF_CROUCHABLEMORPH = 4, // This morphed player can crouch + PPF_NOMORPHLIMITATIONS = 8, // [geNia] Removes morph limitations, like not playing land sounds, switching weapons, or using speed powerups. }; // diff -r 4f775318d2ec -r ec589e766849 src/g_shared/a_morph.cpp --- a/src/g_shared/a_morph.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/g_shared/a_morph.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -97,6 +97,14 @@ p->PremorphWeapon = p->ReadyWeapon; morphed->special2 = actor->flags & ~MF_JUSTHIT; morphed->player = p; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + morphed->velx = actor->velx; + morphed->vely = actor->vely; + morphed->velz = actor->velz; + morphed->pitch = actor->pitch; + } if (actor->renderflags & RF_INVISIBLE) { morphed->special2 |= MF_JUSTHIT; @@ -127,7 +135,11 @@ p->MorphExitFlash = (exit_flash) ? exit_flash : RUNTIME_CLASS(ATeleportFog); p->health = morphed->health; p->mo = morphed; - p->velx = p->vely = 0; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (!(morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS)) + { + p->velx = p->vely = 0; + } morphed->ObtainInventory (actor); // Remove all armor for (item = morphed->Inventory; item != NULL; ) @@ -178,6 +190,12 @@ SERVERCOMMANDS_SetThingFlags( morphed, FLAGSET_FLAGS3 ); if ( morphed->tid != 0 ) SERVERCOMMANDS_SetThingTID( morphed ); + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if ( morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS ) + { + SERVERCOMMANDS_MoveLocalPlayer( ulPlayer ); + SERVERCOMMANDS_MovePlayer( ulPlayer, ulPlayer, SVCF_SKIPTHISCLIENT ); + } } return true; @@ -253,10 +271,21 @@ mo->player = player; mo->reactiontime = 18; mo->flags = pmo->special2 & ~MF_JUSTHIT; - mo->velx = 0; - mo->vely = 0; - player->velx = 0; - player->vely = 0; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (pmo->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + mo->velx = pmo->velx; + mo->vely = pmo->vely; + mo->velz = pmo->velz; + mo->pitch = pmo->pitch; + } + else + { + mo->velx = 0; + mo->vely = 0; + player->velx = 0; + player->vely = 0; + } mo->velz = pmo->velz; if (!(pmo->special2 & MF_JUSTHIT)) { diff -r 4f775318d2ec -r ec589e766849 src/p_mobj.cpp --- a/src/p_mobj.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_mobj.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -3354,7 +3354,9 @@ // [RH] only make noise if alive // [WS/BB] As client only play the sound for the consoleplayer. - if (!mo->player->morphTics && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) + // [Binary] Allow morphs to play sounds if +NOMORPHLIMITATIONS is used. + bool canPlayLandSound = ( !mo->player->morphTics || (mo->player->mo && mo->player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ); + if ( canPlayLandSound && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) { grunted = false; // Why should this number vary by gravity? diff -r 4f775318d2ec -r ec589e766849 src/p_pspr.cpp --- a/src/p_pspr.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_pspr.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -858,7 +858,8 @@ return; } if ((player->WeaponState & WF_DISABLESWITCH) || // Weapon changing has been disabled. - player->morphTics != 0) // Morphed classes cannot change weapons. + ( player->morphTics != 0 && // Morphed classes cannot change weapons. + !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) )) // [geNia] unless +NOMORPHLIMITATIONS is used { // ...so throw away any pending weapon requests. player->PendingWeapon = WP_NOCHANGE; } @@ -1016,7 +1017,8 @@ return; } - if (player->morphTics || player->cheats & CF_INSTANTWEAPSWITCH) + // [Binary] Allow morphs to switch weapons if +NOMORPHLIMITATIONS is used. + if ( ( player->morphTics && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) || player->cheats & CF_INSTANTWEAPSWITCH) { psp->sy = WEAPONBOTTOM; } diff -r 4f775318d2ec -r ec589e766849 src/p_user.cpp --- a/src/p_user.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_user.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -2266,7 +2266,8 @@ } // [BC] This comes out to 50%, so we can use this for the turbosphere. - if (!player->morphTics && Inventory != NULL) + // [Binary] Allow morphs to use turbosphere / speed powerups with +NOMORPHLIMITATIONS. + if (( !player->morphTics || ( PlayerFlags & PPF_NOMORPHLIMITATIONS ) ) && Inventory != NULL) { fixed_t factor = Inventory->GetSpeedFactor (); forward = FixedMul(forward, factor); diff -r 4f775318d2ec -r ec589e766849 src/sv_main.cpp --- a/src/sv_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/sv_main.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -6278,7 +6278,8 @@ } // [BB] Morph workaround: If the player is morphed, he can't change his weapon. - if ( players[ulClient].morphTics ) + // [Binary] Unless +NOMORPHLIMITATIONS is used + if ( players[ulClient].morphTics && !( players[ulClient].mo && (players[ulClient].mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) return false; // [BB] Since the server is not giving the player a weapon while spawning, P_BringUpWeapon doesn't call A_Raise for diff -r 4f775318d2ec -r ec589e766849 src/thingdef/thingdef_data.cpp --- a/src/thingdef/thingdef_data.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/thingdef/thingdef_data.cpp Mon Jan 08 08:37:32 2024 -0800 @@ -393,6 +393,7 @@ DEFINE_FLAG(PPF, NOTHRUSTWHENINVUL, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CANSUPERMORPH, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CROUCHABLEMORPH, APlayerPawn, PlayerFlags), + DEFINE_FLAG(PPF, NOMORPHLIMITATIONS, APlayerPawn, PlayerFlags), // [Binary] Define +NOMORPHLIMITATIONS flag. }; static FFlagDef PowerSpeedFlags[] =

# HG changeset patch # User Binary Code # Date 1704806536 28800 # Tue Jan 09 05:22:16 2024 -0800 # Node ID 8bd417dd67fb5222febf78612725952fe2b86ac4 # Parent 4f775318d2ecf6db1d7e93a967964defdea7eb19 Added +NOMORPHLIMITATIONS flag from Q-Zandronum, allowing morphs to switch weapons, play sounds, and be affected by speed powerups. diff -r 4f775318d2ec -r 8bd417dd67fb docs/zandronum-history.txt --- a/docs/zandronum-history.txt Wed Dec 20 22:00:46 2023 -0500 +++ b/docs/zandronum-history.txt Tue Jan 09 05:22:16 2024 -0800 @@ -18,6 +18,7 @@ *+ - Added the new AUTHINFO lump, allowing modders to define their own list of lumps to be authenticated. [Kaminsky] *+ - Revamped the scoreboard, and added the new SCORINFO lump that allows full customization of the scoreboard. [Kaminsky] *+ - Added support for custom vote types using the new VOTEINFO lump. [Dusk] ++ - Added the +NOMORPHLIMITATIONS flag, allowing morphs to switch weapons, play sounds, and be affected by speed powerups. [geNia/Binary] + - Added CVars: "con_interpolate" and "con_speed" which interpolates and controls how fast the console moves. Based on featues from ZCC. [Kaminsky] + - Added ACS functions: "GetCurrentMapPosition", "GetEventResult", "GetActorSectorLocation", and "ChangeTeamScore". [Kaminsky] + - Added an optional parameter to the ACS function GetChatMessage to let color codes to stay in chat messages. [Kaminsky] diff -r 4f775318d2ec -r 8bd417dd67fb src/cl_main.cpp --- a/src/cl_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/cl_main.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -7252,7 +7252,8 @@ } */ // [BB] Prevent the client from trying to switch to a different weapon while morphed. - if ( players[ulPlayer].morphTics ) + // [geNia] unless +NOMORPHLIMITATIONS is used + if ( players[ulPlayer].morphTics && !( players[ulPlayer].mo && (players[ulPlayer].mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) players[ulPlayer].PendingWeapon = WP_NOCHANGE; // Since an item displayed on the HUD may have been given, refresh the HUD. diff -r 4f775318d2ec -r 8bd417dd67fb src/d_player.h --- a/src/d_player.h Wed Dec 20 22:00:46 2023 -0500 +++ b/src/d_player.h Tue Jan 09 05:22:16 2024 -0800 @@ -192,6 +192,7 @@ PPF_NOTHRUSTWHENINVUL = 1, // Attacks do not thrust the player if they are invulnerable. PPF_CANSUPERMORPH = 2, // Being remorphed into this class can give you a Tome of Power PPF_CROUCHABLEMORPH = 4, // This morphed player can crouch + PPF_NOMORPHLIMITATIONS = 8, // [geNia] Removes morph limitations, like not playing land sounds, switching weapons, or using speed powerups. }; // diff -r 4f775318d2ec -r 8bd417dd67fb src/g_shared/a_morph.cpp --- a/src/g_shared/a_morph.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/g_shared/a_morph.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -97,6 +97,14 @@ p->PremorphWeapon = p->ReadyWeapon; morphed->special2 = actor->flags & ~MF_JUSTHIT; morphed->player = p; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + morphed->velx = actor->velx; + morphed->vely = actor->vely; + morphed->velz = actor->velz; + morphed->pitch = actor->pitch; + } if (actor->renderflags & RF_INVISIBLE) { morphed->special2 |= MF_JUSTHIT; @@ -127,7 +135,11 @@ p->MorphExitFlash = (exit_flash) ? exit_flash : RUNTIME_CLASS(ATeleportFog); p->health = morphed->health; p->mo = morphed; - p->velx = p->vely = 0; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (!(morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS)) + { + p->velx = p->vely = 0; + } morphed->ObtainInventory (actor); // Remove all armor for (item = morphed->Inventory; item != NULL; ) @@ -178,6 +190,12 @@ SERVERCOMMANDS_SetThingFlags( morphed, FLAGSET_FLAGS3 ); if ( morphed->tid != 0 ) SERVERCOMMANDS_SetThingTID( morphed ); + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if ( morphed->PlayerFlags & PPF_NOMORPHLIMITATIONS ) + { + SERVERCOMMANDS_MoveLocalPlayer( ulPlayer ); + SERVERCOMMANDS_MovePlayer( ulPlayer, ulPlayer, SVCF_SKIPTHISCLIENT ); + } } return true; @@ -253,10 +271,21 @@ mo->player = player; mo->reactiontime = 18; mo->flags = pmo->special2 & ~MF_JUSTHIT; - mo->velx = 0; - mo->vely = 0; - player->velx = 0; - player->vely = 0; + // [Binary] Keep movement if +NOMORPHLIMITATIONS is used. + if (pmo->PlayerFlags & PPF_NOMORPHLIMITATIONS) + { + mo->velx = pmo->velx; + mo->vely = pmo->vely; + mo->velz = pmo->velz; + mo->pitch = pmo->pitch; + } + else + { + mo->velx = 0; + mo->vely = 0; + player->velx = 0; + player->vely = 0; + } mo->velz = pmo->velz; if (!(pmo->special2 & MF_JUSTHIT)) { diff -r 4f775318d2ec -r 8bd417dd67fb src/p_mobj.cpp --- a/src/p_mobj.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_mobj.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -3354,7 +3354,9 @@ // [RH] only make noise if alive // [WS/BB] As client only play the sound for the consoleplayer. - if (!mo->player->morphTics && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) + // [Binary] Allow morphs to play sounds if +NOMORPHLIMITATIONS is used. + bool canPlayLandSound = ( !mo->player->morphTics || (mo->player->mo && mo->player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ); + if ( canPlayLandSound && mo->health > 0 && NETWORK_IsConsolePlayerOrNotInClientMode( mo->player )) { grunted = false; // Why should this number vary by gravity? diff -r 4f775318d2ec -r 8bd417dd67fb src/p_pspr.cpp --- a/src/p_pspr.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_pspr.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -858,7 +858,8 @@ return; } if ((player->WeaponState & WF_DISABLESWITCH) || // Weapon changing has been disabled. - player->morphTics != 0) // Morphed classes cannot change weapons. + ( player->morphTics != 0 && // Morphed classes cannot change weapons. + !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) )) // [geNia] unless +NOMORPHLIMITATIONS is used { // ...so throw away any pending weapon requests. player->PendingWeapon = WP_NOCHANGE; } @@ -1016,7 +1017,8 @@ return; } - if (player->morphTics || player->cheats & CF_INSTANTWEAPSWITCH) + // [Binary] Allow morphs to switch weapons if +NOMORPHLIMITATIONS is used. + if ( ( player->morphTics && !( player->mo && (player->mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) || player->cheats & CF_INSTANTWEAPSWITCH) { psp->sy = WEAPONBOTTOM; } diff -r 4f775318d2ec -r 8bd417dd67fb src/p_user.cpp --- a/src/p_user.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/p_user.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -2266,7 +2266,8 @@ } // [BC] This comes out to 50%, so we can use this for the turbosphere. - if (!player->morphTics && Inventory != NULL) + // [Binary] Allow morphs to use turbosphere / speed powerups with +NOMORPHLIMITATIONS. + if (( !player->morphTics || ( PlayerFlags & PPF_NOMORPHLIMITATIONS ) ) && Inventory != NULL) { fixed_t factor = Inventory->GetSpeedFactor (); forward = FixedMul(forward, factor); diff -r 4f775318d2ec -r 8bd417dd67fb src/sv_main.cpp --- a/src/sv_main.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/sv_main.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -6278,7 +6278,8 @@ } // [BB] Morph workaround: If the player is morphed, he can't change his weapon. - if ( players[ulClient].morphTics ) + // [Binary] Unless +NOMORPHLIMITATIONS is used + if ( players[ulClient].morphTics && !( players[ulClient].mo && (players[ulClient].mo->PlayerFlags & PPF_NOMORPHLIMITATIONS) ) ) return false; // [BB] Since the server is not giving the player a weapon while spawning, P_BringUpWeapon doesn't call A_Raise for diff -r 4f775318d2ec -r 8bd417dd67fb src/thingdef/thingdef_data.cpp --- a/src/thingdef/thingdef_data.cpp Wed Dec 20 22:00:46 2023 -0500 +++ b/src/thingdef/thingdef_data.cpp Tue Jan 09 05:22:16 2024 -0800 @@ -393,6 +393,7 @@ DEFINE_FLAG(PPF, NOTHRUSTWHENINVUL, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CANSUPERMORPH, APlayerPawn, PlayerFlags), DEFINE_FLAG(PPF, CROUCHABLEMORPH, APlayerPawn, PlayerFlags), + DEFINE_FLAG(PPF, NOMORPHLIMITATIONS, APlayerPawn, PlayerFlags), // [Binary] Define +NOMORPHLIMITATIONS flag. }; static FFlagDef PowerSpeedFlags[] =

**Issue Community Support**
This issue is already marked as resolved. If you feel that is not the case, please reopen it and explain why.
Supporters:	MegaX Fused
Opponents:	No one explicitly opposes this issue yet.

Issue Community Support

This issue is already marked as resolved.
If you feel that is not the case, please reopen it and explain why.

Supporters:

MegaX Fused

Opponents:

No one explicitly opposes this issue yet.

Issue History
Date Modified	Username	Field	Change
2024-01-05 15:42	BinaryCode	New Issue
2024-01-05 15:42	BinaryCode	File Added: NoMorphLimitations.patch
2024-01-05 17:18	Kaminsky	Status	new => needs review
2024-01-05 17:18	Kaminsky	Product Version	4.0-beta => 3.2
2024-01-05 17:18	Kaminsky	Target Version	=> 3.2
2024-01-07 20:29	Torr Samaho	Note Added: 0022974
2024-01-08 16:48	BinaryCode	File Added: NoMorphLimitations_1.patch
2024-01-08 16:48	BinaryCode	Note Added: 0022978
2024-01-09 13:33	BinaryCode	File Added: NoMorphLimitations_2.patch
2024-01-09 13:35	BinaryCode	Note Added: 0022980
2024-01-14 20:17	Torr Samaho	Note Added: 0022989
2024-01-14 20:17	Torr Samaho	Status	needs review => needs testing
2024-02-29 19:56	Ru5tK1ng	Note Added: 0023122
2024-02-29 19:56	Ru5tK1ng	Status	needs testing => feedback
2024-03-01 03:07	Ru5tK1ng	Note Deleted: 0023122
2024-03-01 03:07	Ru5tK1ng	Status	feedback => needs testing
2024-03-18 01:44	Kaminsky	Relationship added	has duplicate 0004025
2024-04-11 15:05	Ru5tK1ng	Note Added: 0023596
2024-04-11 15:05	Ru5tK1ng	Status	needs testing => resolved
2024-04-11 15:05	Ru5tK1ng	Resolution	open => fixed
2024-04-11 15:05	Ru5tK1ng	Fixed in Version	=> 3.2

Notes
(0022974) Torr Samaho (administrator) 2024-01-07 20:29	Thanks for the patch! Looks ok at first glance, but it's missing comments marked with initials that illustrate where the GZDoom code is changed.

(0022978) BinaryCode (reporter) 2024-01-08 16:48	Uploaded an updated patch that has more comments and a line for zandronum-history.txt.

(0022980) BinaryCode (reporter) 2024-01-09 13:35	Fixed 1 line of code to be consistent with what is in the repository, should be the last adjustment I need to make for now.

(0022989) Torr Samaho (administrator) 2024-01-14 20:17	Thanks! I added the updated patch to the head of our main repository.

(0023596) Ru5tK1ng (updater) 2024-04-11 15:05	Tested with the latest 3.2 beta and morphed players could now switch weapons, play land sounds and be affected by powerspeed.