OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Removed more literal references to AInventory.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-04 17:00:48 +01:00
commit cd563cc4db
29 changed files with 80 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_user.cpp
View file

@ -948,9 +948,9 @@ void APlayerPawn::PostBeginPlay()
//
//===========================================================================
AInventory *APlayerPawn::PickNewWeapon(PClassActor *ammotype)
AActor *APlayerPawn::PickNewWeapon(PClassActor *ammotype)
{
AInventory *best = nullptr;
AActor *best = nullptr;
IFVM(PlayerPawn, PickNewWeapon)
{
VMValue param[] = { player->mo, ammotype };
@ -976,10 +976,10 @@ void APlayerPawn::GiveDeathmatchInventory()
{
if (PClassActor::AllActorClasses[i]->IsDescendantOf (PClass::FindActor(NAME_Key)))
{
AInventory *key = (AInventory*)GetDefaultByType (PClassActor::AllActorClasses[i]);
auto key = GetDefaultByType (PClassActor::AllActorClasses[i]);
if (key->special1 != 0)
{
key = (AInventory*)Spawn(PClassActor::AllActorClasses[i]);
key = Spawn(PClassActor::AllActorClasses[i]);
if (!CallTryPickup (key, this))
{
key->Destroy ();
@ -1981,7 +1981,7 @@ void P_UnPredictPlayer ()
APlayerPawn *act = player->mo;
AActor *savedcamera = player->camera;
TObjPtr<AInventory*> InvSel = act->InvSel;
TObjPtr<AActor*> InvSel = act->InvSel;
int inventorytics = player->inventorytics;
*player = PredictionPlayerBackup;