- replaced another large batch of homegrown type use.
This commit is contained in:
parent
6c6bab73ad
commit
6dee9ff566
57 changed files with 656 additions and 656 deletions
|
|
@ -87,7 +87,7 @@ public:
|
|||
void OnDestroy() override;
|
||||
void Serialize(FSerializer &arc);
|
||||
TObjPtr<AActor*> Corpse;
|
||||
DWORD Count; // Only the first corpse pointer's count is valid.
|
||||
uint32_t Count; // Only the first corpse pointer's count is valid.
|
||||
private:
|
||||
DCorpsePointer () {}
|
||||
};
|
||||
|
|
@ -104,7 +104,7 @@ CUSTOM_CVAR(Int, sv_corpsequeuesize, 64, CVAR_ARCHIVE|CVAR_SERVERINFO)
|
|||
{
|
||||
TThinkerIterator<DCorpsePointer> iterator (STAT_CORPSEPOINTER);
|
||||
DCorpsePointer *first = iterator.Next ();
|
||||
while (first != NULL && first->Count > (DWORD)self)
|
||||
while (first != NULL && first->Count > (uint32_t)self)
|
||||
{
|
||||
DCorpsePointer *next = iterator.Next ();
|
||||
first->Destroy ();
|
||||
|
|
@ -126,7 +126,7 @@ DCorpsePointer::DCorpsePointer (AActor *ptr)
|
|||
|
||||
if (first != this)
|
||||
{
|
||||
if (first->Count >= (DWORD)sv_corpsequeuesize)
|
||||
if (first->Count >= (uint32_t)sv_corpsequeuesize)
|
||||
{
|
||||
DCorpsePointer *next = iterator.Next ();
|
||||
first->Destroy ();
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ void DBaseDecal::GetXY (side_t *wall, double &ox, double &oy) const
|
|||
oy = v1->fY() + LeftDistance * dy;
|
||||
}
|
||||
|
||||
void DBaseDecal::SetShade (DWORD rgb)
|
||||
void DBaseDecal::SetShade (uint32_t rgb)
|
||||
{
|
||||
PalEntry *entry = (PalEntry *)&rgb;
|
||||
AlphaColor = rgb | (ColorMatcher.Pick (entry->r, entry->g, entry->b) << 24);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ void DLightningThinker::LightningFlash ()
|
|||
{
|
||||
int i, j;
|
||||
sector_t *tempSec;
|
||||
BYTE flashLight;
|
||||
uint8_t flashLight;
|
||||
|
||||
if (LightningFlashCount)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public:
|
|||
void OnDestroy() override;
|
||||
FTextureID StickToWall(side_t *wall, double x, double y, F3DFloor * ffloor);
|
||||
double GetRealZ (const side_t *wall) const;
|
||||
void SetShade (DWORD rgb);
|
||||
void SetShade (uint32_t rgb);
|
||||
void SetShade (int r, int g, int b);
|
||||
void Spread (const FDecalTemplate *tpl, side_t *wall, double x, double y, double z, F3DFloor * ffloor);
|
||||
void GetXY (side_t *side, double &x, double &y) const;
|
||||
|
|
@ -39,10 +39,10 @@ public:
|
|||
double Z;
|
||||
double ScaleX, ScaleY;
|
||||
double Alpha;
|
||||
DWORD AlphaColor;
|
||||
uint32_t AlphaColor;
|
||||
int Translation;
|
||||
FTextureID PicNum;
|
||||
DWORD RenderFlags;
|
||||
uint32_t RenderFlags;
|
||||
FRenderStyle RenderStyle;
|
||||
side_t *Side;
|
||||
sector_t *Sector;
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ void DHUDMessage::ResetText (const char *text)
|
|||
V_FreeBrokenLines (Lines);
|
||||
}
|
||||
|
||||
Lines = V_BreakLines (Font, NoWrap ? INT_MAX : width, (BYTE *)text);
|
||||
Lines = V_BreakLines (Font, NoWrap ? INT_MAX : width, (uint8_t *)text);
|
||||
|
||||
NumLines = 0;
|
||||
Width = 0;
|
||||
|
|
|
|||
|
|
@ -670,7 +670,7 @@ static int DrawAmmo(player_t *CPlayer, int x, int y)
|
|||
// Weapons List
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
FTextureID GetInventoryIcon(AInventory *item, DWORD flags, bool *applyscale=NULL) // This function is also used by SBARINFO
|
||||
FTextureID GetInventoryIcon(AInventory *item, uint32_t flags, bool *applyscale=NULL) // This function is also used by SBARINFO
|
||||
{
|
||||
FTextureID picnum, AltIcon = item->AltHUDIcon;
|
||||
FState * state=NULL, *ReadyState;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue