zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 19:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert temporary fix from r1273.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1278 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2011-12-14 11:48:53 +00:00
parent 5b1f24b6be
commit 8c93739a3d
3 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -104,7 +104,6 @@ public:
virtual void FilterCoopRespawnInventory (APlayerPawn *oldplayer);
void SetupWeaponSlots ();
void SetupPlayerPitch ();
void GiveDefaultInventory ();
void PlayAttacking ();
void PlayAttacking2 ();

1
src/g_level.cpp
View file

@ -1147,7 +1147,6 @@ void G_FinishTravel ()
pawndup->Destroy ();
pawn->LinkToWorld ();
pawn->AddToHash ();
pawn->SetupPlayerPitch();
pawn->SetState(pawn->SpawnState);
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)

28
src/p_user.cpp
View file

@ -513,7 +513,6 @@ void APlayerPawn::Tick()
void APlayerPawn::PostBeginPlay()
{
SetupWeaponSlots();
SetupPlayerPitch();
// Voodoo dolls: restore original floorz/ceilingz logic
if (player == NULL || player->mo != this)
@ -523,6 +522,14 @@ void APlayerPawn::PostBeginPlay()
P_FindFloorCeiling(this, true);
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