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

9
src/g_statusbar/shared_sbar.cpp
View file

@ -1266,12 +1266,12 @@ void DBaseStatusBar::CallScreenSizeChanged()
//
//---------------------------------------------------------------------------
AInventory *DBaseStatusBar::ValidateInvFirst (int numVisible) const
AActor *DBaseStatusBar::ValidateInvFirst (int numVisible) const
{
IFVM(BaseStatusBar, ValidateInvFirst)
{
VMValue params[] = { (AInventory*)this, numVisible };
AInventory *item;
VMValue params[] = { const_cast<DBaseStatusBar*>(this), numVisible };
AActor *item;
VMReturn ret((void**)&item);
VMCall(func, params, 2, &ret, 1);
return item;
@ -1757,8 +1757,7 @@ void FormatNumber(int number, int minsize, int maxsize, int flags, const FString
//
//---------------------------------------------------------------------------
//FTextureID GetInventoryIcon(AInventory *item, uint32_t flags, int *applyscale)
int GetInventoryIcon(AInventory *item, uint32_t flags, int *applyscale)
int GetInventoryIcon(AActor *item, uint32_t flags, int *applyscale)
{
if (applyscale != NULL)
{