From 6dee9ff566698c1868fb46cc9c8d2296feb4b0de Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 8 Mar 2017 18:44:37 +0100 Subject: [PATCH] - replaced another large batch of homegrown type use. --- src/fragglescript/t_func.cpp | 4 +- src/g_inventory/a_weapons.cpp | 6 +- src/g_inventory/a_weapons.h | 8 +- src/g_shared/a_action.cpp | 6 +- src/g_shared/a_decals.cpp | 2 +- src/g_shared/a_lightning.cpp | 2 +- src/g_shared/a_sharedglobal.h | 6 +- src/g_shared/hudmessages.cpp | 2 +- src/g_shared/shared_hud.cpp | 2 +- src/g_statusbar/sbar.h | 14 +- src/g_statusbar/sbarinfo.cpp | 6 +- src/g_statusbar/sbarinfo_commands.cpp | 8 +- src/g_statusbar/shared_sbar.cpp | 8 +- src/intermission/intermission.cpp | 10 +- src/intermission/intermission.h | 16 +- src/intermission/intermission_parse.cpp | 6 +- src/menu/menu.cpp | 2 +- src/menu/videomenu.cpp | 2 +- src/resourcefiles/file_7z.cpp | 2 +- src/resourcefiles/file_grp.cpp | 8 +- src/resourcefiles/file_pak.cpp | 2 +- src/resourcefiles/file_rff.cpp | 32 ++-- src/resourcefiles/file_wad.cpp | 32 ++-- src/resourcefiles/file_zip.cpp | 24 +-- src/resourcefiles/file_zip.h | 4 +- src/resourcefiles/resourcefile.cpp | 40 ++--- src/resourcefiles/resourcefile.h | 24 +-- src/scripting/backend/codegen.cpp | 2 +- src/scripting/backend/vmbuilder.cpp | 4 +- src/scripting/decorate/olddecorations.cpp | 4 +- src/scripting/decorate/thingdef_states.cpp | 2 +- src/scripting/symbols.cpp | 2 +- src/scripting/thingdef.cpp | 2 +- src/scripting/thingdef.h | 6 +- src/scripting/thingdef_properties.cpp | 20 +-- src/scripting/vm/vm.h | 2 +- src/scripting/zscript/zcc_compile.cpp | 2 +- src/scripting/zscript/zcc_parser.cpp | 10 +- src/sfmt/SFMT.cpp | 62 ++++---- src/sfmt/SFMT.h | 6 +- src/textures/animations.cpp | 28 ++-- src/textures/automaptexture.cpp | 16 +- src/textures/backdroptexture.cpp | 32 ++-- src/textures/bitmap.cpp | 26 ++-- src/textures/bitmap.h | 84 +++++----- src/textures/ddstexture.cpp | 170 ++++++++++----------- src/textures/emptytexture.cpp | 10 +- src/textures/flattexture.cpp | 12 +- src/textures/imgztexture.cpp | 46 +++--- src/textures/jpegtexture.cpp | 28 ++-- src/textures/multipatchtexture.cpp | 100 ++++++------ src/textures/patchtexture.cpp | 50 +++--- src/textures/pcxtexture.cpp | 116 +++++++------- src/textures/pngtexture.cpp | 78 +++++----- src/textures/rawpagetexture.cpp | 24 +-- src/textures/texturemanager.cpp | 4 +- src/textures/tgatexture.cpp | 80 +++++----- 57 files changed, 653 insertions(+), 653 deletions(-) diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index f12dd8a01..51c1dd05b 100644 --- a/src/fragglescript/t_func.cpp +++ b/src/fragglescript/t_func.cpp @@ -1218,7 +1218,7 @@ void FParser::SF_ObjFlag(void) if(mo && flagnum<26) // nullptr check { - DWORD tempflags = mo->flags; + uint32_t tempflags = mo->flags; // remove old bit tempflags &= ~(1 << flagnum); @@ -1953,7 +1953,7 @@ void FParser::SF_SectorColormap(void) if (t_argv[1].type==svt_string) { - DWORD cm = R_ColormapNumForName(t_argv[1].value.s); + uint32_t cm = R_ColormapNumForName(t_argv[1].value.s); FSSectorTagIterator itr(tagnum); while ((i = itr.Next()) >= 0) diff --git a/src/g_inventory/a_weapons.cpp b/src/g_inventory/a_weapons.cpp index fa9f63afa..2b1c78991 100644 --- a/src/g_inventory/a_weapons.cpp +++ b/src/g_inventory/a_weapons.cpp @@ -1487,7 +1487,7 @@ static int ntoh_cmp(const void *a, const void *b) // //=========================================================================== -void P_WriteDemoWeaponsChunk(BYTE **demo) +void P_WriteDemoWeaponsChunk(uint8_t **demo) { WriteWord(Weapons_ntoh.Size(), demo); for (unsigned int i = 1; i < Weapons_ntoh.Size(); ++i) @@ -1505,7 +1505,7 @@ void P_WriteDemoWeaponsChunk(BYTE **demo) // //=========================================================================== -void P_ReadDemoWeaponsChunk(BYTE **demo) +void P_ReadDemoWeaponsChunk(uint8_t **demo) { int count, i; PClassActor *type; @@ -1570,7 +1570,7 @@ void Net_WriteWeapon(PClassActor *type) // //=========================================================================== -PClassActor *Net_ReadWeapon(BYTE **stream) +PClassActor *Net_ReadWeapon(uint8_t **stream) { int index; diff --git a/src/g_inventory/a_weapons.h b/src/g_inventory/a_weapons.h index 49e9e3aa0..9841d1a5a 100644 --- a/src/g_inventory/a_weapons.h +++ b/src/g_inventory/a_weapons.h @@ -79,11 +79,11 @@ struct FWeaponSlots void P_PlaybackKeyConfWeapons(FWeaponSlots *slots); void Net_WriteWeapon(PClassActor *type); -PClassActor *Net_ReadWeapon(BYTE **stream); +PClassActor *Net_ReadWeapon(uint8_t **stream); void P_SetupWeapons_ntohton(); -void P_WriteDemoWeaponsChunk(BYTE **demo); -void P_ReadDemoWeaponsChunk(BYTE **demo); +void P_WriteDemoWeaponsChunk(uint8_t **demo); +void P_ReadDemoWeaponsChunk(uint8_t **demo); class AWeapon : public AStateProvider @@ -91,7 +91,7 @@ class AWeapon : public AStateProvider DECLARE_CLASS(AWeapon, AStateProvider) HAS_OBJECT_POINTERS public: - DWORD WeaponFlags; + uint32_t WeaponFlags; PClassActor *AmmoType1, *AmmoType2; // Types of ammo used by this weapon int AmmoGive1, AmmoGive2; // Amount of each ammo to get when picking up weapon int MinAmmo1, MinAmmo2; // Minimum ammo needed to switch to this weapon diff --git a/src/g_shared/a_action.cpp b/src/g_shared/a_action.cpp index fc7c354b3..575e7027c 100644 --- a/src/g_shared/a_action.cpp +++ b/src/g_shared/a_action.cpp @@ -87,7 +87,7 @@ public: void OnDestroy() override; void Serialize(FSerializer &arc); TObjPtr 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 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 (); diff --git a/src/g_shared/a_decals.cpp b/src/g_shared/a_decals.cpp index 21f116b07..9c31256ec 100644 --- a/src/g_shared/a_decals.cpp +++ b/src/g_shared/a_decals.cpp @@ -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); diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp index a5401f59a..cec7c1800 100644 --- a/src/g_shared/a_lightning.cpp +++ b/src/g_shared/a_lightning.cpp @@ -58,7 +58,7 @@ void DLightningThinker::LightningFlash () { int i, j; sector_t *tempSec; - BYTE flashLight; + uint8_t flashLight; if (LightningFlashCount) { diff --git a/src/g_shared/a_sharedglobal.h b/src/g_shared/a_sharedglobal.h index 5a16c54d6..f45cd9d0e 100644 --- a/src/g_shared/a_sharedglobal.h +++ b/src/g_shared/a_sharedglobal.h @@ -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; diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp index 86ddc4bfd..eab0e8d29 100644 --- a/src/g_shared/hudmessages.cpp +++ b/src/g_shared/hudmessages.cpp @@ -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; diff --git a/src/g_shared/shared_hud.cpp b/src/g_shared/shared_hud.cpp index 7fea7b014..97b1b54d6 100644 --- a/src/g_shared/shared_hud.cpp +++ b/src/g_shared/shared_hud.cpp @@ -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; diff --git a/src/g_statusbar/sbar.h b/src/g_statusbar/sbar.h index ff7f5d75e..0e1eca144 100644 --- a/src/g_statusbar/sbar.h +++ b/src/g_statusbar/sbar.h @@ -134,7 +134,7 @@ protected: private: TObjPtr Next; - DWORD SBarID; + uint32_t SBarID; char *SourceText; friend class DBaseStatusBar; @@ -225,11 +225,11 @@ struct FMugShotFrame struct FMugShotState { - BYTE bUsesLevels:1; - BYTE bHealth2:1; // Health level is the 2nd character from the end. - BYTE bHealthSpecial:1; // Like health2 only the 2nd frame gets the normal health type. - BYTE bDirectional:1; // Faces direction of damage. - BYTE bFinished:1; + uint8_t bUsesLevels:1; + uint8_t bHealth2:1; // Health level is the 2nd character from the end. + uint8_t bHealthSpecial:1; // Like health2 only the 2nd frame gets the normal health type. + uint8_t bDirectional:1; // Faces direction of damage. + uint8_t bFinished:1; unsigned int Position; int Time; @@ -433,7 +433,7 @@ void ST_LoadCrosshair(bool alwaysload=false); void ST_Clear(); extern FTexture *CrosshairImage; -FTextureID GetInventoryIcon(AInventory *item, DWORD flags, bool *applyscale); +FTextureID GetInventoryIcon(AInventory *item, uint32_t flags, bool *applyscale); enum DI_Flags { diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp index 5096ee813..b718e2703 100644 --- a/src/g_statusbar/sbarinfo.cpp +++ b/src/g_statusbar/sbarinfo.cpp @@ -189,9 +189,9 @@ class SBarInfoCommand if (!sc.CheckToken(TK_Null)) sc.MustGetToken(TK_Identifier); EColorRange returnVal = CR_UNTRANSLATED; FString namedTranslation; //we must send in "[translation]" - const BYTE *trans_ptr; + const uint8_t *trans_ptr; namedTranslation.Format("[%s]", sc.String); - trans_ptr = (const BYTE *)(&namedTranslation[0]); + trans_ptr = (const uint8_t *)(&namedTranslation[0]); if((returnVal = V_ParseFontColor(trans_ptr, CR_UNTRANSLATED, CR_UNTRANSLATED)) == CR_UNDEFINED) { sc.ScriptError("Missing definition for color %s.", sc.String); @@ -1379,7 +1379,7 @@ public: double xScale = 1.0; double yScale = 1.0; - const BYTE* str = (const BYTE*) cstring; + const uint8_t* str = (const uint8_t*) cstring; const EColorRange boldTranslation = EColorRange(translation ? translation - 1 : NumTextColors - 1); int fontcolor = translation; diff --git a/src/g_statusbar/sbarinfo_commands.cpp b/src/g_statusbar/sbarinfo_commands.cpp index ad2da961d..ccddc5939 100644 --- a/src/g_statusbar/sbarinfo_commands.cpp +++ b/src/g_statusbar/sbarinfo_commands.cpp @@ -344,7 +344,7 @@ class CommandDrawImage : public SBarInfoCommandFlowControl int maxheight; double spawnScaleX; double spawnScaleY; - DWORD flags; + uint32_t flags; bool applyscale; //Set remotely from from GetInventoryIcon when selected sprite comes from Spawn state // I'm using imgx/imgy here so that I can inherit drawimage with drawnumber for some commands. SBarInfoCoordinate imgx; @@ -2132,7 +2132,7 @@ class CommandDrawShader : public SBarInfoCommand DummySpan[1].TopOffset = 0; DummySpan[1].Length = 0; } - const BYTE *GetColumn(unsigned int column, const Span **spans_out) + const uint8_t *GetColumn(unsigned int column, const Span **spans_out) { if (spans_out != NULL) { @@ -2140,10 +2140,10 @@ class CommandDrawShader : public SBarInfoCommand } return Pixels + ((column & WidthMask) << HeightBits); } - const BYTE *GetPixels() { return Pixels; } + const uint8_t *GetPixels() { return Pixels; } void Unload() {} private: - BYTE Pixels[512]; + uint8_t Pixels[512]; Span DummySpan[2]; }; diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index a0c825df5..db3b5deb5 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -403,7 +403,7 @@ void DBaseStatusBar::Tick () // //--------------------------------------------------------------------------- -void DBaseStatusBar::AttachMessage (DHUDMessage *msg, DWORD id, int layer) +void DBaseStatusBar::AttachMessage (DHUDMessage *msg, uint32_t id, int layer) { DHUDMessage *old = NULL; DHUDMessage **prev; @@ -471,7 +471,7 @@ DHUDMessage *DBaseStatusBar::DetachMessage (DHUDMessage *msg) return NULL; } -DHUDMessage *DBaseStatusBar::DetachMessage (DWORD id) +DHUDMessage *DBaseStatusBar::DetachMessage (uint32_t id) { for (size_t i = 0; i < countof(Messages); ++i) { @@ -597,10 +597,10 @@ void DBaseStatusBar::RefreshBackground () const void DBaseStatusBar::DrawCrosshair () { - static DWORD prevcolor = 0xffffffff; + static uint32_t prevcolor = 0xffffffff; static int palettecolor = 0; - DWORD color; + uint32_t color; double size; int w, h; diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 5dddef105..0143b3e40 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -124,12 +124,12 @@ void DIntermissionScreen::Init(FIntermissionAction *desc, bool first) if (desc->mPalette.IsNotEmpty() && (lumpnum = Wads.CheckNumForFullName(desc->mPalette, true)) > 0) { PalEntry *palette; - const BYTE *orgpal; + const uint8_t *orgpal; FMemLump lump; int i; lump = Wads.ReadLump (lumpnum); - orgpal = (BYTE *)lump.GetMem(); + orgpal = (uint8_t *)lump.GetMem(); palette = screen->GetPalette (); for (i = 256; i > 0; i--, orgpal += 3) { @@ -721,7 +721,7 @@ void DIntermissionScreenScroller::Drawer () DIntermissionController *DIntermissionController::CurrentIntermission; -DIntermissionController::DIntermissionController(FIntermissionDescriptor *Desc, bool DeleteDesc, BYTE state) +DIntermissionController::DIntermissionController(FIntermissionDescriptor *Desc, bool DeleteDesc, uint8_t state) { mDesc = Desc; mDeleteDesc = DeleteDesc; @@ -883,7 +883,7 @@ void DIntermissionController::OnDestroy () // //========================================================================== -void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, BYTE state) +void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, uint8_t state) { if (DIntermissionController::CurrentIntermission != NULL) { @@ -907,7 +907,7 @@ void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, BYTE stat // //========================================================================== -void F_StartIntermission(FName seq, BYTE state) +void F_StartIntermission(FName seq, uint8_t state) { FIntermissionDescriptor **pdesc = IntermissionDescriptors.CheckKey(seq); if (pdesc != NULL) diff --git a/src/intermission/intermission.h b/src/intermission/intermission.h index f8923eb38..565e3a164 100644 --- a/src/intermission/intermission.h +++ b/src/intermission/intermission.h @@ -31,15 +31,15 @@ struct FIIntermissionPatch struct FCastSound { - BYTE mSequence; - BYTE mIndex; + uint8_t mSequence; + uint8_t mIndex; FString mSound; }; struct FICastSound { - BYTE mSequence; - BYTE mIndex; + uint8_t mSequence; + uint8_t mIndex; FSoundID mSound; }; @@ -289,7 +289,7 @@ class DIntermissionController : public DObject bool mDeleteDesc; bool mFirst; bool mAdvance, mSentAdvance; - BYTE mGameState; + uint8_t mGameState; int mIndex; bool NextPage(); @@ -297,7 +297,7 @@ class DIntermissionController : public DObject public: static DIntermissionController *CurrentIntermission; - DIntermissionController(FIntermissionDescriptor *mDesc = NULL, bool mDeleteDesc = false, BYTE state = FSTATE_ChangingLevel); + DIntermissionController(FIntermissionDescriptor *mDesc = NULL, bool mDeleteDesc = false, uint8_t state = FSTATE_ChangingLevel); bool Responder (event_t *ev); void Ticker (); void Drawer (); @@ -311,8 +311,8 @@ public: bool F_Responder (event_t* ev); void F_Ticker (); void F_Drawer (); -void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, BYTE state); -void F_StartIntermission(FName desc, BYTE state); +void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, uint8_t state); +void F_StartIntermission(FName desc, uint8_t state); void F_EndFinale (); void F_AdvanceIntermission(); diff --git a/src/intermission/intermission_parse.cpp b/src/intermission/intermission_parse.cpp index b15b78e71..d8f46d2c3 100644 --- a/src/intermission/intermission_parse.cpp +++ b/src/intermission/intermission_parse.cpp @@ -382,10 +382,10 @@ bool FIntermissionActionCast::ParseKey(FScanner &sc) FCastSound *cs = &mCastSounds[mCastSounds.Reserve(1)]; sc.MustGetToken('='); sc.MustGetToken(TK_StringConst); - cs->mSequence = (BYTE)sc.MatchString(seqs); + cs->mSequence = (uint8_t)sc.MatchString(seqs); sc.MustGetToken(','); sc.MustGetToken(TK_IntConst); - cs->mIndex = (BYTE)sc.Number; + cs->mIndex = (uint8_t)sc.Number; sc.MustGetToken(','); sc.MustGetToken(TK_StringConst); cs->mSound = sc.String; @@ -573,7 +573,7 @@ void FMapInfoParser::ParseIntermission() struct EndSequence { - SBYTE EndType; + int8_t EndType; bool MusicLooping; bool PlayTheEnd; FString PicName; diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 15df785bf..435a867a2 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -771,7 +771,7 @@ void M_Drawer (void) { player = camera->player; } - fade = PalEntry (BYTE(player->BlendA*255), BYTE(player->BlendR*255), BYTE(player->BlendG*255), BYTE(player->BlendB*255)); + fade = PalEntry (uint8_t(player->BlendA*255), uint8_t(player->BlendR*255), uint8_t(player->BlendG*255), uint8_t(player->BlendB*255)); } diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp index dfb08f13c..2c3abe52b 100644 --- a/src/menu/videomenu.cpp +++ b/src/menu/videomenu.cpp @@ -77,7 +77,7 @@ EXTERN_CVAR (Bool, vid_tft) // Defined below int testingmode; // Holds time to revert to old mode int OldWidth, OldHeight, OldBits; static FIntCVar DummyDepthCvar (NULL, 0, 0); -static BYTE BitTranslate[32]; +static uint8_t BitTranslate[32]; CUSTOM_CVAR (Int, menu_screenratios, -1, CVAR_ARCHIVE) { diff --git a/src/resourcefiles/file_7z.cpp b/src/resourcefiles/file_7z.cpp index f65951bfc..9cc52f6c9 100644 --- a/src/resourcefiles/file_7z.cpp +++ b/src/resourcefiles/file_7z.cpp @@ -262,7 +262,7 @@ bool F7ZFile::Open(bool quiet) TArray nameUTF16; TArray nameASCII; - for (DWORD i = 0; i < NumLumps; ++i) + for (uint32_t i = 0; i < NumLumps; ++i) { // skip Directories if (SzArEx_IsDir(archPtr, i)) diff --git a/src/resourcefiles/file_grp.cpp b/src/resourcefiles/file_grp.cpp index 464e790bd..663aeb16e 100644 --- a/src/resourcefiles/file_grp.cpp +++ b/src/resourcefiles/file_grp.cpp @@ -46,8 +46,8 @@ struct GrpInfo { - DWORD Magic[3]; - DWORD NumLumps; + uint32_t Magic[3]; + uint32_t NumLumps; }; struct GrpLump @@ -57,7 +57,7 @@ struct GrpLump struct { char Name[12]; - DWORD Size; + uint32_t Size; }; char NameWithZero[13]; }; @@ -110,7 +110,7 @@ bool FGrpFile::Open(bool quiet) int Position = sizeof(GrpInfo) + NumLumps * sizeof(GrpLump); - for(DWORD i = 0; i < NumLumps; i++) + for(uint32_t i = 0; i < NumLumps; i++) { Lumps[i].Owner = this; Lumps[i].Position = Position; diff --git a/src/resourcefiles/file_pak.cpp b/src/resourcefiles/file_pak.cpp index 16f7e8ea5..b76a937c8 100644 --- a/src/resourcefiles/file_pak.cpp +++ b/src/resourcefiles/file_pak.cpp @@ -106,7 +106,7 @@ bool FPakFile::Open(bool quiet) if (!quiet && !batchrun) Printf(", %d lumps\n", NumLumps); - for(DWORD i = 0; i < NumLumps; i++) + for(uint32_t i = 0; i < NumLumps; i++) { Lumps[i].LumpNameSetup(fileinfo[i].name); Lumps[i].Owner = this; diff --git a/src/resourcefiles/file_rff.cpp b/src/resourcefiles/file_rff.cpp index 25b5ccdab..ba73dfc8b 100644 --- a/src/resourcefiles/file_rff.cpp +++ b/src/resourcefiles/file_rff.cpp @@ -48,23 +48,23 @@ struct RFFInfo { // Should be "RFF\x18" - DWORD Magic; - DWORD Version; - DWORD DirOfs; - DWORD NumLumps; + uint32_t Magic; + uint32_t Version; + uint32_t DirOfs; + uint32_t NumLumps; }; struct RFFLump { - DWORD DontKnow1[4]; - DWORD FilePos; - DWORD Size; - DWORD DontKnow2; - DWORD Time; - BYTE Flags; + uint32_t DontKnow1[4]; + uint32_t FilePos; + uint32_t Size; + uint32_t DontKnow2; + uint32_t Time; + uint8_t Flags; char Extension[3]; char Name[8]; - DWORD IndexNum; // Used by .sfx, possibly others + uint32_t IndexNum; // Used by .sfx, possibly others }; //========================================================================== @@ -78,7 +78,7 @@ struct FRFFLump : public FUncompressedLump virtual FileReader *GetReader(); virtual int FillCache(); - DWORD IndexNum; + uint32_t IndexNum; int GetIndexNum() const { return IndexNum; } }; @@ -91,11 +91,11 @@ struct FRFFLump : public FUncompressedLump void BloodCrypt (void *data, int key, int len) { - int p = (BYTE)key, i; + int p = (uint8_t)key, i; for (i = 0; i < len; ++i) { - ((BYTE *)data)[i] ^= (unsigned char)(p+(i>>1)); + ((uint8_t *)data)[i] ^= (unsigned char)(p+(i>>1)); } } @@ -153,7 +153,7 @@ bool FRFFFile::Open(bool quiet) Lumps = new FRFFLump[NumLumps]; if (!quiet && !batchrun) Printf(", %d lumps\n", NumLumps); - for (DWORD i = 0; i < NumLumps; ++i) + for (uint32_t i = 0; i < NumLumps; ++i) { Lumps[i].Position = LittleLong(lumps[i].FilePos); Lumps[i].LumpSize = LittleLong(lumps[i].Size); @@ -230,7 +230,7 @@ int FRFFLump::FillCache() if (Flags & LUMPF_BLOODCRYPT) { int cryptlen = MIN (LumpSize, 256); - BYTE *data = (BYTE *)Cache; + uint8_t *data = (uint8_t *)Cache; for (int i = 0; i < cryptlen; ++i) { diff --git a/src/resourcefiles/file_wad.cpp b/src/resourcefiles/file_wad.cpp index 5965a5c8a..477bda8e1 100644 --- a/src/resourcefiles/file_wad.cpp +++ b/src/resourcefiles/file_wad.cpp @@ -49,7 +49,7 @@ private: FileReader &File; bool SawEOF; - BYTE InBuff[BUFF_SIZE]; + uint8_t InBuff[BUFF_SIZE]; enum StreamState { @@ -62,15 +62,15 @@ private: { StreamState State; - BYTE *In; + uint8_t *In; unsigned int AvailIn; unsigned int InternalOut; - BYTE CFlags, Bits; + uint8_t CFlags, Bits; - BYTE Window[WINDOW_SIZE+INTERNAL_BUFFER_SIZE]; - const BYTE *WindowData; - BYTE *InternalBuffer; + uint8_t Window[WINDOW_SIZE+INTERNAL_BUFFER_SIZE]; + const uint8_t *WindowData; + uint8_t *InternalBuffer; } Stream; void FillBuffer() @@ -109,8 +109,8 @@ private: return false; Stream.AvailIn -= 2; - WORD pos = BigShort(*(WORD*)Stream.In); - BYTE len = (pos & 0xF)+1; + uint16_t pos = BigShort(*(uint16_t*)Stream.In); + uint8_t len = (pos & 0xF)+1; pos >>= 4; Stream.In += 2; if(len == 1) @@ -120,7 +120,7 @@ private: return true; } - const BYTE* copyStart = Stream.InternalBuffer-pos-1; + const uint8_t* copyStart = Stream.InternalBuffer-pos-1; // Complete overlap: Single byte repeated if(pos == 0) @@ -182,7 +182,7 @@ public: long Read(void *buffer, long len) { - BYTE *Out = (BYTE*)buffer; + uint8_t *Out = (uint8_t*)buffer; long AvailOut = len; do @@ -222,7 +222,7 @@ public: while(AvailOut && Stream.State != STREAM_FINAL); assert(AvailOut == 0); - return (long)(Out - (BYTE*)buffer); + return (long)(Out - (uint8_t*)buffer); } }; @@ -329,7 +329,7 @@ FWadFile::~FWadFile() bool FWadFile::Open(bool quiet) { wadinfo_t header; - DWORD InfoTableOfs; + uint32_t InfoTableOfs; bool isBigEndian = false; // Little endian is assumed until proven otherwise const long wadSize = Reader->GetLength(); @@ -358,7 +358,7 @@ bool FWadFile::Open(bool quiet) Lumps = new FWadFileLump[NumLumps]; - for(DWORD i = 0; i < NumLumps; i++) + for(uint32_t i = 0; i < NumLumps; i++) { uppercopy (Lumps[i].Name, fileinfo[i].Name); Lumps[i].Name[8] = 0; @@ -563,7 +563,7 @@ void FWadFile::SkinHack () static int namespc = ns_firstskin; bool skinned = false; bool hasmap = false; - DWORD i; + uint32_t i; for (i = 0; i < NumLumps; i++) { @@ -580,7 +580,7 @@ void FWadFile::SkinHack () if (!skinned) { skinned = true; - DWORD j; + uint32_t j; for (j = 0; j < NumLumps; j++) { @@ -627,7 +627,7 @@ void FWadFile::SkinHack () void FWadFile::FindStrifeTeaserVoices () { - for (DWORD i = 0; i <= NumLumps; ++i) + for (uint32_t i = 0; i <= NumLumps; ++i) { if (Lumps[i].Name[0] == 'V' && Lumps[i].Name[1] == 'O' && diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp index a48a17ca2..1245cfabe 100644 --- a/src/resourcefiles/file_zip.cpp +++ b/src/resourcefiles/file_zip.cpp @@ -123,23 +123,23 @@ bool FCompressedBuffer::Decompress(char *destbuffer) // //----------------------------------------------------------------------- -static DWORD Zip_FindCentralDir(FileReader * fin) +static uint32_t Zip_FindCentralDir(FileReader * fin) { unsigned char buf[BUFREADCOMMENT + 4]; - DWORD FileSize; - DWORD uBackRead; - DWORD uMaxBack; // maximum size of global comment - DWORD uPosFound=0; + uint32_t FileSize; + uint32_t uBackRead; + uint32_t uMaxBack; // maximum size of global comment + uint32_t uPosFound=0; fin->Seek(0, SEEK_END); FileSize = fin->Tell(); - uMaxBack = MIN(0xffff, FileSize); + uMaxBack = MIN(0xffff, FileSize); uBackRead = 4; while (uBackRead < uMaxBack) { - DWORD uReadSize, uReadPos; + uint32_t uReadSize, uReadPos; int i; if (uBackRead + BUFREADCOMMENT > uMaxBack) uBackRead = uMaxBack; @@ -147,7 +147,7 @@ static DWORD Zip_FindCentralDir(FileReader * fin) uBackRead += BUFREADCOMMENT; uReadPos = FileSize - uBackRead; - uReadSize = MIN((BUFREADCOMMENT + 4), (FileSize - uReadPos)); + uReadSize = MIN((BUFREADCOMMENT + 4), (FileSize - uReadPos)); if (fin->Seek(uReadPos, SEEK_SET) != 0) break; @@ -182,7 +182,7 @@ FZipFile::FZipFile(const char * filename, FileReader *file) bool FZipFile::Open(bool quiet) { - DWORD centraldir = Zip_FindCentralDir(Reader); + uint32_t centraldir = Zip_FindCentralDir(Reader); FZipEndOfCentralDirectory info; int skipped = 0; @@ -223,7 +223,7 @@ bool FZipFile::Open(bool quiet) // Check if all files have the same prefix so that this can be stripped out. // This will only be done if there is either a MAPINFO, ZMAPINFO or GAMEINFO lump in the subdirectory, denoting a ZDoom mod. - if (NumLumps > 1) for (DWORD i = 0; i < NumLumps; i++) + if (NumLumps > 1) for (uint32_t i = 0; i < NumLumps; i++) { FZipCentralDirectoryInfo *zip_fh = (FZipCentralDirectoryInfo *)dirptr; @@ -292,7 +292,7 @@ bool FZipFile::Open(bool quiet) dirptr = (char*)directory; lump_p = Lumps; - for (DWORD i = 0; i < NumLumps; i++) + for (uint32_t i = 0; i < NumLumps; i++) { FZipCentralDirectoryInfo *zip_fh = (FZipCentralDirectoryInfo *)dirptr; @@ -348,7 +348,7 @@ bool FZipFile::Open(bool quiet) lump_p->Owner = this; // The start of the Reader will be determined the first time it is accessed. lump_p->Flags = LUMPF_ZIPFILE | LUMPFZIP_NEEDFILESTART; - lump_p->Method = BYTE(zip_fh->Method); + lump_p->Method = uint8_t(zip_fh->Method); lump_p->GPFlags = zip_fh->Flags; lump_p->CRC32 = zip_fh->CRC32; lump_p->CompressedSize = LittleLong(zip_fh->CompressedSize); diff --git a/src/resourcefiles/file_zip.h b/src/resourcefiles/file_zip.h index 427d9cbf3..1078a0714 100644 --- a/src/resourcefiles/file_zip.h +++ b/src/resourcefiles/file_zip.h @@ -16,8 +16,8 @@ enum struct FZipLump : public FResourceLump { - WORD GPFlags; - BYTE Method; + uint16_t GPFlags; + uint8_t Method; int CompressedSize; int Position; unsigned CRC32; diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp index c9f2f7446..7c9c957e3 100644 --- a/src/resourcefiles/resourcefile.cpp +++ b/src/resourcefiles/resourcefile.cpp @@ -204,7 +204,7 @@ FCompressedBuffer FResourceLump::GetRawData() { FCompressedBuffer cbuf = { (unsigned)LumpSize, (unsigned)LumpSize, METHOD_STORED, 0, 0, new char[LumpSize] }; memcpy(cbuf.mBuffer, CacheLump(), LumpSize); - cbuf.mCRC32 = crc32(0, (BYTE*)cbuf.mBuffer, LumpSize); + cbuf.mCRC32 = crc32(0, (uint8_t*)cbuf.mBuffer, LumpSize); ReleaseCache(); return cbuf; } @@ -365,7 +365,7 @@ void FResourceFile::PostProcessArchive(void *lumps, size_t lumpsize) // Filter out lumps using the same names as the Autoload.* sections // in the ini file use. We reduce the maximum lump concidered after // each one so that we don't risk refiltering already filtered lumps. - DWORD max = NumLumps; + uint32_t max = NumLumps; max -= FilterLumpsByGameType(gameinfo.gametype, lumps, lumpsize, max); long len; @@ -390,10 +390,10 @@ void FResourceFile::PostProcessArchive(void *lumps, size_t lumpsize) // //========================================================================== -int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, DWORD max) +int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, uint32_t max) { FString filter; - DWORD start, end; + uint32_t start, end; if (filtername.IsEmpty()) { @@ -402,11 +402,11 @@ int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, filter << "filter/" << filtername << '/'; if (FindPrefixRange(filter, lumps, lumpsize, max, start, end)) { - void *from = (BYTE *)lumps + start * lumpsize; + void *from = (uint8_t *)lumps + start * lumpsize; // Remove filter prefix from every name void *lump_p = from; - for (DWORD i = start; i < end; ++i, lump_p = (BYTE *)lump_p + lumpsize) + for (uint32_t i = start; i < end; ++i, lump_p = (uint8_t *)lump_p + lumpsize) { FResourceLump *lump = (FResourceLump *)lump_p; assert(lump->FullName.CompareNoCase(filter, (int)filter.Len()) == 0); @@ -415,17 +415,17 @@ int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, // Move filtered lumps to the end of the lump list. size_t count = (end - start) * lumpsize; - void *to = (BYTE *)lumps + NumLumps * lumpsize - count; + void *to = (uint8_t *)lumps + NumLumps * lumpsize - count; assert (to >= from); if (from != to) { // Copy filtered lumps to a temporary buffer. - BYTE *filteredlumps = new BYTE[count]; + uint8_t *filteredlumps = new uint8_t[count]; memcpy(filteredlumps, from, count); // Shift lumps left to make room for the filtered ones at the end. - memmove(from, (BYTE *)from + count, (NumLumps - end) * lumpsize); + memmove(from, (uint8_t *)from + count, (NumLumps - end) * lumpsize); // Copy temporary buffer to newly freed space. memcpy(to, filteredlumps, count); @@ -445,7 +445,7 @@ int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, // //========================================================================== -int FResourceFile::FilterLumpsByGameType(int type, void *lumps, size_t lumpsize, DWORD max) +int FResourceFile::FilterLumpsByGameType(int type, void *lumps, size_t lumpsize, uint32_t max) { static const struct { int match; const char *name; } blanket[] = { @@ -479,16 +479,16 @@ int FResourceFile::FilterLumpsByGameType(int type, void *lumps, size_t lumpsize, // //========================================================================== -void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max) +void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, uint32_t max) { - DWORD start, end; + uint32_t start, end; if (FindPrefixRange("filter/", lumps, lumpsize, max, start, end)) { // Since the resource lumps may contain non-POD data besides the // full name, we "delete" them by erasing their names so they // can't be found. - void *stop = (BYTE *)lumps + end * lumpsize; - for (void *p = (BYTE *)lumps + start * lumpsize; p < stop; p = (BYTE *)p + lumpsize) + void *stop = (uint8_t *)lumps + end * lumpsize; + for (void *p = (uint8_t *)lumps + start * lumpsize; p < stop; p = (uint8_t *)p + lumpsize) { FResourceLump *lump = (FResourceLump *)p; lump->FullName = 0; @@ -508,9 +508,9 @@ void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max) // //========================================================================== -bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize, DWORD maxlump, DWORD &start, DWORD &end) +bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize, uint32_t maxlump, uint32_t &start, uint32_t &end) { - DWORD min, max, mid, inside; + uint32_t min, max, mid, inside; FResourceLump *lump; int cmp; @@ -518,14 +518,14 @@ bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize // Pretend that our range starts at 1 instead of 0 so that we can avoid // unsigned overflow if the range starts at the first lump. - lumps = (BYTE *)lumps - lumpsize; + lumps = (uint8_t *)lumps - lumpsize; // Binary search to find any match at all. min = 1, max = maxlump; while (min <= max) { mid = min + (max - min) / 2; - lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + lump = (FResourceLump *)((uint8_t *)lumps + mid * lumpsize); cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); if (cmp == 0) break; @@ -545,7 +545,7 @@ bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize while (min <= max) { mid = min + (max - min) / 2; - lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + lump = (FResourceLump *)((uint8_t *)lumps + mid * lumpsize); cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); // Go left on matches and right on misses. if (cmp == 0) @@ -560,7 +560,7 @@ bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize while (min <= max) { mid = min + (max - min) / 2; - lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + lump = (FResourceLump *)((uint8_t *)lumps + mid * lumpsize); cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); // Go right on matches and left on misses. if (cmp == 0) diff --git a/src/resourcefiles/resourcefile.h b/src/resourcefiles/resourcefile.h index bedcad3bb..a36d6ad49 100644 --- a/src/resourcefiles/resourcefile.h +++ b/src/resourcefiles/resourcefile.h @@ -40,11 +40,11 @@ struct FResourceLump { char Name[9]; - DWORD dwName; // These are for accessing the first 4 or 8 chars of + uint32_t dwName; // These are for accessing the first 4 or 8 chars of QWORD qwName; // Name as a unit without breaking strict aliasing rules }; - BYTE Flags; - SBYTE RefCount; + uint8_t Flags; + int8_t RefCount; char * Cache; FResourceFile * Owner; FTexture * LinkedTexture; @@ -84,7 +84,7 @@ public: FileReader *Reader; const char *Filename; protected: - DWORD NumLumps; + uint32_t NumLumps; FResourceFile(const char *filename, FileReader *r); @@ -92,21 +92,21 @@ protected: void PostProcessArchive(void *lumps, size_t lumpsize); private: - DWORD FirstLump; + uint32_t FirstLump; - int FilterLumps(FString filtername, void *lumps, size_t lumpsize, DWORD max); - int FilterLumpsByGameType(int gametype, void *lumps, size_t lumpsize, DWORD max); - bool FindPrefixRange(FString filter, void *lumps, size_t lumpsize, DWORD max, DWORD &start, DWORD &end); - void JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max); + int FilterLumps(FString filtername, void *lumps, size_t lumpsize, uint32_t max); + int FilterLumpsByGameType(int gametype, void *lumps, size_t lumpsize, uint32_t max); + bool FindPrefixRange(FString filter, void *lumps, size_t lumpsize, uint32_t max, uint32_t &start, uint32_t &end); + void JunkLeftoverFilters(void *lumps, size_t lumpsize, uint32_t max); public: static FResourceFile *OpenResourceFile(const char *filename, FileReader *file, bool quiet = false, bool containeronly = false); static FResourceFile *OpenDirectory(const char *filename, bool quiet = false); virtual ~FResourceFile(); FileReader *GetReader() const { return Reader; } - DWORD LumpCount() const { return NumLumps; } - DWORD GetFirstLump() const { return FirstLump; } - void SetFirstLump(DWORD f) { FirstLump = f; } + uint32_t LumpCount() const { return NumLumps; } + uint32_t GetFirstLump() const { return FirstLump; } + void SetFirstLump(uint32_t f) { FirstLump = f; } virtual void FindStrifeTeaserVoices (); virtual bool Open(bool quiet) = 0; diff --git a/src/scripting/backend/codegen.cpp b/src/scripting/backend/codegen.cpp index c0a69eb6e..56bf71080 100644 --- a/src/scripting/backend/codegen.cpp +++ b/src/scripting/backend/codegen.cpp @@ -2466,7 +2466,7 @@ FxExpression *FxAssign::Resolve(FCompileContext &ctx) ExpEmit FxAssign::Emit(VMFunctionBuilder *build) { - static const BYTE loadops[] = { OP_LK, OP_LKF, OP_LKS, OP_LKP }; + static const uint8_t loadops[] = { OP_LK, OP_LKF, OP_LKS, OP_LKP }; assert(Base->ValueType->GetRegType() == Right->ValueType->GetRegType()); ExpEmit pointer = Base->Emit(build); diff --git a/src/scripting/backend/vmbuilder.cpp b/src/scripting/backend/vmbuilder.cpp index 31290cc48..308410922 100644 --- a/src/scripting/backend/vmbuilder.cpp +++ b/src/scripting/backend/vmbuilder.cpp @@ -40,7 +40,7 @@ struct VMRemap { - BYTE altOp, kReg, kType; + uint8_t altOp, kReg, kType; }; @@ -563,7 +563,7 @@ size_t VMFunctionBuilder::GetAddress() size_t VMFunctionBuilder::Emit(int opcode, int opa, int opb, int opc) { - static BYTE opcodes[] = { OP_LK, OP_LKF, OP_LKS, OP_LKP }; + static uint8_t opcodes[] = { OP_LK, OP_LKF, OP_LKS, OP_LKP }; assert(opcode >= 0 && opcode < NUM_OPS); assert(opa >= 0); diff --git a/src/scripting/decorate/olddecorations.cpp b/src/scripting/decorate/olddecorations.cpp index e926fdbbd..9ecf8c2a0 100644 --- a/src/scripting/decorate/olddecorations.cpp +++ b/src/scripting/decorate/olddecorations.cpp @@ -331,7 +331,7 @@ static void ParseInsideDecoration (Baggage &bag, AActor *defaults, { sc.ScriptError ("DoomEdNum must be in the range [-1,32767]"); } - bag.Info->DoomEdNum = (SWORD)sc.Number; + bag.Info->DoomEdNum = (int16_t)sc.Number; } else if (sc.Compare ("SpawnNum")) { @@ -340,7 +340,7 @@ static void ParseInsideDecoration (Baggage &bag, AActor *defaults, { sc.ScriptError ("SpawnNum must be in the range [0,255]"); } - bag.Info->SpawnID = (BYTE)sc.Number; + bag.Info->SpawnID = (uint8_t)sc.Number; } else if (sc.Compare ("Sprite") || ( (def == DEF_BreakableDecoration || def == DEF_Projectile) && diff --git a/src/scripting/decorate/thingdef_states.cpp b/src/scripting/decorate/thingdef_states.cpp index 7bfd5c685..4355941be 100644 --- a/src/scripting/decorate/thingdef_states.cpp +++ b/src/scripting/decorate/thingdef_states.cpp @@ -610,7 +610,7 @@ void ParseFunctionParameters(FScanner &sc, PClassActor *cls, TArray ¶ms = afd->Variants[0].Proto->ArgumentTypes; - const TArray ¶mflags = afd->Variants[0].ArgFlags; + const TArray ¶mflags = afd->Variants[0].ArgFlags; int numparams = (int)params.Size(); int pnum = 0; bool zeroparm; diff --git a/src/scripting/symbols.cpp b/src/scripting/symbols.cpp index b6adb33e7..41ca4a1a8 100644 --- a/src/scripting/symbols.cpp +++ b/src/scripting/symbols.cpp @@ -79,7 +79,7 @@ PSymbolConstString::PSymbolConstString(FName name, const FString &str) // //========================================================================== -unsigned PFunction::AddVariant(PPrototype *proto, TArray &argflags, TArray &argnames, VMFunction *impl, int flags, int useflags) +unsigned PFunction::AddVariant(PPrototype *proto, TArray &argflags, TArray &argnames, VMFunction *impl, int flags, int useflags) { Variant variant; diff --git a/src/scripting/thingdef.cpp b/src/scripting/thingdef.cpp index e63f9aa71..82e358638 100644 --- a/src/scripting/thingdef.cpp +++ b/src/scripting/thingdef.cpp @@ -101,7 +101,7 @@ FScriptPosition & GetStateSource(FState *state) // //========================================================================== -void SetImplicitArgs(TArray *args, TArray *argflags, TArray *argnames, PStruct *cls, DWORD funcflags, int useflags) +void SetImplicitArgs(TArray *args, TArray *argflags, TArray *argnames, PStruct *cls, uint32_t funcflags, int useflags) { // Must be called before adding any other arguments. assert(args == nullptr || args->Size() == 0); diff --git a/src/scripting/thingdef.h b/src/scripting/thingdef.h index 3f42e8c7a..7517283cf 100644 --- a/src/scripting/thingdef.h +++ b/src/scripting/thingdef.h @@ -52,7 +52,7 @@ struct FStateDefine FName Label; TArray Children; FState *State; - BYTE DefineFlags; + uint8_t DefineFlags; }; class FStateDefinitions @@ -83,7 +83,7 @@ public: lastlabel = -1; } - void SetStateLabel(const char *statename, FState *state, BYTE defflags = SDF_STATE); + void SetStateLabel(const char *statename, FState *state, uint8_t defflags = SDF_STATE); void AddStateLabel(const char *statename); int GetStateLabelIndex (FName statename); void InstallStates(PClassActor *info, AActor *defaults); @@ -159,7 +159,7 @@ void ParseFunctionParameters(FScanner &sc, PClassActor *cls, TArray *args, TArray *argflags, TArray *argnames, PStruct *cls, DWORD funcflags, int useflags); +void SetImplicitArgs(TArray *args, TArray *argflags, TArray *argnames, PStruct *cls, uint32_t funcflags, int useflags); PFunction *CreateAnonymousFunction(PClass *containingclass, PType *returntype, int flags); PFunction *FindClassMemberFunction(PStruct *cls, PStruct *funccls, FName name, FScriptPosition &sc, bool *error); void CreateDamageFunction(PNamespace *ns, const VersionInfo &ver, PClassActor *info, AActor *defaults, FxExpression *id, bool fromDecorate, int lumpnum); diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp index 7d70cfd0f..ad6e7e8d8 100644 --- a/src/scripting/thingdef_properties.cpp +++ b/src/scripting/thingdef_properties.cpp @@ -123,7 +123,7 @@ void ModActorFlag(AActor *actor, FFlagDef *fd, bool set) if (fd->fieldsize == 4) #endif { - DWORD *flagvar = (DWORD *)((char *)actor + fd->structoffset); + uint32_t *flagvar = (uint32_t *)((char *)actor + fd->structoffset); if (set) { *flagvar |= fd->flagbit; @@ -136,7 +136,7 @@ void ModActorFlag(AActor *actor, FFlagDef *fd, bool set) #ifdef __BIG_ENDIAN__ else if (fd->fieldsize == 2) { - WORD *flagvar = (WORD *)((char *)actor + fd->structoffset); + uint16_t *flagvar = (uint16_t *)((char *)actor + fd->structoffset); if (set) { *flagvar |= fd->flagbit; @@ -149,7 +149,7 @@ void ModActorFlag(AActor *actor, FFlagDef *fd, bool set) else { assert(fd->fieldsize == 1); - BYTE *flagvar = (BYTE *)((char *)actor + fd->structoffset); + uint8_t *flagvar = (uint8_t *)((char *)actor + fd->structoffset); if (set) { *flagvar |= fd->flagbit; @@ -245,17 +245,17 @@ INTBOOL CheckActorFlag(const AActor *owner, FFlagDef *fd) if (fd->fieldsize == 4) #endif { - return fd->flagbit & *(DWORD *)(((char*)owner) + fd->structoffset); + return fd->flagbit & *(uint32_t *)(((char*)owner) + fd->structoffset); } #ifdef __BIG_ENDIAN__ else if (fd->fieldsize == 2) { - return fd->flagbit & *(WORD *)(((char*)owner) + fd->structoffset); + return fd->flagbit & *(uint16_t *)(((char*)owner) + fd->structoffset); } else { assert(fd->fieldsize == 1); - return fd->flagbit & *(BYTE *)(((char*)owner) + fd->structoffset); + return fd->flagbit & *(uint8_t *)(((char*)owner) + fd->structoffset); } #endif } @@ -520,7 +520,7 @@ DEFINE_INFO_PROPERTY(spawnid, I, Actor) { I_Error ("SpawnID must be in the range [0,65535]"); } - else info->SpawnID=(WORD)id; + else info->SpawnID=(uint16_t)id; } //========================================================================== @@ -533,7 +533,7 @@ DEFINE_INFO_PROPERTY(conversationid, IiI, Actor) PROP_INT_PARM(id2, 2); if (convid <= 0 || convid > 65535) return; // 0 is not usable because the dialogue scripts use it as 'no object'. - else info->ConversationID=(WORD)convid; + else info->ConversationID=(uint16_t)convid; } //========================================================================== @@ -2507,7 +2507,7 @@ DEFINE_CLASS_PROPERTY_PREFIX(player, damagescreencolor, Cfs, PlayerPawn) { PROP_DOUBLE_PARM(a, 2); - color.a = BYTE(255 * clamp(a, 0.f, 1.f)); + color.a = uint8_t(255 * clamp(a, 0.f, 1.f)); defaults->DamageFade = color; } else @@ -2515,7 +2515,7 @@ DEFINE_CLASS_PROPERTY_PREFIX(player, damagescreencolor, Cfs, PlayerPawn) PROP_DOUBLE_PARM(a, 2); PROP_STRING_PARM(type, 3); - color.a = BYTE(255 * clamp(a, 0.f, 1.f)); + color.a = uint8_t(255 * clamp(a, 0.f, 1.f)); PainFlashes.Push(std::make_tuple(info, type, color)); } } diff --git a/src/scripting/vm/vm.h b/src/scripting/vm/vm.h index 02f048a1c..3a4ffb02c 100644 --- a/src/scripting/vm/vm.h +++ b/src/scripting/vm/vm.h @@ -704,7 +704,7 @@ class VMFunction public: bool Unsafe = false; int VarFlags = 0; // [ZZ] this replaces 5+ bool fields - BYTE ImplicitArgs = 0; // either 0 for static, 1 for method or 3 for action + uint8_t ImplicitArgs = 0; // either 0 for static, 1 for method or 3 for action unsigned VirtualIndex = ~0u; FName Name; TArray DefaultArgs; diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index fc8794aac..6be8a0038 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -2292,7 +2292,7 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool } else { - (*afd->VMPointer)->ImplicitArgs = BYTE(implicitargs); + (*afd->VMPointer)->ImplicitArgs = uint8_t(implicitargs); } } SetImplicitArgs(&args, &argflags, &argnames, c->Type(), varflags, useflags); diff --git a/src/scripting/zscript/zcc_parser.cpp b/src/scripting/zscript/zcc_parser.cpp index 6df435f6c..c4f86eff1 100644 --- a/src/scripting/zscript/zcc_parser.cpp +++ b/src/scripting/zscript/zcc_parser.cpp @@ -64,14 +64,14 @@ void AddInclude(ZCC_ExprConstant *node) struct TokenMapEntry { - SWORD TokenType; - WORD TokenName; - TokenMapEntry(SWORD a, WORD b) + int16_t TokenType; + uint16_t TokenName; + TokenMapEntry(int16_t a, uint16_t b) : TokenType(a), TokenName(b) { } }; -static TMap TokenMap; -static SWORD BackTokenMap[YYERRORSYMBOL]; // YYERRORSYMBOL immediately follows the terminals described by the grammar +static TMap TokenMap; +static int16_t BackTokenMap[YYERRORSYMBOL]; // YYERRORSYMBOL immediately follows the terminals described by the grammar #define TOKENDEF2(sc, zcc, name) { TokenMapEntry tme(zcc, name); TokenMap.Insert(sc, tme); } BackTokenMap[zcc] = sc #define TOKENDEF(sc, zcc) TOKENDEF2(sc, zcc, NAME_None) diff --git a/src/sfmt/SFMT.cpp b/src/sfmt/SFMT.cpp index b739e4c72..aaece8575 100644 --- a/src/sfmt/SFMT.cpp +++ b/src/sfmt/SFMT.cpp @@ -29,7 +29,7 @@ #endif /** a parity check vector which certificate the period of 2^{MEXP} */ -static const DWORD parity[4] = { PARITY1, PARITY2, PARITY3, PARITY4 }; +static const uint32_t parity[4] = { PARITY1, PARITY2, PARITY3, PARITY4 }; /*---------------- STATIC FUNCTIONS @@ -37,8 +37,8 @@ STATIC FUNCTIONS inline static int idxof(int i); inline static void rshift128(w128_t *out, w128_t const *in, int shift); inline static void lshift128(w128_t *out, w128_t const *in, int shift); -inline static DWORD func1(DWORD x); -inline static DWORD func2(DWORD x); +inline static uint32_t func1(uint32_t x); +inline static uint32_t func2(uint32_t x); #if defined(BIG_ENDIAN64) && !defined(ONLY64) inline static void swap(w128_t *array, int size); #endif @@ -89,10 +89,10 @@ inline static void rshift128(w128_t *out, w128_t const *in, int shift) { oh = th >> (shift * 8); ol = tl >> (shift * 8); ol |= th << (64 - shift * 8); - out->u[0] = (DWORD)(ol >> 32); - out->u[1] = (DWORD)ol; - out->u[2] = (DWORD)(oh >> 32); - out->u[3] = (DWORD)oh; + out->u[0] = (uint32_t)(ol >> 32); + out->u[1] = (uint32_t)ol; + out->u[2] = (uint32_t)(oh >> 32); + out->u[3] = (uint32_t)oh; } #else inline static void rshift128(w128_t *out, w128_t const *in, int shift) { @@ -104,10 +104,10 @@ inline static void rshift128(w128_t *out, w128_t const *in, int shift) { oh = th >> (shift * 8); ol = tl >> (shift * 8); ol |= th << (64 - shift * 8); - out->u[1] = (DWORD)(ol >> 32); - out->u[0] = (DWORD)ol; - out->u[3] = (DWORD)(oh >> 32); - out->u[2] = (DWORD)oh; + out->u[1] = (uint32_t)(ol >> 32); + out->u[0] = (uint32_t)ol; + out->u[3] = (uint32_t)(oh >> 32); + out->u[2] = (uint32_t)oh; } #endif /** @@ -128,10 +128,10 @@ inline static void lshift128(w128_t *out, w128_t const *in, int shift) { oh = th << (shift * 8); ol = tl << (shift * 8); oh |= tl >> (64 - shift * 8); - out->u[0] = (DWORD)(ol >> 32); - out->u[1] = (DWORD)ol; - out->u[2] = (DWORD)(oh >> 32); - out->u[3] = (DWORD)oh; + out->u[0] = (uint32_t)(ol >> 32); + out->u[1] = (uint32_t)ol; + out->u[2] = (uint32_t)(oh >> 32); + out->u[3] = (uint32_t)oh; } #else inline static void lshift128(w128_t *out, w128_t const *in, int shift) { @@ -143,10 +143,10 @@ inline static void lshift128(w128_t *out, w128_t const *in, int shift) { oh = th << (shift * 8); ol = tl << (shift * 8); oh |= tl >> (64 - shift * 8); - out->u[1] = (DWORD)(ol >> 32); - out->u[0] = (DWORD)ol; - out->u[3] = (DWORD)(oh >> 32); - out->u[2] = (DWORD)oh; + out->u[1] = (uint32_t)(ol >> 32); + out->u[0] = (uint32_t)ol; + out->u[3] = (uint32_t)(oh >> 32); + out->u[2] = (uint32_t)oh; } #endif @@ -264,7 +264,7 @@ void FRandom::GenRandArray(w128_t *array, int size) #if defined(BIG_ENDIAN64) && !defined(ONLY64) && !defined(HAVE_ALTIVEC) inline static void swap(w128_t *array, int size) { int i; - DWORD x, y; + uint32_t x, y; for (i = 0; i < size; i++) { x = array[i].u[0]; @@ -282,9 +282,9 @@ inline static void swap(w128_t *array, int size) { * @param x 32-bit integer * @return 32-bit integer */ -static DWORD func1(DWORD x) +static uint32_t func1(uint32_t x) { - return (x ^ (x >> 27)) * (DWORD)1664525UL; + return (x ^ (x >> 27)) * (uint32_t)1664525UL; } /** @@ -293,9 +293,9 @@ static DWORD func1(DWORD x) * @param x 32-bit integer * @return 32-bit integer */ -static DWORD func2(DWORD x) +static uint32_t func2(uint32_t x) { - return (x ^ (x >> 27)) * (DWORD)1566083941UL; + return (x ^ (x >> 27)) * (uint32_t)1566083941UL; } /** @@ -305,7 +305,7 @@ void FRandom::PeriodCertification() { int inner = 0; int i, j; - DWORD work; + uint32_t work; for (i = 0; i < 4; i++) inner ^= sfmt.u[idxof(i)] & parity[i]; @@ -360,7 +360,7 @@ int FRandom::GetMinArraySize64() */ unsigned int FRandom::GenRand32() { - DWORD r; + uint32_t r; assert(initialized); if (idx >= SFMT::N32) @@ -382,7 +382,7 @@ unsigned int FRandom::GenRand32() QWORD FRandom::GenRand64() { #if defined(BIG_ENDIAN64) && !defined(ONLY64) - DWORD r1, r2; + uint32_t r1, r2; #else QWORD r; #endif @@ -433,7 +433,7 @@ QWORD FRandom::GenRand64() * memory. Mac OSX doesn't have these functions, but \b malloc of OSX * returns the pointer to the aligned memory block. */ -void FRandom::FillArray32(DWORD *array, int size) +void FRandom::FillArray32(uint32_t *array, int size) { assert(initialized); assert(idx == SFMT::N32); @@ -491,7 +491,7 @@ void FRandom::FillArray64(QWORD *array, int size) * * @param seed a 32-bit integer used as the seed. */ -void FRandom::InitGenRand(DWORD seed) +void FRandom::InitGenRand(uint32_t seed) { int i; @@ -515,10 +515,10 @@ void FRandom::InitGenRand(DWORD seed) * @param init_key the array of 32-bit integers, used as a seed. * @param key_length the length of init_key. */ -void FRandom::InitByArray(DWORD *init_key, int key_length) +void FRandom::InitByArray(uint32_t *init_key, int key_length) { int i, j, count; - DWORD r; + uint32_t r; int lag; int mid; int size = SFMT::N * 4; diff --git a/src/sfmt/SFMT.h b/src/sfmt/SFMT.h index 8fde00741..72c990186 100644 --- a/src/sfmt/SFMT.h +++ b/src/sfmt/SFMT.h @@ -67,7 +67,7 @@ /** 128-bit data structure */ union w128_t { vector unsigned int s; - DWORD u[4]; + uint32_t u[4]; QWORD u64[2]; }; @@ -77,7 +77,7 @@ union w128_t { /** 128-bit data structure */ union w128_t { __m128i si; - DWORD u[4]; + uint32_t u[4]; QWORD u64[2]; }; @@ -85,7 +85,7 @@ union w128_t { /** 128-bit data structure */ union w128_t { - DWORD u[4]; + uint32_t u[4]; QWORD u64[2]; }; diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp index 06c496d9a..7b2aab98b 100644 --- a/src/textures/animations.cpp +++ b/src/textures/animations.cpp @@ -95,7 +95,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim) // //========================================================================== -FAnimDef *FTextureManager::AddSimpleAnim (FTextureID picnum, int animcount, DWORD speedmin, DWORD speedrange) +FAnimDef *FTextureManager::AddSimpleAnim (FTextureID picnum, int animcount, uint32_t speedmin, uint32_t speedrange) { if (AreTexturesCompatible(picnum, picnum + (animcount - 1))) { @@ -187,11 +187,11 @@ void FTextureManager::InitAnimated (void) { FMemLump animatedlump = Wads.ReadLump (lumpnum); int animatedlen = Wads.LumpLength(lumpnum); - const BYTE *animdefs = (const BYTE *)animatedlump.GetMem(); - const BYTE *anim_p; + const uint8_t *animdefs = (const uint8_t *)animatedlump.GetMem(); + const uint8_t *anim_p; FTextureID pic1, pic2; int animtype; - DWORD animspeed; + uint32_t animspeed; // Init animation animtype = FAnimDef::ANIM_Forward; @@ -349,7 +349,7 @@ void FTextureManager::ParseAnim (FScanner &sc, int usetype) int defined = 0; bool optional = false, missing = false; FAnimDef *ani = NULL; - BYTE type = FAnimDef::ANIM_Forward; + uint8_t type = FAnimDef::ANIM_Forward; sc.MustGetString (); if (sc.Compare ("optional")) @@ -467,7 +467,7 @@ FAnimDef *FTextureManager::ParseRangeAnim (FScanner &sc, FTextureID picnum, int { int type; FTextureID framenum; - DWORD min, max; + uint32_t min, max; type = FAnimDef::ANIM_Forward; framenum = ParseFramenum (sc, picnum, usetype, missing); @@ -507,7 +507,7 @@ FAnimDef *FTextureManager::ParseRangeAnim (FScanner &sc, FTextureID picnum, int void FTextureManager::ParsePicAnim (FScanner &sc, FTextureID picnum, int usetype, bool missing, TArray &frames) { FTextureID framenum; - DWORD min = 1, max = 1; + uint32_t min = 1, max = 1; framenum = ParseFramenum (sc, picnum, usetype, missing); ParseTime (sc, min, max); @@ -561,20 +561,20 @@ FTextureID FTextureManager::ParseFramenum (FScanner &sc, FTextureID basepicnum, // //========================================================================== -void FTextureManager::ParseTime (FScanner &sc, DWORD &min, DWORD &max) +void FTextureManager::ParseTime (FScanner &sc, uint32_t &min, uint32_t &max) { sc.MustGetString (); if (sc.Compare ("tics")) { sc.MustGetFloat (); - min = max = DWORD(sc.Float * 1000 / 35); + min = max = uint32_t(sc.Float * 1000 / 35); } else if (sc.Compare ("rand")) { sc.MustGetFloat (); - min = DWORD(sc.Float * 1000 / 35); + min = uint32_t(sc.Float * 1000 / 35); sc.MustGetFloat (); - max = DWORD(sc.Float * 1000 / 35); + max = uint32_t(sc.Float * 1000 / 35); } else { @@ -876,7 +876,7 @@ FDoorAnimation *FTextureManager::FindAnimatedDoor (FTextureID picnum) // //========================================================================== -void FAnimDef::SetSwitchTime (DWORD mstime) +void FAnimDef::SetSwitchTime (uint32_t mstime) { int speedframe = bDiscrete ? CurFrame : 0; @@ -917,7 +917,7 @@ void FTextureManager::SetTranslation (FTextureID fromtexnum, FTextureID totexnum // //========================================================================== -void FTextureManager::UpdateAnimations (DWORD mstime) +void FTextureManager::UpdateAnimations (uint32_t mstime) { for (unsigned int j = 0; j < mAnimations.Size(); ++j) { @@ -955,7 +955,7 @@ void FTextureManager::UpdateAnimations (DWORD mstime) // select a random frame other than the current one if (anim->NumFrames > 1) { - WORD rndFrame = (WORD)pr_animatepictures(anim->NumFrames - 1); + uint16_t rndFrame = (uint16_t)pr_animatepictures(anim->NumFrames - 1); if (rndFrame >= anim->CurFrame) rndFrame++; anim->CurFrame = rndFrame; } diff --git a/src/textures/automaptexture.cpp b/src/textures/automaptexture.cpp index 67d68b9fe..31163ed6a 100644 --- a/src/textures/automaptexture.cpp +++ b/src/textures/automaptexture.cpp @@ -51,15 +51,15 @@ class FAutomapTexture : public FTexture public: ~FAutomapTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); void MakeTexture (); FAutomapTexture (int lumpnum); private: - BYTE *Pixels; + uint8_t *Pixels; Span DummySpan[2]; }; @@ -89,7 +89,7 @@ FAutomapTexture::FAutomapTexture (int lumpnum) : FTexture(NULL, lumpnum), Pixels(NULL) { Width = 320; - Height = WORD(Wads.LumpLength(lumpnum) / 320); + Height = uint16_t(Wads.LumpLength(lumpnum) / 320); CalcBitSize (); DummySpan[0].TopOffset = 0; @@ -134,9 +134,9 @@ void FAutomapTexture::MakeTexture () { int x, y; FMemLump data = Wads.ReadLump (SourceLump); - const BYTE *indata = (const BYTE *)data.GetMem(); + const uint8_t *indata = (const uint8_t *)data.GetMem(); - Pixels = new BYTE[Width * Height]; + Pixels = new uint8_t[Width * Height]; for (x = 0; x < Width; ++x) { @@ -153,7 +153,7 @@ void FAutomapTexture::MakeTexture () // //========================================================================== -const BYTE *FAutomapTexture::GetPixels () +const uint8_t *FAutomapTexture::GetPixels () { if (Pixels == NULL) { @@ -168,7 +168,7 @@ const BYTE *FAutomapTexture::GetPixels () // //========================================================================== -const BYTE *FAutomapTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FAutomapTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { diff --git a/src/textures/backdroptexture.cpp b/src/textures/backdroptexture.cpp index 0f18fe6d6..aec95cc2e 100644 --- a/src/textures/backdroptexture.cpp +++ b/src/textures/backdroptexture.cpp @@ -273,26 +273,26 @@ void FBackdropTexture::Render() int x, y; - const DWORD a1add = DEGREES(0.5); - const DWORD a2add = DEGREES(359); - const DWORD a3add = DEGREES(5 / 7.f); - const DWORD a4add = DEGREES(358.66666); + const uint32_t a1add = DEGREES(0.5); + const uint32_t a2add = DEGREES(359); + const uint32_t a3add = DEGREES(5 / 7.f); + const uint32_t a4add = DEGREES(358.66666); - const DWORD t1add = DEGREES(358); - const DWORD t2add = DEGREES(357.16666); - const DWORD t3add = DEGREES(2.285); - const DWORD t4add = DEGREES(359.33333); - const DWORD x1add = 5 * 524288; - const DWORD x2add = 0u - 13 * 524288; - const DWORD z1add = 3 * 524288; - const DWORD z2add = 4 * 524288; + const uint32_t t1add = DEGREES(358); + const uint32_t t2add = DEGREES(357.16666); + const uint32_t t3add = DEGREES(2.285); + const uint32_t t4add = DEGREES(359.33333); + const uint32_t x1add = 5 * 524288; + const uint32_t x2add = 0u - 13 * 524288; + const uint32_t z1add = 3 * 524288; + const uint32_t z2add = 4 * 524288; - DWORD a1, a2, a3, a4; + uint32_t a1, a2, a3, a4; int32_t c1, c2, c3, c4; - DWORD tx, ty, tc, ts; - DWORD ux, uy, uc, us; - DWORD ltx, lty, lux, luy; + uint32_t tx, ty, tc, ts; + uint32_t ux, uy, uc, us; + uint32_t ltx, lty, lux, luy; from = Pixels; diff --git a/src/textures/bitmap.cpp b/src/textures/bitmap.cpp index 7873e35cb..18fb5446b 100644 --- a/src/textures/bitmap.cpp +++ b/src/textures/bitmap.cpp @@ -46,12 +46,12 @@ // //=========================================================================== template -void iCopyColors(BYTE *pout, const BYTE *pin, int count, int step, FCopyInfo *inf, - BYTE tr, BYTE tg, BYTE tb) +void iCopyColors(uint8_t *pout, const uint8_t *pin, int count, int step, FCopyInfo *inf, + uint8_t tr, uint8_t tg, uint8_t tb) { int i; int fac; - BYTE r,g,b; + uint8_t r,g,b; int gray; int a; @@ -184,7 +184,7 @@ void iCopyColors(BYTE *pout, const BYTE *pin, int count, int step, FCopyInfo *in } } -typedef void (*CopyFunc)(BYTE *pout, const BYTE *pin, int count, int step, FCopyInfo *inf, BYTE r, BYTE g, BYTE b); +typedef void (*CopyFunc)(uint8_t *pout, const uint8_t *pin, int count, int step, FCopyInfo *inf, uint8_t r, uint8_t g, uint8_t b); #define COPY_FUNCS(op) \ { \ @@ -219,7 +219,7 @@ static const CopyFunc copyfuncs[][10]={ // //=========================================================================== bool ClipCopyPixelRect(const FClipRect *cr, int &originx, int &originy, - const BYTE *&patch, int &srcwidth, int &srcheight, + const uint8_t *&patch, int &srcwidth, int &srcheight, int &pstep_x, int &pstep_y, int rotate) { int pixxoffset; @@ -371,13 +371,13 @@ bool FClipRect::Intersect(int ix, int iy, int iw, int ih) // True Color texture copy function // //=========================================================================== -void FBitmap::CopyPixelDataRGB(int originx, int originy, const BYTE *patch, int srcwidth, +void FBitmap::CopyPixelDataRGB(int originx, int originy, const uint8_t *patch, int srcwidth, int srcheight, int step_x, int step_y, int rotate, int ct, FCopyInfo *inf, int r, int g, int b) { if (ClipCopyPixelRect(&ClipRect, originx, originy, patch, srcwidth, srcheight, step_x, step_y, rotate)) { - BYTE *buffer = data + 4 * originx + Pitch * originy; + uint8_t *buffer = data + 4 * originx + Pitch * originy; int op = inf==NULL? OP_COPY : inf->op; for (int y=0;y -void iCopyPaletted(BYTE *buffer, const BYTE * patch, int srcwidth, int srcheight, int Pitch, +void iCopyPaletted(uint8_t *buffer, const uint8_t * patch, int srcwidth, int srcheight, int Pitch, int step_x, int step_y, int rotate, PalEntry * palette, FCopyInfo *inf) { int x,y,pos; @@ -412,7 +412,7 @@ void iCopyPaletted(BYTE *buffer, const BYTE * patch, int srcwidth, int srcheight } } -typedef void (*CopyPalettedFunc)(BYTE *buffer, const BYTE * patch, int srcwidth, int srcheight, int Pitch, +typedef void (*CopyPalettedFunc)(uint8_t *buffer, const uint8_t * patch, int srcwidth, int srcheight, int Pitch, int step_x, int step_y, int rotate, PalEntry * palette, FCopyInfo *inf); @@ -435,18 +435,18 @@ static const CopyPalettedFunc copypalettedfuncs[]= // Paletted to True Color texture copy function // //=========================================================================== -void FBitmap::CopyPixelData(int originx, int originy, const BYTE * patch, int srcwidth, int srcheight, +void FBitmap::CopyPixelData(int originx, int originy, const uint8_t * patch, int srcwidth, int srcheight, int step_x, int step_y, int rotate, PalEntry * palette, FCopyInfo *inf) { if (ClipCopyPixelRect(&ClipRect, originx, originy, patch, srcwidth, srcheight, step_x, step_y, rotate)) { - BYTE *buffer = data + 4*originx + Pitch*originy; + uint8_t *buffer = data + 4*originx + Pitch*originy; PalEntry penew[256]; memset(penew, 0, sizeof(penew)); if (inf && inf->blend) { - iCopyColors((BYTE*)penew, (const BYTE*)palette, 256, 4, inf, 0, 0, 0); + iCopyColors((uint8_t*)penew, (const uint8_t*)palette, 256, 4, inf, 0, 0, 0); palette = penew; } @@ -462,7 +462,7 @@ void FBitmap::CopyPixelData(int originx, int originy, const BYTE * patch, int sr //=========================================================================== void FBitmap::Zero() { - BYTE *buffer = data; + uint8_t *buffer = data; for (int y = ClipRect.y; y < ClipRect.height; ++y) { memset(buffer + ClipRect.x, 0, ClipRect.width*4); diff --git a/src/textures/bitmap.h b/src/textures/bitmap.h index a27d1ff98..9a6dcd853 100644 --- a/src/textures/bitmap.h +++ b/src/textures/bitmap.h @@ -59,7 +59,7 @@ enum class FBitmap { protected: - BYTE *data; + uint8_t *data; int Width; int Height; int Pitch; @@ -77,7 +77,7 @@ public: ClipRect.x = ClipRect.y = ClipRect.width = ClipRect.height = 0; } - FBitmap(BYTE *buffer, int pitch, int width, int height) + FBitmap(uint8_t *buffer, int pitch, int width, int height) { data = buffer; @@ -107,7 +107,7 @@ public: Pitch = w*4; Width = w; Height = h; - data = new BYTE[4*w*h]; + data = new uint8_t[4*w*h]; memset(data, 0, 4*w*h); FreeBuffer = true; ClipRect.x = ClipRect.y = 0; @@ -131,12 +131,12 @@ public: return Pitch; } - const BYTE *GetPixels() const + const uint8_t *GetPixels() const { return data; } - BYTE *GetPixels() + uint8_t *GetPixels() { return data; } @@ -164,17 +164,17 @@ public: void Zero(); - virtual void CopyPixelDataRGB(int originx, int originy, const BYTE *patch, int srcwidth, + virtual void CopyPixelDataRGB(int originx, int originy, const uint8_t *patch, int srcwidth, int srcheight, int step_x, int step_y, int rotate, int ct, FCopyInfo *inf = NULL, /* for PNG tRNS */ int r=0, int g=0, int b=0); - virtual void CopyPixelData(int originx, int originy, const BYTE * patch, int srcwidth, int srcheight, + virtual void CopyPixelData(int originx, int originy, const uint8_t * patch, int srcwidth, int srcheight, int step_x, int step_y, int rotate, PalEntry * palette, FCopyInfo *inf = NULL); }; bool ClipCopyPixelRect(const FClipRect *cr, int &originx, int &originy, - const BYTE *&patch, int &srcwidth, int &srcheight, + const uint8_t *&patch, int &srcwidth, int &srcheight, int &step_x, int &step_y, int rotate); //=========================================================================== @@ -188,7 +188,7 @@ struct cRGB static __forceinline unsigned char R(const unsigned char * p) { return p[0]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[2]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return 255; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return 255; } static __forceinline int Gray(const unsigned char * p) { return (p[0]*77 + p[1]*143 + p[2]*36)>>8; } }; @@ -197,7 +197,7 @@ struct cRGBT static __forceinline unsigned char R(const unsigned char * p) { return p[0]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[2]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE r, BYTE g, BYTE b) { return (p[0] != r || p[1] != g || p[2] != b) ? 255 : 0; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t r, uint8_t g, uint8_t b) { return (p[0] != r || p[1] != g || p[2] != b) ? 255 : 0; } static __forceinline int Gray(const unsigned char * p) { return (p[0]*77 + p[1]*143 + p[2]*36)>>8; } }; @@ -213,7 +213,7 @@ struct cRGBA static __forceinline unsigned char R(const unsigned char * p) { return p[0]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[2]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return p[3]; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return p[3]; } static __forceinline int Gray(const unsigned char * p) { return (p[0]*77 + p[1]*143 + p[2]*36)>>8; } }; @@ -222,7 +222,7 @@ struct cIA static __forceinline unsigned char R(const unsigned char * p) { return p[0]; } static __forceinline unsigned char G(const unsigned char * p) { return p[0]; } static __forceinline unsigned char B(const unsigned char * p) { return p[0]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return p[1]; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return p[1]; } static __forceinline int Gray(const unsigned char * p) { return p[0]; } }; @@ -231,7 +231,7 @@ struct cCMYK static __forceinline unsigned char R(const unsigned char * p) { return p[3] - (((256-p[0])*p[3]) >> 8); } static __forceinline unsigned char G(const unsigned char * p) { return p[3] - (((256-p[1])*p[3]) >> 8); } static __forceinline unsigned char B(const unsigned char * p) { return p[3] - (((256-p[2])*p[3]) >> 8); } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return 255; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return 255; } static __forceinline int Gray(const unsigned char * p) { return (R(p)*77 + G(p)*143 + B(p)*36)>>8; } }; @@ -240,7 +240,7 @@ struct cBGR static __forceinline unsigned char R(const unsigned char * p) { return p[2]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[0]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return 255; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return 255; } static __forceinline int Gray(const unsigned char * p) { return (p[2]*77 + p[1]*143 + p[0]*36)>>8; } }; @@ -256,7 +256,7 @@ struct cBGRA static __forceinline unsigned char R(const unsigned char * p) { return p[2]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[0]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return p[3]; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return p[3]; } static __forceinline int Gray(const unsigned char * p) { return (p[2]*77 + p[1]*143 + p[0]*36)>>8; } }; @@ -272,7 +272,7 @@ struct cARGB static __forceinline unsigned char R(const unsigned char * p) { return p[1]; } static __forceinline unsigned char G(const unsigned char * p) { return p[2]; } static __forceinline unsigned char B(const unsigned char * p) { return p[3]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return p[0]; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return p[0]; } static __forceinline int Gray(const unsigned char * p) { return (p[1]*77 + p[2]*143 + p[3]*36)>>8; } }; @@ -281,16 +281,16 @@ struct cI16 static __forceinline unsigned char R(const unsigned char * p) { return p[1]; } static __forceinline unsigned char G(const unsigned char * p) { return p[1]; } static __forceinline unsigned char B(const unsigned char * p) { return p[1]; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return 255; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return 255; } static __forceinline int Gray(const unsigned char * p) { return p[1]; } }; struct cRGB555 { - static __forceinline unsigned char R(const unsigned char * p) { return (((*(WORD*)p)&0x1f)<<3); } - static __forceinline unsigned char G(const unsigned char * p) { return (((*(WORD*)p)&0x3e0)>>2); } - static __forceinline unsigned char B(const unsigned char * p) { return (((*(WORD*)p)&0x7c00)>>7); } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return 255; } + static __forceinline unsigned char R(const unsigned char * p) { return (((*(uint16_t*)p)&0x1f)<<3); } + static __forceinline unsigned char G(const unsigned char * p) { return (((*(uint16_t*)p)&0x3e0)>>2); } + static __forceinline unsigned char B(const unsigned char * p) { return (((*(uint16_t*)p)&0x7c00)>>7); } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return 255; } static __forceinline int Gray(const unsigned char * p) { return (R(p)*77 + G(p)*143 + B(p)*36)>>8; } }; @@ -299,7 +299,7 @@ struct cPalEntry static __forceinline unsigned char R(const unsigned char * p) { return ((PalEntry*)p)->r; } static __forceinline unsigned char G(const unsigned char * p) { return ((PalEntry*)p)->g; } static __forceinline unsigned char B(const unsigned char * p) { return ((PalEntry*)p)->b; } - static __forceinline unsigned char A(const unsigned char * p, BYTE x, BYTE y, BYTE z) { return ((PalEntry*)p)->a; } + static __forceinline unsigned char A(const unsigned char * p, uint8_t x, uint8_t y, uint8_t z) { return ((PalEntry*)p)->a; } static __forceinline int Gray(const unsigned char * p) { return (R(p)*77 + G(p)*143 + B(p)*36)>>8; } }; @@ -353,71 +353,71 @@ struct FCopyInfo struct bOverwrite { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = s; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = s; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return true; } }; struct bCopy { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = s; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = s; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bCopyNewAlpha { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = s; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = (s*i->alpha) >> BLENDBITS; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = s; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = (s*i->alpha) >> BLENDBITS; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bCopyAlpha { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = (s*a + d*(255-a))/255; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = (s*a + d*(255-a))/255; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bOverlay { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = (s*a + d*(255-a))/255; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = MAX(s,d); } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = (s*a + d*(255-a))/255; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = MAX(s,d); } static __forceinline bool ProcessAlpha0() { return false; } }; struct bBlend { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = (d*i->invalpha + s*i->alpha) >> BLENDBITS; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = (d*i->invalpha + s*i->alpha) >> BLENDBITS; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bAdd { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = MIN((d*BLENDUNIT + s*i->alpha) >> BLENDBITS, 255); } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = MIN((d*BLENDUNIT + s*i->alpha) >> BLENDBITS, 255); } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bSubtract { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = MAX((d*BLENDUNIT - s*i->alpha) >> BLENDBITS, 0); } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = MAX((d*BLENDUNIT - s*i->alpha) >> BLENDBITS, 0); } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bReverseSubtract { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = MAX((-d*BLENDUNIT + s*i->alpha) >> BLENDBITS, 0); } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = MAX((-d*BLENDUNIT + s*i->alpha) >> BLENDBITS, 0); } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; struct bModulate { - static __forceinline void OpC(BYTE &d, BYTE s, BYTE a, FCopyInfo *i) { d = (s*d)/255; } - static __forceinline void OpA(BYTE &d, BYTE s, FCopyInfo *i) { d = s; } + static __forceinline void OpC(uint8_t &d, uint8_t s, uint8_t a, FCopyInfo *i) { d = (s*d)/255; } + static __forceinline void OpA(uint8_t &d, uint8_t s, FCopyInfo *i) { d = s; } static __forceinline bool ProcessAlpha0() { return false; } }; diff --git a/src/textures/ddstexture.cpp b/src/textures/ddstexture.cpp index c55cf11bb..f4fa03e2f 100644 --- a/src/textures/ddstexture.cpp +++ b/src/textures/ddstexture.cpp @@ -104,42 +104,42 @@ struct DDPIXELFORMAT { - DWORD Size; // Must be 32 - DWORD Flags; - DWORD FourCC; - DWORD RGBBitCount; - DWORD RBitMask, GBitMask, BBitMask; - DWORD RGBAlphaBitMask; + uint32_t Size; // Must be 32 + uint32_t Flags; + uint32_t FourCC; + uint32_t RGBBitCount; + uint32_t RBitMask, GBitMask, BBitMask; + uint32_t RGBAlphaBitMask; }; struct DDCAPS2 { - DWORD Caps1, Caps2; - DWORD Reserved[2]; + uint32_t Caps1, Caps2; + uint32_t Reserved[2]; }; struct DDSURFACEDESC2 { - DWORD Size; // Must be 124. DevIL claims some writers set it to 'DDS ' instead. - DWORD Flags; - DWORD Height; - DWORD Width; + uint32_t Size; // Must be 124. DevIL claims some writers set it to 'DDS ' instead. + uint32_t Flags; + uint32_t Height; + uint32_t Width; union { int32_t Pitch; - DWORD LinearSize; + uint32_t LinearSize; }; - DWORD Depth; - DWORD MipMapCount; - DWORD Reserved1[11]; + uint32_t Depth; + uint32_t MipMapCount; + uint32_t Reserved1[11]; DDPIXELFORMAT PixelFormat; DDCAPS2 Caps; - DWORD Reserved2; + uint32_t Reserved2; }; struct DDSFileHeader { - DWORD Magic; + uint32_t Magic; DDSURFACEDESC2 Desc; }; @@ -156,32 +156,32 @@ public: FDDSTexture (FileReader &lump, int lumpnum, void *surfdesc); ~FDDSTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); FTextureFormat GetFormat (); protected: - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; - DWORD Format; + uint32_t Format; - DWORD RMask, GMask, BMask, AMask; - BYTE RShiftL, GShiftL, BShiftL, AShiftL; - BYTE RShiftR, GShiftR, BShiftR, AShiftR; + uint32_t RMask, GMask, BMask, AMask; + uint8_t RShiftL, GShiftL, BShiftL, AShiftL; + uint8_t RShiftR, GShiftR, BShiftR, AShiftR; int32_t Pitch; - DWORD LinearSize; + uint32_t LinearSize; - static void CalcBitShift (DWORD mask, BYTE *lshift, BYTE *rshift); + static void CalcBitShift (uint32_t mask, uint8_t *lshift, uint8_t *rshift); void MakeTexture (); - void ReadRGB (FWadLump &lump, BYTE *tcbuf = NULL); - void DecompressDXT1 (FWadLump &lump, BYTE *tcbuf = NULL); - void DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbuf = NULL); - void DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbuf = NULL); + void ReadRGB (FWadLump &lump, uint8_t *tcbuf = NULL); + void DecompressDXT1 (FWadLump &lump, uint8_t *tcbuf = NULL); + void DecompressDXT3 (FWadLump &lump, bool premultiplied, uint8_t *tcbuf = NULL); + void DecompressDXT5 (FWadLump &lump, bool premultiplied, uint8_t *tcbuf = NULL); int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL); bool UseBasePalette(); @@ -224,7 +224,7 @@ FTexture *DDSTexture_TryCreate (FileReader &data, int lumpnum) union { DDSURFACEDESC2 surfdesc; - DWORD byteswapping[sizeof(DDSURFACEDESC2) / 4]; + uint32_t byteswapping[sizeof(DDSURFACEDESC2) / 4]; }; if (!CheckDDS(data)) return NULL; @@ -233,7 +233,7 @@ FTexture *DDSTexture_TryCreate (FileReader &data, int lumpnum) data.Read (&surfdesc, sizeof(surfdesc)); #ifdef __BIG_ENDIAN__ - // Every single element of the header is a DWORD + // Every single element of the header is a uint32_t for (unsigned int i = 0; i < sizeof(DDSURFACEDESC2) / 4; ++i) { byteswapping[i] = LittleLong(byteswapping[i]); @@ -293,8 +293,8 @@ FDDSTexture::FDDSTexture (FileReader &lump, int lumpnum, void *vsurfdesc) TopOffset = 0; bMasked = false; - Width = WORD(surf->Width); - Height = WORD(surf->Height); + Width = uint16_t(surf->Width); + Height = uint16_t(surf->Height); CalcBitSize (); if (surf->PixelFormat.Flags & DDPF_FOURCC) @@ -345,9 +345,9 @@ FDDSTexture::FDDSTexture (FileReader &lump, int lumpnum, void *vsurfdesc) // //========================================================================== -void FDDSTexture::CalcBitShift (DWORD mask, BYTE *lshiftp, BYTE *rshiftp) +void FDDSTexture::CalcBitShift (uint32_t mask, uint8_t *lshiftp, uint8_t *rshiftp) { - BYTE shift; + uint8_t shift; if (mask == 0) { @@ -433,7 +433,7 @@ FTextureFormat FDDSTexture::GetFormat() // //========================================================================== -const BYTE *FDDSTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FDDSTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -467,7 +467,7 @@ const BYTE *FDDSTexture::GetColumn (unsigned int column, const Span **spans_out) // //========================================================================== -const BYTE *FDDSTexture::GetPixels () +const uint8_t *FDDSTexture::GetPixels () { if (Pixels == NULL) { @@ -486,7 +486,7 @@ void FDDSTexture::MakeTexture () { FWadLump lump = Wads.OpenLumpNum (SourceLump); - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; lump.Seek (sizeof(DDSURFACEDESC2) + 4, SEEK_SET); @@ -514,27 +514,27 @@ void FDDSTexture::MakeTexture () // //========================================================================== -void FDDSTexture::ReadRGB (FWadLump &lump, BYTE *tcbuf) +void FDDSTexture::ReadRGB (FWadLump &lump, uint8_t *tcbuf) { - DWORD x, y; - DWORD amask = AMask == 0 ? 0 : 0x80000000 >> AShiftL; - BYTE *linebuff = new BYTE[Pitch]; + uint32_t x, y; + uint32_t amask = AMask == 0 ? 0 : 0x80000000 >> AShiftL; + uint8_t *linebuff = new uint8_t[Pitch]; for (y = Height; y > 0; --y) { - BYTE *buffp = linebuff; - BYTE *pixelp = tcbuf? tcbuf + 4*y*Height : Pixels + y; + uint8_t *buffp = linebuff; + uint8_t *pixelp = tcbuf? tcbuf + 4*y*Height : Pixels + y; lump.Read (linebuff, Pitch); for (x = Width; x > 0; --x) { - DWORD c; + uint32_t c; if (Format == 4) { - c = LittleLong(*(DWORD *)buffp); buffp += 4; + c = LittleLong(*(uint32_t *)buffp); buffp += 4; } else if (Format == 2) { - c = LittleShort(*(WORD *)buffp); buffp += 2; + c = LittleShort(*(uint16_t *)buffp); buffp += 2; } else if (Format == 3) { @@ -548,9 +548,9 @@ void FDDSTexture::ReadRGB (FWadLump &lump, BYTE *tcbuf) { if (amask == 0 || (c & amask)) { - DWORD r = (c & RMask) << RShiftL; r |= r >> RShiftR; - DWORD g = (c & GMask) << GShiftL; g |= g >> GShiftR; - DWORD b = (c & BMask) << BShiftL; b |= b >> BShiftR; + uint32_t r = (c & RMask) << RShiftL; r |= r >> RShiftR; + uint32_t g = (c & GMask) << GShiftL; g |= g >> GShiftR; + uint32_t b = (c & BMask) << BShiftL; b |= b >> BShiftR; *pixelp = RGB256k.RGB[r >> 26][g >> 26][b >> 26]; } else @@ -562,14 +562,14 @@ void FDDSTexture::ReadRGB (FWadLump &lump, BYTE *tcbuf) } else { - DWORD r = (c & RMask) << RShiftL; r |= r >> RShiftR; - DWORD g = (c & GMask) << GShiftL; g |= g >> GShiftR; - DWORD b = (c & BMask) << BShiftL; b |= b >> BShiftR; - DWORD a = (c & AMask) << AShiftL; a |= a >> AShiftR; - pixelp[0] = (BYTE)(r>>24); - pixelp[1] = (BYTE)(g>>24); - pixelp[2] = (BYTE)(b>>24); - pixelp[3] = (BYTE)(a>>24); + uint32_t r = (c & RMask) << RShiftL; r |= r >> RShiftR; + uint32_t g = (c & GMask) << GShiftL; g |= g >> GShiftR; + uint32_t b = (c & BMask) << BShiftL; b |= b >> BShiftR; + uint32_t a = (c & AMask) << AShiftL; a |= a >> AShiftR; + pixelp[0] = (uint8_t)(r>>24); + pixelp[1] = (uint8_t)(g>>24); + pixelp[2] = (uint8_t)(b>>24); + pixelp[3] = (uint8_t)(a>>24); pixelp+=4; } } @@ -583,13 +583,13 @@ void FDDSTexture::ReadRGB (FWadLump &lump, BYTE *tcbuf) // //========================================================================== -void FDDSTexture::DecompressDXT1 (FWadLump &lump, BYTE *tcbuf) +void FDDSTexture::DecompressDXT1 (FWadLump &lump, uint8_t *tcbuf) { const long blocklinelen = ((Width + 3) >> 2) << 3; - BYTE *blockbuff = new BYTE[blocklinelen]; - BYTE *block; + uint8_t *blockbuff = new uint8_t[blocklinelen]; + uint8_t *block; PalEntry color[4]; - BYTE palcol[4]; + uint8_t palcol[4]; int ox, oy, x, y, i; color[0].a = 255; @@ -602,7 +602,7 @@ void FDDSTexture::DecompressDXT1 (FWadLump &lump, BYTE *tcbuf) block = blockbuff; for (ox = 0; ox < Width; ox += 4) { - WORD color16[2] = { LittleShort(((WORD *)block)[0]), LittleShort(((WORD *)block)[1]) }; + uint16_t color16[2] = { LittleShort(((uint16_t *)block)[0]), LittleShort(((uint16_t *)block)[1]) }; // Convert color from R5G6B5 to R8G8B8. for (i = 1; i >= 0; --i) @@ -646,7 +646,7 @@ void FDDSTexture::DecompressDXT1 (FWadLump &lump, BYTE *tcbuf) { break; } - BYTE yslice = block[4 + y]; + uint8_t yslice = block[4 + y]; for (x = 0; x < 4; ++x) { if (ox + x >= Width) @@ -660,7 +660,7 @@ void FDDSTexture::DecompressDXT1 (FWadLump &lump, BYTE *tcbuf) } else { - BYTE * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; + uint8_t * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; tcp[0] = color[ci].r; tcp[1] = color[ci].g; tcp[2] = color[ci].b; @@ -681,13 +681,13 @@ void FDDSTexture::DecompressDXT1 (FWadLump &lump, BYTE *tcbuf) // //========================================================================== -void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbuf) +void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, uint8_t *tcbuf) { const long blocklinelen = ((Width + 3) >> 2) << 4; - BYTE *blockbuff = new BYTE[blocklinelen]; - BYTE *block; + uint8_t *blockbuff = new uint8_t[blocklinelen]; + uint8_t *block; PalEntry color[4]; - BYTE palcol[4]; + uint8_t palcol[4]; int ox, oy, x, y, i; for (oy = 0; oy < Height; oy += 4) @@ -696,7 +696,7 @@ void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbu block = blockbuff; for (ox = 0; ox < Width; ox += 4) { - WORD color16[2] = { LittleShort(((WORD *)block)[4]), LittleShort(((WORD *)block)[5]) }; + uint16_t color16[2] = { LittleShort(((uint16_t *)block)[4]), LittleShort(((uint16_t *)block)[5]) }; // Convert color from R5G6B5 to R8G8B8. for (i = 1; i >= 0; --i) @@ -726,8 +726,8 @@ void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbu { break; } - BYTE yslice = block[12 + y]; - WORD yalphaslice = LittleShort(((WORD *)block)[y]); + uint8_t yslice = block[12 + y]; + uint16_t yalphaslice = LittleShort(((uint16_t *)block)[y]); for (x = 0; x < 4; ++x) { if (ox + x >= Width) @@ -741,7 +741,7 @@ void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbu } else { - BYTE * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; + uint8_t * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; int c = (yslice >> (x + x)) & 3; tcp[0] = color[c].r; tcp[1] = color[c].g; @@ -763,14 +763,14 @@ void FDDSTexture::DecompressDXT3 (FWadLump &lump, bool premultiplied, BYTE *tcbu // //========================================================================== -void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbuf) +void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, uint8_t *tcbuf) { const long blocklinelen = ((Width + 3) >> 2) << 4; - BYTE *blockbuff = new BYTE[blocklinelen]; - BYTE *block; + uint8_t *blockbuff = new uint8_t[blocklinelen]; + uint8_t *block; PalEntry color[4]; - BYTE palcol[4]; - DWORD yalphaslice = 0; + uint8_t palcol[4]; + uint32_t yalphaslice = 0; int ox, oy, x, y, i; for (oy = 0; oy < Height; oy += 4) @@ -779,8 +779,8 @@ void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbu block = blockbuff; for (ox = 0; ox < Width; ox += 4) { - WORD color16[2] = { LittleShort(((WORD *)block)[4]), LittleShort(((WORD *)block)[5]) }; - BYTE alpha[8]; + uint16_t color16[2] = { LittleShort(((uint16_t *)block)[4]), LittleShort(((uint16_t *)block)[5]) }; + uint8_t alpha[8]; // Calculate the eight alpha values. alpha[0] = block[0]; @@ -840,7 +840,7 @@ void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbu { yalphaslice >>= 12; } - BYTE yslice = block[12 + y]; + uint8_t yslice = block[12 + y]; for (x = 0; x < 4; ++x) { if (ox + x >= Width) @@ -854,7 +854,7 @@ void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbu } else { - BYTE * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; + uint8_t * tcp = &tcbuf[(ox + x)*4 + (oy + y) * Width*4]; int c = (yslice >> (x + x)) & 3; tcp[0] = color[c].r; tcp[1] = color[c].g; @@ -879,7 +879,7 @@ int FDDSTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo { FWadLump lump = Wads.OpenLumpNum (SourceLump); - BYTE *TexBuffer = new BYTE[4*Width*Height]; + uint8_t *TexBuffer = new uint8_t[4*Width*Height]; lump.Seek (sizeof(DDSURFACEDESC2) + 4, SEEK_SET); diff --git a/src/textures/emptytexture.cpp b/src/textures/emptytexture.cpp index 55093a3cf..701380993 100644 --- a/src/textures/emptytexture.cpp +++ b/src/textures/emptytexture.cpp @@ -50,12 +50,12 @@ class FEmptyTexture : public FTexture public: FEmptyTexture (int lumpnum); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload() {} protected: - BYTE Pixels[1]; + uint8_t Pixels[1]; Span DummySpans[1]; }; @@ -103,7 +103,7 @@ FEmptyTexture::FEmptyTexture (int lumpnum) // //========================================================================== -const BYTE *FEmptyTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FEmptyTexture::GetColumn (unsigned int column, const Span **spans_out) { if (spans_out != NULL) { @@ -118,7 +118,7 @@ const BYTE *FEmptyTexture::GetColumn (unsigned int column, const Span **spans_ou // //========================================================================== -const BYTE *FEmptyTexture::GetPixels () +const uint8_t *FEmptyTexture::GetPixels () { return Pixels; } diff --git a/src/textures/flattexture.cpp b/src/textures/flattexture.cpp index 840d53aaf..2526db973 100644 --- a/src/textures/flattexture.cpp +++ b/src/textures/flattexture.cpp @@ -51,12 +51,12 @@ public: FFlatTexture (int lumpnum); ~FFlatTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); protected: - BYTE *Pixels; + uint8_t *Pixels; Span DummySpans[2]; @@ -146,7 +146,7 @@ void FFlatTexture::Unload () // //========================================================================== -const BYTE *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -176,7 +176,7 @@ const BYTE *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out // //========================================================================== -const BYTE *FFlatTexture::GetPixels () +const uint8_t *FFlatTexture::GetPixels () { if (Pixels == NULL) { @@ -194,7 +194,7 @@ const BYTE *FFlatTexture::GetPixels () void FFlatTexture::MakeTexture () { FWadLump lump = Wads.OpenLumpNum (SourceLump); - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; long numread = lump.Read (Pixels, Width*Height); if (numread < Width*Height) { diff --git a/src/textures/imgztexture.cpp b/src/textures/imgztexture.cpp index 1c262d707..e1b573d02 100644 --- a/src/textures/imgztexture.cpp +++ b/src/textures/imgztexture.cpp @@ -51,26 +51,26 @@ class FIMGZTexture : public FTexture { struct ImageHeader { - BYTE Magic[4]; - WORD Width; - WORD Height; - SWORD LeftOffset; - SWORD TopOffset; - BYTE Compression; - BYTE Reserved[11]; + uint8_t Magic[4]; + uint16_t Width; + uint16_t Height; + int16_t LeftOffset; + int16_t TopOffset; + uint8_t Compression; + uint8_t Reserved[11]; }; public: - FIMGZTexture (int lumpnum, WORD w, WORD h, SWORD l, SWORD t); + FIMGZTexture (int lumpnum, uint16_t w, uint16_t h, int16_t l, int16_t t); ~FIMGZTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); protected: - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; void MakeTexture (); @@ -85,9 +85,9 @@ protected: FTexture *IMGZTexture_TryCreate(FileReader & file, int lumpnum) { - DWORD magic = 0; - WORD w, h; - SWORD l, t; + uint32_t magic = 0; + uint16_t w, h; + int16_t l, t; file.Seek(0, SEEK_SET); if (file.Read(&magic, 4) != 4) return NULL; @@ -102,7 +102,7 @@ FTexture *IMGZTexture_TryCreate(FileReader & file, int lumpnum) // //========================================================================== -FIMGZTexture::FIMGZTexture (int lumpnum, WORD w, WORD h, SWORD l, SWORD t) +FIMGZTexture::FIMGZTexture (int lumpnum, uint16_t w, uint16_t h, int16_t l, int16_t t) : FTexture(NULL, lumpnum), Pixels(0), Spans(0) { Wads.GetLumpName (Name, lumpnum); @@ -150,7 +150,7 @@ void FIMGZTexture::Unload () // //========================================================================== -const BYTE *FIMGZTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FIMGZTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -184,7 +184,7 @@ const BYTE *FIMGZTexture::GetColumn (unsigned int column, const Span **spans_out // //========================================================================== -const BYTE *FIMGZTexture::GetPixels () +const uint8_t *FIMGZTexture::GetPixels () { if (Pixels == NULL) { @@ -203,7 +203,7 @@ void FIMGZTexture::MakeTexture () { FMemLump lump = Wads.ReadLump (SourceLump); const ImageHeader *imgz = (const ImageHeader *)lump.GetMem(); - const BYTE *data = (const BYTE *)&imgz[1]; + const uint8_t *data = (const uint8_t *)&imgz[1]; if (Width != 0xFFFF) { @@ -213,12 +213,12 @@ void FIMGZTexture::MakeTexture () TopOffset = LittleShort(imgz->TopOffset); } - BYTE *dest_p; + uint8_t *dest_p; int dest_adv = Height; int dest_rew = Width * Height - 1; CalcBitSize (); - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; dest_p = Pixels; // Convert the source image from row-major to column-major format @@ -239,7 +239,7 @@ void FIMGZTexture::MakeTexture () { // IMGZ compression is the same RLE used by IFF ILBM files int runlen = 0, setlen = 0; - BYTE setval = 0; // Shut up, GCC + uint8_t setval = 0; // Shut up, GCC for (int y = Height; y != 0; --y) { @@ -247,7 +247,7 @@ void FIMGZTexture::MakeTexture () { if (runlen != 0) { - BYTE color = *data; + uint8_t color = *data; *dest_p = color; dest_p += dest_adv; data++; @@ -263,7 +263,7 @@ void FIMGZTexture::MakeTexture () } else { - SBYTE code = *data++; + int8_t code = *data++; if (code >= 0) { runlen = code + 1; diff --git a/src/textures/jpegtexture.cpp b/src/textures/jpegtexture.cpp index c138edbfa..404d5c7be 100644 --- a/src/textures/jpegtexture.cpp +++ b/src/textures/jpegtexture.cpp @@ -185,8 +185,8 @@ public: FJPEGTexture (int lumpnum, int width, int height); ~FJPEGTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); FTextureFormat GetFormat (); int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL); @@ -194,7 +194,7 @@ public: protected: - BYTE *Pixels; + uint8_t *Pixels; Span DummySpans[2]; void MakeTexture (); @@ -212,9 +212,9 @@ FTexture *JPEGTexture_TryCreate(FileReader & data, int lumpnum) { union { - DWORD dw; - WORD w[2]; - BYTE b[4]; + uint32_t dw; + uint16_t w[2]; + uint8_t b[4]; } first4bytes; data.Seek(0, SEEK_SET); @@ -319,7 +319,7 @@ FTextureFormat FJPEGTexture::GetFormat() // //========================================================================== -const BYTE *FJPEGTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FJPEGTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -349,7 +349,7 @@ const BYTE *FJPEGTexture::GetColumn (unsigned int column, const Span **spans_out // //========================================================================== -const BYTE *FJPEGTexture::GetPixels () +const uint8_t *FJPEGTexture::GetPixels () { if (Pixels == NULL) { @@ -372,7 +372,7 @@ void FJPEGTexture::MakeTexture () jpeg_decompress_struct cinfo; jpeg_error_mgr jerr; - Pixels = new BYTE[Width * Height]; + Pixels = new uint8_t[Width * Height]; memset (Pixels, 0xBA, Width * Height); cinfo.err = jpeg_std_error(&jerr); @@ -394,13 +394,13 @@ void FJPEGTexture::MakeTexture () jpeg_start_decompress(&cinfo); int y = 0; - buff = new BYTE[cinfo.output_width * cinfo.output_components]; + buff = new uint8_t[cinfo.output_width * cinfo.output_components]; while (cinfo.output_scanline < cinfo.output_height) { int num_scanlines = jpeg_read_scanlines(&cinfo, &buff, 1); - BYTE *in = buff; - BYTE *out = Pixels + y; + uint8_t *in = buff; + uint8_t *out = Pixels + y; switch (cinfo.out_color_space) { case JCS_RGB: @@ -496,12 +496,12 @@ int FJPEGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FC jpeg_start_decompress(&cinfo); int yc = 0; - buff = new BYTE[cinfo.output_height * cinfo.output_width * cinfo.output_components]; + buff = new uint8_t[cinfo.output_height * cinfo.output_width * cinfo.output_components]; while (cinfo.output_scanline < cinfo.output_height) { - BYTE * ptr = buff + cinfo.output_width * cinfo.output_components * yc; + uint8_t * ptr = buff + cinfo.output_width * cinfo.output_components * yc; jpeg_read_scanlines(&cinfo, &ptr, 1); yc++; } diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp index b6050aae6..04dd6ffed 100644 --- a/src/textures/multipatchtexture.cpp +++ b/src/textures/multipatchtexture.cpp @@ -58,7 +58,7 @@ // all and only while initing the textures is beyond me. #ifdef ALPHA -#define SAFESHORT(s) ((short)(((BYTE *)&(s))[0] + ((BYTE *)&(s))[1] * 256)) +#define SAFESHORT(s) ((short)(((uint8_t *)&(s))[0] + ((uint8_t *)&(s))[1] * 256)) #else #define SAFESHORT(s) LittleShort(s) #endif @@ -78,11 +78,11 @@ // struct mappatch_t { - SWORD originx; - SWORD originy; - SWORD patch; - SWORD stepdir; - SWORD colormap; + int16_t originx; + int16_t originy; + int16_t patch; + int16_t stepdir; + int16_t colormap; }; // @@ -91,14 +91,14 @@ struct mappatch_t // struct maptexture_t { - BYTE name[8]; - WORD Flags; // [RH] Was unused - BYTE ScaleX; // [RH] Scaling (8 is normal) - BYTE ScaleY; // [RH] Same as above - SWORD width; - SWORD height; - BYTE columndirectory[4]; // OBSOLETE - SWORD patchcount; + uint8_t name[8]; + uint16_t Flags; // [RH] Was unused + uint8_t ScaleX; // [RH] Scaling (8 is normal) + uint8_t ScaleY; // [RH] Same as above + int16_t width; + int16_t height; + uint8_t columndirectory[4]; // OBSOLETE + int16_t patchcount; mappatch_t patches[1]; }; @@ -108,9 +108,9 @@ struct maptexture_t struct strifemappatch_t { - SWORD originx; - SWORD originy; - SWORD patch; + int16_t originx; + int16_t originy; + int16_t patch; }; // @@ -119,13 +119,13 @@ struct strifemappatch_t // struct strifemaptexture_t { - BYTE name[8]; - WORD Flags; // [RH] Was unused - BYTE ScaleX; // [RH] Scaling (8 is normal) - BYTE ScaleY; // [RH] Same as above - SWORD width; - SWORD height; - SWORD patchcount; + uint8_t name[8]; + uint16_t Flags; // [RH] Was unused + uint8_t ScaleX; // [RH] Scaling (8 is normal) + uint8_t ScaleY; // [RH] Same as above + int16_t width; + int16_t height; + int16_t patchcount; strifemappatch_t patches[1]; }; @@ -155,8 +155,8 @@ public: FMultiPatchTexture (FScanner &sc, int usetype); ~FMultiPatchTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); FTextureFormat GetFormat(); bool UseBasePalette() ; void Unload (); @@ -169,15 +169,15 @@ public: void ResolvePatches(); protected: - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; int DefinitionLump; struct TexPart { - SWORD OriginX, OriginY; - BYTE Rotate; - BYTE op; + int16_t OriginX, OriginY; + uint8_t Rotate; + uint8_t op; FRemapTable *Translation; PalEntry Blend; FTexture *Texture; @@ -367,7 +367,7 @@ void FMultiPatchTexture::Unload () // //========================================================================== -const BYTE *FMultiPatchTexture::GetPixels () +const uint8_t *FMultiPatchTexture::GetPixels () { if (bRedirect) { @@ -386,7 +386,7 @@ const BYTE *FMultiPatchTexture::GetPixels () // //========================================================================== -const BYTE *FMultiPatchTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FMultiPatchTexture::GetColumn (unsigned int column, const Span **spans_out) { if (bRedirect) { @@ -425,7 +425,7 @@ const BYTE *FMultiPatchTexture::GetColumn (unsigned int column, const Span **spa // //========================================================================== -BYTE *GetBlendMap(PalEntry blend, BYTE *blendwork) +uint8_t *GetBlendMap(PalEntry blend, uint8_t *blendwork) { switch (blend.a==0 ? int(blend) : -1) @@ -485,10 +485,10 @@ void FMultiPatchTexture::MakeTexture () // Add a little extra space at the end if the texture's height is not // a power of 2, in case somebody accidentally makes it repeat vertically. int numpix = Width * Height + (1 << HeightBits) - Height; - BYTE blendwork[256]; + uint8_t blendwork[256]; bool hasTranslucent = false; - Pixels = new BYTE[numpix]; + Pixels = new uint8_t[numpix]; memset (Pixels, 0, numpix); for (int i = 0; i < NumParts; ++i) @@ -505,7 +505,7 @@ void FMultiPatchTexture::MakeTexture () { if (Parts[i].Texture->bHasCanvas) continue; // cannot use camera textures as patch. - BYTE *trans = Parts[i].Translation ? Parts[i].Translation->Remap : NULL; + uint8_t *trans = Parts[i].Translation ? Parts[i].Translation->Remap : NULL; { if (Parts[i].Blend != 0) { @@ -520,13 +520,13 @@ void FMultiPatchTexture::MakeTexture () { // In case there are translucent patches let's do the composition in // True color to keep as much precision as possible before downconverting to the palette. - BYTE *buffer = new BYTE[Width * Height * 4]; + uint8_t *buffer = new uint8_t[Width * Height * 4]; memset(buffer, 0, Width * Height * 4); FillBuffer(buffer, Width * 4, Height, TEX_RGB); for(int y = 0; y < Height; y++) { - BYTE *in = buffer + Width * y * 4; - BYTE *out = Pixels + y; + uint8_t *in = buffer + Width * y * 4; + uint8_t *out = Pixels + y; for (int x = 0; x < Width; x++) { if (*out == 0 && in[3] != 0) @@ -823,7 +823,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d { FPatchLookup *patchlookup = NULL; int i; - DWORD numpatches; + uint32_t numpatches; if (firstdup == 0) { @@ -844,7 +844,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d // Check whether the amount of names reported is correct. int lumplength = Wads.LumpLength(patcheslump); - if (numpatches > DWORD((lumplength-4)/8)) + if (numpatches > uint32_t((lumplength-4)/8)) { Printf("PNAMES lump is shorter than required (%u entries reported but only %d bytes (%d entries) long\n", numpatches, lumplength, (lumplength-4)/8); @@ -855,7 +855,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d // Catalog the patches these textures use so we know which // textures they represent. patchlookup = new FPatchLookup[numpatches]; - for (DWORD i = 0; i < numpatches; ++i) + for (uint32_t i = 0; i < numpatches; ++i) { char pname[9]; pnames.Read(pname, 8); @@ -865,16 +865,16 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d } bool isStrife = false; - const DWORD *maptex, *directory; - DWORD maxoff; + const uint32_t *maptex, *directory; + uint32_t maxoff; int numtextures; - DWORD offset = 0; // Shut up, GCC! + uint32_t offset = 0; // Shut up, GCC! - maptex = (const DWORD *)lumpdata; + maptex = (const uint32_t *)lumpdata; numtextures = LittleLong(*maptex); maxoff = lumpsize; - if (maxoff < DWORD(numtextures+1)*4) + if (maxoff < uint32_t(numtextures+1)*4) { Printf ("Texture directory is too short"); delete[] patchlookup; @@ -892,7 +892,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d return; } - maptexture_t *tex = (maptexture_t *)((BYTE *)maptex + offset); + maptexture_t *tex = (maptexture_t *)((uint8_t *)maptex + offset); // There is bizzarely a Doom editing tool that writes to the // first two elements of columndirectory, so I can't check those. @@ -915,7 +915,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d // The very first texture is just a dummy. Copy its dimensions to texture 0. // It still needs to be created in case someone uses it by name. offset = LittleLong(directory[1]); - const maptexture_t *tex = (const maptexture_t *)((const BYTE *)maptex + offset); + const maptexture_t *tex = (const maptexture_t *)((const uint8_t *)maptex + offset); FDummyTexture *tex0 = static_cast(Textures[0].Texture); tex0->SetSize (SAFESHORT(tex->width), SAFESHORT(tex->height)); } @@ -939,7 +939,7 @@ void FTextureManager::AddTexturesLump (const void *lumpdata, int lumpsize, int d } if (j + 1 == firstdup) { - FMultiPatchTexture *tex = new FMultiPatchTexture ((const BYTE *)maptex + offset, patchlookup, numpatches, isStrife, deflumpnum); + FMultiPatchTexture *tex = new FMultiPatchTexture ((const uint8_t *)maptex + offset, patchlookup, numpatches, isStrife, deflumpnum); if (i == 1 && texture1) { tex->UseType = FTexture::TEX_FirstDefined; diff --git a/src/textures/patchtexture.cpp b/src/textures/patchtexture.cpp index 423ce4deb..3bdc3402c 100644 --- a/src/textures/patchtexture.cpp +++ b/src/textures/patchtexture.cpp @@ -44,8 +44,8 @@ // posts are runs of non masked source pixels struct column_t { - BYTE topdelta; // -1 is the last post in a column - BYTE length; // length data bytes follows + uint8_t topdelta; // -1 is the last post in a column + uint8_t length; // length data bytes follows }; @@ -61,12 +61,12 @@ public: FPatchTexture (int lumpnum, patch_t *header); ~FPatchTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); protected: - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; bool hackflag; @@ -85,7 +85,7 @@ static bool CheckIfPatch(FileReader & file) { if (file.GetLength() < 13) return false; // minimum length of a valid Doom patch - BYTE *data = new BYTE[file.GetLength()]; + uint8_t *data = new uint8_t[file.GetLength()]; file.Seek(0, SEEK_SET); file.Read(data, file.GetLength()); @@ -105,12 +105,12 @@ static bool CheckIfPatch(FileReader & file) for (x = 0; x < width; ++x) { - DWORD ofs = LittleLong(foo->columnofs[x]); - if (ofs == (DWORD)width * 4 + 8) + uint32_t ofs = LittleLong(foo->columnofs[x]); + if (ofs == (uint32_t)width * 4 + 8) { gapAtStart = false; } - else if (ofs >= (DWORD)(file.GetLength())) // Need one byte for an empty column (but there's patches that don't know that!) + else if (ofs >= (uint32_t)(file.GetLength())) // Need one byte for an empty column (but there's patches that don't know that!) { delete [] data; return false; @@ -192,7 +192,7 @@ void FPatchTexture::Unload () // //========================================================================== -const BYTE *FPatchTexture::GetPixels () +const uint8_t *FPatchTexture::GetPixels () { if (Pixels == NULL) { @@ -207,7 +207,7 @@ const BYTE *FPatchTexture::GetPixels () // //========================================================================== -const BYTE *FPatchTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FPatchTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -244,7 +244,7 @@ const BYTE *FPatchTexture::GetColumn (unsigned int column, const Span **spans_ou void FPatchTexture::MakeTexture () { - BYTE *remap, remaptable[256]; + uint8_t *remap, remaptable[256]; int numspans; const column_t *maxcol; int x; @@ -252,7 +252,7 @@ void FPatchTexture::MakeTexture () FMemLump lump = Wads.ReadLump (SourceLump); const patch_t *patch = (const patch_t *)lump.GetMem(); - maxcol = (const column_t *)((const BYTE *)patch + Wads.LumpLength (SourceLump) - 3); + maxcol = (const column_t *)((const uint8_t *)patch + Wads.LumpLength (SourceLump) - 3); // Check for badly-sized patches #if 0 // Such textures won't be created so there's no need to check here @@ -284,13 +284,13 @@ void FPatchTexture::MakeTexture () if (hackflag) { - Pixels = new BYTE[Width * Height]; - BYTE *out; + Pixels = new uint8_t[Width * Height]; + uint8_t *out; // Draw the image to the buffer for (x = 0, out = Pixels; x < Width; ++x) { - const BYTE *in = (const BYTE *)patch + LittleLong(patch->columnofs[x]) + 3; + const uint8_t *in = (const uint8_t *)patch + LittleLong(patch->columnofs[x]) + 3; for (int y = Height; y > 0; --y) { @@ -307,14 +307,14 @@ void FPatchTexture::MakeTexture () numspans = Width; - Pixels = new BYTE[numpix]; + Pixels = new uint8_t[numpix]; memset (Pixels, 0, numpix); // Draw the image to the buffer for (x = 0; x < Width; ++x) { - BYTE *outtop = Pixels + x*Height; - const column_t *column = (const column_t *)((const BYTE *)patch + LittleLong(patch->columnofs[x])); + uint8_t *outtop = Pixels + x*Height; + const column_t *column = (const column_t *)((const uint8_t *)patch + LittleLong(patch->columnofs[x])); int top = -1; while (column < maxcol && column->topdelta != 0xFF) @@ -329,7 +329,7 @@ void FPatchTexture::MakeTexture () } int len = column->length; - BYTE *out = outtop + top; + uint8_t *out = outtop + top; if (len != 0) { @@ -341,14 +341,14 @@ void FPatchTexture::MakeTexture () { numspans++; - const BYTE *in = (const BYTE *)column + 3; + const uint8_t *in = (const uint8_t *)column + 3; for (int i = 0; i < len; ++i) { out[i] = remap[in[i]]; } } } - column = (const column_t *)((const BYTE *)column + column->length + 4); + column = (const column_t *)((const uint8_t *)column + column->length + 4); } } } @@ -367,19 +367,19 @@ void FPatchTexture::HackHack (int newheight) // one post, where each post has a supposed length of 0. FMemLump lump = Wads.ReadLump (SourceLump); const patch_t *realpatch = (patch_t *)lump.GetMem(); - const DWORD *cofs = realpatch->columnofs; + const uint32_t *cofs = realpatch->columnofs; int x, x2 = LittleShort(realpatch->width); if (LittleShort(realpatch->height) == 256) { for (x = 0; x < x2; ++x) { - const column_t *col = (column_t*)((BYTE*)realpatch+LittleLong(cofs[x])); + const column_t *col = (column_t*)((uint8_t*)realpatch+LittleLong(cofs[x])); if (col->topdelta != 0 || col->length != 0) { break; // It's not bad! } - col = (column_t *)((BYTE *)col + 256 + 4); + col = (column_t *)((uint8_t *)col + 256 + 4); if (col->topdelta != 0xFF) { break; // More than one post in a column! diff --git a/src/textures/pcxtexture.cpp b/src/textures/pcxtexture.cpp index dda431993..c5be4bdce 100644 --- a/src/textures/pcxtexture.cpp +++ b/src/textures/pcxtexture.cpp @@ -53,24 +53,24 @@ struct PCXHeader { - BYTE manufacturer; - BYTE version; - BYTE encoding; - BYTE bitsPerPixel; + uint8_t manufacturer; + uint8_t version; + uint8_t encoding; + uint8_t bitsPerPixel; - WORD xmin, ymin; - WORD xmax, ymax; - WORD horzRes, vertRes; + uint16_t xmin, ymin; + uint16_t xmax, ymax; + uint16_t horzRes, vertRes; - BYTE palette[48]; - BYTE reserved; - BYTE numColorPlanes; + uint8_t palette[48]; + uint8_t reserved; + uint8_t numColorPlanes; - WORD bytesPerScanLine; - WORD paletteType; - WORD horzSize, vertSize; + uint16_t bytesPerScanLine; + uint16_t paletteType; + uint16_t horzSize, vertSize; - BYTE padding[54]; + uint8_t padding[54]; } FORCE_PACKED; #pragma pack() @@ -87,8 +87,8 @@ public: FPCXTexture (int lumpnum, PCXHeader &); ~FPCXTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); FTextureFormat GetFormat (); @@ -96,13 +96,13 @@ public: bool UseBasePalette(); protected: - BYTE *Pixels; + uint8_t *Pixels; Span DummySpans[2]; - void ReadPCX1bit (BYTE *dst, FileReader & lump, PCXHeader *hdr); - void ReadPCX4bits (BYTE *dst, FileReader & lump, PCXHeader *hdr); - void ReadPCX8bits (BYTE *dst, FileReader & lump, PCXHeader *hdr); - void ReadPCX24bits (BYTE *dst, FileReader & lump, PCXHeader *hdr, int planes); + void ReadPCX1bit (uint8_t *dst, FileReader & lump, PCXHeader *hdr); + void ReadPCX4bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr); + void ReadPCX8bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr); + void ReadPCX24bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr, int planes); virtual void MakeTexture (); @@ -210,7 +210,7 @@ FTextureFormat FPCXTexture::GetFormat() // //========================================================================== -const BYTE *FPCXTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FPCXTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -240,7 +240,7 @@ const BYTE *FPCXTexture::GetColumn (unsigned int column, const Span **spans_out) // //========================================================================== -const BYTE *FPCXTexture::GetPixels () +const uint8_t *FPCXTexture::GetPixels () { if (Pixels == NULL) { @@ -255,19 +255,19 @@ const BYTE *FPCXTexture::GetPixels () // //========================================================================== -void FPCXTexture::ReadPCX1bit (BYTE *dst, FileReader & lump, PCXHeader *hdr) +void FPCXTexture::ReadPCX1bit (uint8_t *dst, FileReader & lump, PCXHeader *hdr) { int y, i, bytes; int rle_count = 0; - BYTE rle_value = 0; + uint8_t rle_value = 0; - BYTE * srcp = new BYTE[lump.GetLength() - sizeof(PCXHeader)]; + uint8_t * srcp = new uint8_t[lump.GetLength() - sizeof(PCXHeader)]; lump.Read(srcp, lump.GetLength() - sizeof(PCXHeader)); - BYTE * src = srcp; + uint8_t * src = srcp; for (y = 0; y < Height; ++y) { - BYTE * ptr = &dst[y * Width]; + uint8_t * ptr = &dst[y * Width]; bytes = hdr->bytesPerScanLine; @@ -303,26 +303,26 @@ void FPCXTexture::ReadPCX1bit (BYTE *dst, FileReader & lump, PCXHeader *hdr) // //========================================================================== -void FPCXTexture::ReadPCX4bits (BYTE *dst, FileReader & lump, PCXHeader *hdr) +void FPCXTexture::ReadPCX4bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr) { int rle_count = 0, rle_value = 0; int x, y, c; int bytes; - BYTE * line = new BYTE[hdr->bytesPerScanLine]; - BYTE * colorIndex = new BYTE[Width]; + uint8_t * line = new uint8_t[hdr->bytesPerScanLine]; + uint8_t * colorIndex = new uint8_t[Width]; - BYTE * srcp = new BYTE[lump.GetLength() - sizeof(PCXHeader)]; + uint8_t * srcp = new uint8_t[lump.GetLength() - sizeof(PCXHeader)]; lump.Read(srcp, lump.GetLength() - sizeof(PCXHeader)); - BYTE * src = srcp; + uint8_t * src = srcp; for (y = 0; y < Height; ++y) { - BYTE * ptr = &dst[y * Width]; - memset (ptr, 0, Width * sizeof (BYTE)); + uint8_t * ptr = &dst[y * Width]; + memset (ptr, 0, Width * sizeof (uint8_t)); for (c = 0; c < 4; ++c) { - BYTE * pLine = line; + uint8_t * pLine = line; bytes = hdr->bytesPerScanLine; @@ -366,18 +366,18 @@ void FPCXTexture::ReadPCX4bits (BYTE *dst, FileReader & lump, PCXHeader *hdr) // //========================================================================== -void FPCXTexture::ReadPCX8bits (BYTE *dst, FileReader & lump, PCXHeader *hdr) +void FPCXTexture::ReadPCX8bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr) { int rle_count = 0, rle_value = 0; int y, bytes; - BYTE * srcp = new BYTE[lump.GetLength() - sizeof(PCXHeader)]; + uint8_t * srcp = new uint8_t[lump.GetLength() - sizeof(PCXHeader)]; lump.Read(srcp, lump.GetLength() - sizeof(PCXHeader)); - BYTE * src = srcp; + uint8_t * src = srcp; for (y = 0; y < Height; ++y) { - BYTE * ptr = &dst[y * Width]; + uint8_t * ptr = &dst[y * Width]; bytes = hdr->bytesPerScanLine; while (bytes--) @@ -408,22 +408,22 @@ void FPCXTexture::ReadPCX8bits (BYTE *dst, FileReader & lump, PCXHeader *hdr) // //========================================================================== -void FPCXTexture::ReadPCX24bits (BYTE *dst, FileReader & lump, PCXHeader *hdr, int planes) +void FPCXTexture::ReadPCX24bits (uint8_t *dst, FileReader & lump, PCXHeader *hdr, int planes) { int rle_count = 0, rle_value = 0; int y, c; int bytes; - BYTE * srcp = new BYTE[lump.GetLength() - sizeof(PCXHeader)]; + uint8_t * srcp = new uint8_t[lump.GetLength() - sizeof(PCXHeader)]; lump.Read(srcp, lump.GetLength() - sizeof(PCXHeader)); - BYTE * src = srcp; + uint8_t * src = srcp; for (y = 0; y < Height; ++y) { /* for each color plane */ for (c = 0; c < planes; ++c) { - BYTE * ptr = &dst[y * Width * planes]; + uint8_t * ptr = &dst[y * Width * planes]; bytes = hdr->bytesPerScanLine; while (bytes--) @@ -442,7 +442,7 @@ void FPCXTexture::ReadPCX24bits (BYTE *dst, FileReader & lump, PCXHeader *hdr, i } rle_count--; - ptr[c] = (BYTE)rle_value; + ptr[c] = (uint8_t)rle_value; ptr += planes; } } @@ -458,7 +458,7 @@ void FPCXTexture::ReadPCX24bits (BYTE *dst, FileReader & lump, PCXHeader *hdr, i void FPCXTexture::MakeTexture() { - BYTE PaletteMap[256]; + uint8_t PaletteMap[256]; PCXHeader header; int bitcount; @@ -467,7 +467,7 @@ void FPCXTexture::MakeTexture() lump.Read(&header, sizeof(header)); bitcount = header.bitsPerPixel * header.numColorPlanes; - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; if (bitcount < 24) { @@ -492,14 +492,14 @@ void FPCXTexture::MakeTexture() } else if (bitcount == 8) { - BYTE c; + uint8_t c; lump.Seek(-769, SEEK_END); lump >> c; //if (c !=0x0c) memcpy(PaletteMap, GrayMap, 256); // Fallback for files without palette //else for(int i=0;i<256;i++) { - BYTE r,g,b; + uint8_t r,g,b; lump >> r >> g >> b; PaletteMap[i] = ColorMatcher.Pick(r,g,b); } @@ -512,17 +512,17 @@ void FPCXTexture::MakeTexture() } else { - BYTE *newpix = new BYTE[Width*Height]; + uint8_t *newpix = new uint8_t[Width*Height]; FlipNonSquareBlockRemap (newpix, Pixels, Width, Height, Width, PaletteMap); - BYTE *oldpix = Pixels; + uint8_t *oldpix = Pixels; Pixels = newpix; delete[] oldpix; } } else { - BYTE * buffer = new BYTE[Width*Height * 3]; - BYTE * row = buffer; + uint8_t * buffer = new uint8_t[Width*Height * 3]; + uint8_t * row = buffer; ReadPCX24bits (buffer, lump, &header, 3); for(int y=0; y> c; c=0x0c; // Apparently there's many non-compliant PCXs out there... @@ -591,7 +591,7 @@ int FPCXTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo } else for(int i=0;i<256;i++) { - BYTE r,g,b; + uint8_t r,g,b; lump >> r >> g >> b; pe[i] = PalEntry(255, r,g,b); } @@ -602,7 +602,7 @@ int FPCXTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo } else { - Pixels = new BYTE[Width*Height * 3]; + Pixels = new uint8_t[Width*Height * 3]; ReadPCX24bits (Pixels, lump, &header, 3); bmp->CopyPixelDataRGB(x, y, Pixels, Width, Height, 3, Width*3, rotate, CF_RGB, inf); } diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp index 414c424b8..82de8b74d 100644 --- a/src/textures/pngtexture.cpp +++ b/src/textures/pngtexture.cpp @@ -51,11 +51,11 @@ class FPNGTexture : public FTexture { public: - FPNGTexture (FileReader &lump, int lumpnum, const FString &filename, int width, int height, BYTE bitdepth, BYTE colortype, BYTE interlace); + FPNGTexture (FileReader &lump, int lumpnum, const FString &filename, int width, int height, uint8_t bitdepth, uint8_t colortype, uint8_t interlace); ~FPNGTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); FTextureFormat GetFormat (); int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL); @@ -64,19 +64,19 @@ public: protected: FString SourceFile; - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; FileReader *fr; - BYTE BitDepth; - BYTE ColorType; - BYTE Interlace; + uint8_t BitDepth; + uint8_t ColorType; + uint8_t Interlace; bool HaveTrans; - WORD NonPaletteTrans[3]; + uint16_t NonPaletteTrans[3]; - BYTE *PaletteMap; + uint8_t *PaletteMap; int PaletteSize; - DWORD StartOfIDAT; + uint32_t StartOfIDAT; void MakeTexture (); @@ -94,13 +94,13 @@ FTexture *PNGTexture_TryCreate(FileReader & data, int lumpnum) { union { - DWORD dw; - WORD w[2]; - BYTE b[4]; + uint32_t dw; + uint16_t w[2]; + uint8_t b[4]; } first4bytes; - DWORD width, height; - BYTE bitdepth, colortype, compression, filter, interlace; + uint32_t width, height; + uint8_t bitdepth, colortype, compression, filter, interlace; // This is most likely a PNG, but make sure. (Note that if the // first 4 bytes match, but later bytes don't, we assume it's @@ -159,8 +159,8 @@ FTexture *PNGTexture_TryCreate(FileReader & data, int lumpnum) FTexture *PNGTexture_CreateFromFile(PNGHandle *png, const FString &filename) { - DWORD width, height; - BYTE bitdepth, colortype, compression, filter, interlace; + uint32_t width, height; + uint8_t bitdepth, colortype, compression, filter, interlace; if (M_FindPNGChunk(png, MAKE_ID('I','H','D','R')) == 0) { @@ -196,18 +196,18 @@ FTexture *PNGTexture_CreateFromFile(PNGHandle *png, const FString &filename) //========================================================================== FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename, int width, int height, - BYTE depth, BYTE colortype, BYTE interlace) + uint8_t depth, uint8_t colortype, uint8_t interlace) : FTexture(NULL, lumpnum), SourceFile(filename), Pixels(0), Spans(0), BitDepth(depth), ColorType(colortype), Interlace(interlace), HaveTrans(false), PaletteMap(0), PaletteSize(0), StartOfIDAT(0) { union { - DWORD palette[256]; - BYTE pngpal[256][3]; + uint32_t palette[256]; + uint8_t pngpal[256][3]; } p; - BYTE trans[256]; - DWORD len, id; + uint8_t trans[256]; + uint32_t len, id; int i; if (lumpnum == -1) fr = &lump; @@ -241,7 +241,7 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename case MAKE_ID('g','r','A','b'): // This is like GRAB found in an ILBM, except coordinates use 4 bytes { - DWORD hotx, hoty; + uint32_t hotx, hoty; int ihotx, ihoty; lump.Read(&hotx, 4); @@ -280,9 +280,9 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename lump.Read (trans, len); HaveTrans = true; // Save for colortype 2 - NonPaletteTrans[0] = WORD(trans[0] * 256 + trans[1]); - NonPaletteTrans[1] = WORD(trans[2] * 256 + trans[3]); - NonPaletteTrans[2] = WORD(trans[4] * 256 + trans[5]); + NonPaletteTrans[0] = uint16_t(trans[0] * 256 + trans[1]); + NonPaletteTrans[1] = uint16_t(trans[2] * 256 + trans[3]); + NonPaletteTrans[2] = uint16_t(trans[4] * 256 + trans[5]); break; case MAKE_ID('a','l','P','h'): @@ -310,7 +310,7 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename { bMasked = true; PaletteSize = 256; - PaletteMap = new BYTE[256]; + PaletteMap = new uint8_t[256]; memcpy (PaletteMap, GrayMap, 256); PaletteMap[NonPaletteTrans[0]] = 0; } @@ -322,7 +322,7 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename break; case 3: // Paletted - PaletteMap = new BYTE[PaletteSize]; + PaletteMap = new uint8_t[PaletteSize]; GPalette.MakeRemap (p.palette, PaletteMap, trans, PaletteSize); for (i = 0; i < PaletteSize; ++i) { @@ -407,7 +407,7 @@ FTextureFormat FPNGTexture::GetFormat() // //========================================================================== -const BYTE *FPNGTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FPNGTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -441,7 +441,7 @@ const BYTE *FPNGTexture::GetColumn (unsigned int column, const Span **spans_out) // //========================================================================== -const BYTE *FPNGTexture::GetPixels () +const uint8_t *FPNGTexture::GetPixels () { if (Pixels == NULL) { @@ -469,14 +469,14 @@ void FPNGTexture::MakeTexture () lump = fr;// new FileReader(SourceFile.GetChars()); } - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; if (StartOfIDAT == 0) { memset (Pixels, 0x99, Width*Height); } else { - DWORD len, id; + uint32_t len, id; lump->Seek (StartOfIDAT, SEEK_SET); lump->Read(&len, 4); lump->Read(&id, 4); @@ -498,7 +498,7 @@ void FPNGTexture::MakeTexture () } else { - BYTE *newpix = new BYTE[Width*Height]; + uint8_t *newpix = new uint8_t[Width*Height]; if (PaletteMap != NULL) { FlipNonSquareBlockRemap (newpix, Pixels, Width, Height, Width, PaletteMap); @@ -507,7 +507,7 @@ void FPNGTexture::MakeTexture () { FlipNonSquareBlock (newpix, Pixels, Width, Height, Width); } - BYTE *oldpix = Pixels; + uint8_t *oldpix = Pixels; Pixels = newpix; delete[] oldpix; } @@ -515,8 +515,8 @@ void FPNGTexture::MakeTexture () else /* RGB and/or Alpha present */ { int bytesPerPixel = ColorType == 2 ? 3 : ColorType == 4 ? 2 : 4; - BYTE *tempix = new BYTE[Width * Height * bytesPerPixel]; - BYTE *in, *out; + uint8_t *tempix = new uint8_t[Width * Height * bytesPerPixel]; + uint8_t *in, *out; int x, y, pitch, backstep; M_ReadIDAT (lump, tempix, Width, Height, Width*bytesPerPixel, BitDepth, ColorType, Interlace, BigLong((unsigned int)len)); @@ -616,7 +616,7 @@ int FPNGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo { // Parse pre-IDAT chunks. I skip the CRCs. Is that bad? PalEntry pe[256]; - DWORD len, id; + uint32_t len, id; FileReader *lump; static char bpp[] = {1, 0, 3, 1, 2, 0, 4}; int pixwidth = Width * bpp[ColorType]; @@ -656,7 +656,7 @@ int FPNGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo case MAKE_ID('t','R','N','S'): if (ColorType == 3) { - for(DWORD i = 0; i < len; i++) + for(uint32_t i = 0; i < len; i++) { (*lump) >> pe[i].a; if (pe[i].a != 0 && pe[i].a != 255) @@ -681,7 +681,7 @@ int FPNGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo transpal = true; } - BYTE * Pixels = new BYTE[pixwidth * Height]; + uint8_t * Pixels = new uint8_t[pixwidth * Height]; lump->Seek (StartOfIDAT, SEEK_SET); lump->Read(&len, 4); diff --git a/src/textures/rawpagetexture.cpp b/src/textures/rawpagetexture.cpp index 1402f8844..956b2a6a9 100644 --- a/src/textures/rawpagetexture.cpp +++ b/src/textures/rawpagetexture.cpp @@ -52,12 +52,12 @@ public: FRawPageTexture (int lumpnum); ~FRawPageTexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); protected: - BYTE *Pixels; + uint8_t *Pixels; static const Span DummySpans[2]; void MakeTexture (); @@ -97,8 +97,8 @@ static bool CheckIfRaw(FileReader & data) for (x = 0; x < width; ++x) { - DWORD ofs = LittleLong(foo->columnofs[x]); - if (ofs == (DWORD)width * 4 + 8) + uint32_t ofs = LittleLong(foo->columnofs[x]); + if (ofs == (uint32_t)width * 4 + 8) { gapAtStart = false; } @@ -110,7 +110,7 @@ static bool CheckIfRaw(FileReader & data) else { // Ensure this column does not extend beyond the end of the patch - const BYTE *foo2 = (const BYTE *)foo; + const uint8_t *foo2 = (const uint8_t *)foo; while (ofs < 64000) { if (foo2[ofs] == 255) @@ -214,7 +214,7 @@ void FRawPageTexture::Unload () // //========================================================================== -const BYTE *FRawPageTexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FRawPageTexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -237,7 +237,7 @@ const BYTE *FRawPageTexture::GetColumn (unsigned int column, const Span **spans_ // //========================================================================== -const BYTE *FRawPageTexture::GetPixels () +const uint8_t *FRawPageTexture::GetPixels () { if (Pixels == NULL) { @@ -255,11 +255,11 @@ const BYTE *FRawPageTexture::GetPixels () void FRawPageTexture::MakeTexture () { FMemLump lump = Wads.ReadLump (SourceLump); - const BYTE *source = (const BYTE *)lump.GetMem(); - const BYTE *source_p = source; - BYTE *dest_p; + const uint8_t *source = (const uint8_t *)lump.GetMem(); + const uint8_t *source_p = source; + uint8_t *dest_p; - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; dest_p = Pixels; // Convert the source image from row-major to column-major format diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index 39948f732..4714a7eea 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -764,7 +764,7 @@ void FTextureManager::LoadTextureDefs(int wadnum, const char *lumpname) void FTextureManager::AddPatches (int lumpnum) { FWadLump *file = Wads.ReopenLumpNum (lumpnum); - DWORD numpatches, i; + uint32_t numpatches, i; char name[9]; *file >> numpatches; @@ -1181,7 +1181,7 @@ int FTextureManager::CountLumpTextures (int lumpnum) if (lumpnum >= 0) { FWadLump file = Wads.OpenLumpNum (lumpnum); - DWORD numtex; + uint32_t numtex; file >> numtex; return int(numtex) >= 0 ? numtex : 0; diff --git a/src/textures/tgatexture.cpp b/src/textures/tgatexture.cpp index 331747cfe..746d8ad96 100644 --- a/src/textures/tgatexture.cpp +++ b/src/textures/tgatexture.cpp @@ -53,19 +53,19 @@ struct TGAHeader { - BYTE id_len; - BYTE has_cm; - BYTE img_type; - SWORD cm_first; - SWORD cm_length; - BYTE cm_size; + uint8_t id_len; + uint8_t has_cm; + uint8_t img_type; + int16_t cm_first; + int16_t cm_length; + uint8_t cm_size; - SWORD x_origin; - SWORD y_origin; - SWORD width; - SWORD height; - BYTE bpp; - BYTE img_desc; + int16_t x_origin; + int16_t y_origin; + int16_t width; + int16_t height; + uint8_t bpp; + uint8_t img_desc; }; #pragma pack() @@ -82,8 +82,8 @@ public: FTGATexture (int lumpnum, TGAHeader *); ~FTGATexture (); - const BYTE *GetColumn (unsigned int column, const Span **spans_out); - const BYTE *GetPixels (); + const uint8_t *GetColumn (unsigned int column, const Span **spans_out); + const uint8_t *GetPixels (); void Unload (); FTextureFormat GetFormat (); @@ -91,10 +91,10 @@ public: bool UseBasePalette(); protected: - BYTE *Pixels; + uint8_t *Pixels; Span **Spans; - void ReadCompressed(FileReader &lump, BYTE * buffer, int bytesperpixel); + void ReadCompressed(FileReader &lump, uint8_t * buffer, int bytesperpixel); virtual void MakeTexture (); @@ -200,7 +200,7 @@ FTextureFormat FTGATexture::GetFormat() // //========================================================================== -const BYTE *FTGATexture::GetColumn (unsigned int column, const Span **spans_out) +const uint8_t *FTGATexture::GetColumn (unsigned int column, const Span **spans_out) { if (Pixels == NULL) { @@ -234,7 +234,7 @@ const BYTE *FTGATexture::GetColumn (unsigned int column, const Span **spans_out) // //========================================================================== -const BYTE *FTGATexture::GetPixels () +const uint8_t *FTGATexture::GetPixels () { if (Pixels == NULL) { @@ -249,10 +249,10 @@ const BYTE *FTGATexture::GetPixels () // //========================================================================== -void FTGATexture::ReadCompressed(FileReader &lump, BYTE * buffer, int bytesperpixel) +void FTGATexture::ReadCompressed(FileReader &lump, uint8_t * buffer, int bytesperpixel) { - BYTE b; - BYTE data[4]; + uint8_t b; + uint8_t data[4]; int Size = Width * Height; while (Size > 0) @@ -288,14 +288,14 @@ void FTGATexture::ReadCompressed(FileReader &lump, BYTE * buffer, int bytesperpi void FTGATexture::MakeTexture () { - BYTE PaletteMap[256]; + uint8_t PaletteMap[256]; FWadLump lump = Wads.OpenLumpNum (SourceLump); TGAHeader hdr; - WORD w; - BYTE r,g,b,a; - BYTE * buffer; + uint16_t w; + uint8_t r,g,b,a; + uint8_t * buffer; - Pixels = new BYTE[Width*Height]; + Pixels = new uint8_t[Width*Height]; lump.Read(&hdr, sizeof(hdr)); lump.Seek(hdr.id_len, SEEK_CUR); @@ -339,7 +339,7 @@ void FTGATexture::MakeTexture () } int Size = Width * Height * (hdr.bpp>>3); - buffer = new BYTE[Size]; + buffer = new uint8_t[Size]; if (hdr.img_type < 4) // uncompressed { @@ -350,7 +350,7 @@ void FTGATexture::MakeTexture () ReadCompressed(lump, buffer, hdr.bpp>>3); } - BYTE * ptr = buffer; + uint8_t * ptr = buffer; int step_x = (hdr.bpp>>3); int Pitch = Width * step_x; @@ -372,7 +372,7 @@ void FTGATexture::MakeTexture () case 1: // paletted for(int y=0;y>=1; for(int y=0;y>2][p[1]>>2][p[0]>>2]; @@ -416,7 +416,7 @@ void FTGATexture::MakeTexture () { for(int y=0;y>2][p[1]>>2][p[0]>>2]; @@ -428,7 +428,7 @@ void FTGATexture::MakeTexture () { for(int y=0;y= 128? RGB256k.RGB[p[2]>>2][p[1]>>2][p[0]>>2] : 0; @@ -449,7 +449,7 @@ void FTGATexture::MakeTexture () case 8: for(int y=0;y>3); - sbuffer = new BYTE[Size]; + sbuffer = new uint8_t[Size]; if (hdr.img_type < 4) // uncompressed { @@ -552,7 +552,7 @@ int FTGATexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCo ReadCompressed(lump, sbuffer, hdr.bpp>>3); } - BYTE * ptr = sbuffer; + uint8_t * ptr = sbuffer; int step_x = (hdr.bpp>>3); int Pitch = Width * step_x;