mirror of
https://github.com/ZDoom/gzdoom-last-svn.git
synced 2025-06-04 19:20:53 +00:00
- Revert temporary fix from r1273.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1278 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
parent
5b1f24b6be
commit
8c93739a3d
3 changed files with 8 additions and 22 deletions
|
@ -104,7 +104,6 @@ public:
|
||||||
virtual void FilterCoopRespawnInventory (APlayerPawn *oldplayer);
|
virtual void FilterCoopRespawnInventory (APlayerPawn *oldplayer);
|
||||||
|
|
||||||
void SetupWeaponSlots ();
|
void SetupWeaponSlots ();
|
||||||
void SetupPlayerPitch ();
|
|
||||||
void GiveDefaultInventory ();
|
void GiveDefaultInventory ();
|
||||||
void PlayAttacking ();
|
void PlayAttacking ();
|
||||||
void PlayAttacking2 ();
|
void PlayAttacking2 ();
|
||||||
|
|
|
@ -1147,7 +1147,6 @@ void G_FinishTravel ()
|
||||||
pawndup->Destroy ();
|
pawndup->Destroy ();
|
||||||
pawn->LinkToWorld ();
|
pawn->LinkToWorld ();
|
||||||
pawn->AddToHash ();
|
pawn->AddToHash ();
|
||||||
pawn->SetupPlayerPitch();
|
|
||||||
pawn->SetState(pawn->SpawnState);
|
pawn->SetState(pawn->SpawnState);
|
||||||
|
|
||||||
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
|
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
|
||||||
|
|
|
@ -513,7 +513,6 @@ void APlayerPawn::Tick()
|
||||||
void APlayerPawn::PostBeginPlay()
|
void APlayerPawn::PostBeginPlay()
|
||||||
{
|
{
|
||||||
SetupWeaponSlots();
|
SetupWeaponSlots();
|
||||||
SetupPlayerPitch();
|
|
||||||
|
|
||||||
// Voodoo dolls: restore original floorz/ceilingz logic
|
// Voodoo dolls: restore original floorz/ceilingz logic
|
||||||
if (player == NULL || player->mo != this)
|
if (player == NULL || player->mo != this)
|
||||||
|
@ -523,6 +522,14 @@ void APlayerPawn::PostBeginPlay()
|
||||||
P_FindFloorCeiling(this, true);
|
P_FindFloorCeiling(this, true);
|
||||||
z = floorz;
|
z = floorz;
|
||||||
}
|
}
|
||||||
|
else if (player - players == consoleplayer)
|
||||||
|
{
|
||||||
|
// Ask the local player's renderer what pitch restrictions
|
||||||
|
// should be imposed and let everybody know.
|
||||||
|
Net_WriteByte(DEM_SETPITCHLIMIT);
|
||||||
|
Net_WriteByte(Renderer->GetMaxViewPitch(false)); // up
|
||||||
|
Net_WriteByte(Renderer->GetMaxViewPitch(true)); // down
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
@ -549,25 +556,6 @@ void APlayerPawn::SetupWeaponSlots()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//===========================================================================
|
|
||||||
//
|
|
||||||
// APlayerPawn :: SetupSinglePlayerPitch
|
|
||||||
//
|
|
||||||
// Ask the local player's renderer what pitch restrictions
|
|
||||||
// should be imposed and let everybody know.
|
|
||||||
//
|
|
||||||
//===========================================================================
|
|
||||||
|
|
||||||
void APlayerPawn::SetupPlayerPitch()
|
|
||||||
{
|
|
||||||
if (player != NULL && player->mo == this && player - players == consoleplayer)
|
|
||||||
{
|
|
||||||
Net_WriteByte(DEM_SETPITCHLIMIT);
|
|
||||||
Net_WriteByte(Renderer->GetMaxViewPitch(false)); // up
|
|
||||||
Net_WriteByte(Renderer->GetMaxViewPitch(true)); // down
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
//
|
//
|
||||||
// APlayerPawn :: AddInventory
|
// APlayerPawn :: AddInventory
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue