mirror of
https://github.com/ZDoom/qzdoom-gpl.git
synced 2024-11-26 13:51:35 +00:00
This commit is contained in:
commit
0b4fd6c766
2 changed files with 34 additions and 26 deletions
|
@ -1365,6 +1365,12 @@ void APlayerPawn::GiveDefaultInventory ()
|
|||
{
|
||||
PClassActor *ti = PClass::FindActor (di->Name);
|
||||
if (ti)
|
||||
{
|
||||
if (!ti->IsDescendantOf(RUNTIME_CLASS(AInventory)))
|
||||
{
|
||||
Printf(TEXTCOLOR_ORANGE "%s is not an inventory item and cannot be given to a player as start item.\n", ti->TypeName.GetChars());
|
||||
}
|
||||
else
|
||||
{
|
||||
AInventory *item = FindInventory(ti);
|
||||
if (item != NULL)
|
||||
|
@ -1404,6 +1410,7 @@ void APlayerPawn::GiveDefaultInventory ()
|
|||
player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
|
||||
}
|
||||
}
|
||||
}
|
||||
di = di->Next;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,6 +183,7 @@ namespace swrenderer
|
|||
{
|
||||
identitymap[i] = i;
|
||||
}
|
||||
identitycolormap.Maps = identitymap;
|
||||
}
|
||||
|
||||
void R_InitFuzzTable(int fuzzoff)
|
||||
|
|
Loading…
Reference in a new issue