zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replaced a large batch of DWORDs.

Browse source 
Most of those which still rely on ZDoom's own definition should be gone, unfortunately the code in files that include Windows headers is a gigantic mess with DWORDs being longs there intead of ints, so this needs to be done with care. DWORD should only remain where the Windows type is actually wanted.
This commit is contained in:
Christoph Oelckers 2017-03-09 20:19:55 +01:00
parent a17685f3fd
commit 9b87a167d7
38 changed files with 207 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/f_wipe.cpp
View file

@ -304,10 +304,10 @@ bool wipe_doBurn (int ticks)
else else
{ {
int bglevel = 64-fglevel; int bglevel = 64-fglevel;
DWORD *fg2rgb = Col2RGB8[fglevel]; uint32_t *fg2rgb = Col2RGB8[fglevel];
DWORD *bg2rgb = Col2RGB8[bglevel]; uint32_t *bg2rgb = Col2RGB8[bglevel];
DWORD fg = fg2rgb[fromnew[x]]; uint32_t fg = fg2rgb[fromnew[x]];
DWORD bg = bg2rgb[fromold[x]]; uint32_t bg = bg2rgb[fromold[x]];
fg = (fg+bg) | 0x1f07c1f; fg = (fg+bg) | 0x1f07c1f;
to[x] = RGB32k.All[fg & (fg>>15)]; to[x] = RGB32k.All[fg & (fg>>15)];
done = false; done = false;
@ -343,8 +343,8 @@ bool wipe_doBurn (int ticks)
const PalEntry* pal = GPalette.BaseColors; const PalEntry* pal = GPalette.BaseColors;
DWORD fg = fromnew[x]; uint32_t fg = fromnew[x];
DWORD bg = fromold[x]; uint32_t bg = fromold[x];
int r = MIN((pal[fg].r * fglevel + pal[bg].r * bglevel) >> 8, 63); int r = MIN((pal[fg].r * fglevel + pal[bg].r * bglevel) >> 8, 63);
int g = MIN((pal[fg].g * fglevel + pal[bg].g * bglevel) >> 8, 63); int g = MIN((pal[fg].g * fglevel + pal[bg].g * bglevel) >> 8, 63);
int b = MIN((pal[fg].b * fglevel + pal[bg].b * bglevel) >> 8, 63); int b = MIN((pal[fg].b * fglevel + pal[bg].b * bglevel) >> 8, 63);
@ -386,8 +386,8 @@ bool wipe_doFade (int ticks)
{ {
int x, y; int x, y;
int bglevel = 64 - fade; int bglevel = 64 - fade;
DWORD *fg2rgb = Col2RGB8[fade]; uint32_t *fg2rgb = Col2RGB8[fade];
DWORD *bg2rgb = Col2RGB8[bglevel]; uint32_t *bg2rgb = Col2RGB8[bglevel];
uint8_t *fromnew = (uint8_t *)wipe_scr_end; uint8_t *fromnew = (uint8_t *)wipe_scr_end;
uint8_t *fromold = (uint8_t *)wipe_scr_start; uint8_t *fromold = (uint8_t *)wipe_scr_start;
uint8_t *to = screen->GetBuffer(); uint8_t *to = screen->GetBuffer();
@ -399,8 +399,8 @@ bool wipe_doFade (int ticks)
{ {
for (x = 0; x < SCREENWIDTH; x++) for (x = 0; x < SCREENWIDTH; x++)
{ {
DWORD fg = fg2rgb[fromnew[x]]; uint32_t fg = fg2rgb[fromnew[x]];
DWORD bg = bg2rgb[fromold[x]]; uint32_t bg = bg2rgb[fromold[x]];
fg = (fg+bg) | 0x1f07c1f; fg = (fg+bg) | 0x1f07c1f;
to[x] = RGB32k.All[fg & (fg>>15)]; to[x] = RGB32k.All[fg & (fg>>15)];
} }
@ -415,8 +415,8 @@ bool wipe_doFade (int ticks)
{ {
for (x = 0; x < SCREENWIDTH; x++) for (x = 0; x < SCREENWIDTH; x++)
{ {
DWORD fg = fromnew[x]; uint32_t fg = fromnew[x];
DWORD bg = fromold[x]; uint32_t bg = fromold[x];
int r = MIN((pal[fg].r * (64-bglevel) + pal[bg].r * bglevel) >> 8, 63); int r = MIN((pal[fg].r * (64-bglevel) + pal[bg].r * bglevel) >> 8, 63);
int g = MIN((pal[fg].g * (64-bglevel) + pal[bg].g * bglevel) >> 8, 63); int g = MIN((pal[fg].g * (64-bglevel) + pal[bg].g * bglevel) >> 8, 63);
int b = MIN((pal[fg].b * (64-bglevel) + pal[bg].b * bglevel) >> 8, 63); int b = MIN((pal[fg].b * (64-bglevel) + pal[bg].b * bglevel) >> 8, 63);

2
src/gl/data/gl_data.cpp
View file

@ -590,7 +590,7 @@ CCMD(dumpgeometry)
subsector_t * sub = sector.subsectors[j]; subsector_t * sub = sector.subsectors[j];
Printf(PRINT_LOG, " Subsector %d - real sector = %d - %s\n", int(sub-subsectors), sub->sector->sectornum, sub->hacked&1? "hacked":""); Printf(PRINT_LOG, " Subsector %d - real sector = %d - %s\n", int(sub-subsectors), sub->sector->sectornum, sub->hacked&1? "hacked":"");
for(DWORD k=0;k<sub->numlines;k++) for(uint32_t k=0;k<sub->numlines;k++)
{ {
seg_t * seg = sub->firstline + k; seg_t * seg = sub->firstline + k;
if (seg->linedef) if (seg->linedef)

4
src/gl/data/gl_portaldata.cpp
View file

@ -325,9 +325,9 @@ void gl_BuildPortalCoverage(FPortalCoverage *coverage, subsector_t *subsector, c
build.center.y = xs_CRoundToInt(centery / subsector->numlines); build.center.y = xs_CRoundToInt(centery / subsector->numlines);
build.CollectNode(nodes + numnodes - 1, shape); build.CollectNode(nodes + numnodes - 1, shape);
coverage->subsectors = new DWORD[build.collect.Size()]; coverage->subsectors = new uint32_t[build.collect.Size()];
coverage->sscount = build.collect.Size(); coverage->sscount = build.collect.Size();
memcpy(coverage->subsectors, &build.collect[0], build.collect.Size() * sizeof(DWORD)); memcpy(coverage->subsectors, &build.collect[0], build.collect.Size() * sizeof(uint32_t));
} }
//========================================================================== //==========================================================================

10
src/gl/data/gl_setup.cpp
View file

@ -67,7 +67,7 @@ static void DoSetMapSection(subsector_t *sub, int num)
for (unsigned a = 0; a < MapSectionCollector.Size(); a++) for (unsigned a = 0; a < MapSectionCollector.Size(); a++)
{ {
sub = MapSectionCollector[a]; sub = MapSectionCollector[a];
for (DWORD i = 0; i < sub->numlines; i++) for (uint32_t i = 0; i < sub->numlines; i++)
{ {
seg_t * seg = sub->firstline + i; seg_t * seg = sub->firstline + i;
@ -126,7 +126,7 @@ static int MergeMapSections(int num)
cvertex_t vt; cvertex_t vt;
// first step: Set mapsection for all vertex positions. // first step: Set mapsection for all vertex positions.
for(DWORD i=0;i<(DWORD)numsegs;i++) for(uint32_t i=0;i<(uint32_t)numsegs;i++)
{ {
seg_t * seg = &segs[i]; seg_t * seg = &segs[i];
int section = seg->Subsector->mapsection; int section = seg->Subsector->mapsection;
@ -138,7 +138,7 @@ static int MergeMapSections(int num)
} }
// second step: Check if any seg references more than one mapsection, either by subsector or by vertex // second step: Check if any seg references more than one mapsection, either by subsector or by vertex
for(DWORD i=0;i<(DWORD)numsegs;i++) for(uint32_t i=0;i<(uint32_t)numsegs;i++)
{ {
seg_t * seg = &segs[i]; seg_t * seg = &segs[i];
int section = seg->Subsector->mapsection; int section = seg->Subsector->mapsection;
@ -219,7 +219,7 @@ static void SetMapSections()
static void SpreadHackedFlag(subsector_t * sub) static void SpreadHackedFlag(subsector_t * sub)
{ {
// The subsector pointer hasn't been set yet! // The subsector pointer hasn't been set yet!
for(DWORD i=0;i<sub->numlines;i++) for(uint32_t i=0;i<sub->numlines;i++)
{ {
seg_t * seg = sub->firstline + i; seg_t * seg = sub->firstline + i;
@ -276,7 +276,7 @@ static void PrepareSectorData()
if (subsectors[i].sector == subsectors[i].render_sector) if (subsectors[i].sector == subsectors[i].render_sector)
{ {
seg_t * seg = subsectors[i].firstline; seg_t * seg = subsectors[i].firstline;
for(DWORD j=0;j<subsectors[i].numlines;j++) for(uint32_t j=0;j<subsectors[i].numlines;j++)
{ {
if (!(subsectors[i].hacked&1) && seg[j].linedef==0 && if (!(subsectors[i].hacked&1) && seg[j].linedef==0 &&
seg[j].PartnerSeg!=NULL && seg[j].PartnerSeg!=NULL &&

2
src/gl/scene/gl_bsp.cpp
View file

@ -468,7 +468,7 @@ static void DoSubsector(subsector_t * sub)
{ {
SetupSprite.Clock(); SetupSprite.Clock();
for (i = ParticlesInSubsec[DWORD(sub-subsectors)]; i != NO_PARTICLE; i = Particles[i].snext) for (i = ParticlesInSubsec[uint32_t(sub-subsectors)]; i != NO_PARTICLE; i = Particles[i].snext)
{ {
GLRenderer->ProcessParticle(&Particles[i], fakesector); GLRenderer->ProcessParticle(&Particles[i], fakesector);
} }

44
src/gl/scene/gl_renderhacks.cpp
View file

@ -260,13 +260,13 @@ bool FDrawInfo::DoOneSectorUpper(subsector_t * subsec, float Planez)
{ {
// Is there a one-sided wall in this sector? // Is there a one-sided wall in this sector?
// Do this first to avoid unnecessary recursion // Do this first to avoid unnecessary recursion
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
if (subsec->firstline[i].backsector == NULL) return false; if (subsec->firstline[i].backsector == NULL) return false;
if (subsec->firstline[i].PartnerSeg == NULL) return false; if (subsec->firstline[i].PartnerSeg == NULL) return false;
} }
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
seg_t * seg = subsec->firstline + i; seg_t * seg = subsec->firstline + i;
subsector_t * backsub = seg->PartnerSeg->Subsector; subsector_t * backsub = seg->PartnerSeg->Subsector;
@ -318,13 +318,13 @@ bool FDrawInfo::DoOneSectorLower(subsector_t * subsec, float Planez)
{ {
// Is there a one-sided wall in this subsector? // Is there a one-sided wall in this subsector?
// Do this first to avoid unnecessary recursion // Do this first to avoid unnecessary recursion
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
if (subsec->firstline[i].backsector == NULL) return false; if (subsec->firstline[i].backsector == NULL) return false;
if (subsec->firstline[i].PartnerSeg == NULL) return false; if (subsec->firstline[i].PartnerSeg == NULL) return false;
} }
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
seg_t * seg = subsec->firstline + i; seg_t * seg = subsec->firstline + i;
subsector_t * backsub = seg->PartnerSeg->Subsector; subsector_t * backsub = seg->PartnerSeg->Subsector;
@ -377,13 +377,13 @@ bool FDrawInfo::DoFakeBridge(subsector_t * subsec, float Planez)
{ {
// Is there a one-sided wall in this sector? // Is there a one-sided wall in this sector?
// Do this first to avoid unnecessary recursion // Do this first to avoid unnecessary recursion
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
if (subsec->firstline[i].backsector == NULL) return false; if (subsec->firstline[i].backsector == NULL) return false;
if (subsec->firstline[i].PartnerSeg == NULL) return false; if (subsec->firstline[i].PartnerSeg == NULL) return false;
} }
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
seg_t * seg = subsec->firstline + i; seg_t * seg = subsec->firstline + i;
subsector_t * backsub = seg->PartnerSeg->Subsector; subsector_t * backsub = seg->PartnerSeg->Subsector;
@ -430,13 +430,13 @@ bool FDrawInfo::DoFakeCeilingBridge(subsector_t * subsec, float Planez)
{ {
// Is there a one-sided wall in this sector? // Is there a one-sided wall in this sector?
// Do this first to avoid unnecessary recursion // Do this first to avoid unnecessary recursion
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
if (subsec->firstline[i].backsector == NULL) return false; if (subsec->firstline[i].backsector == NULL) return false;
if (subsec->firstline[i].PartnerSeg == NULL) return false; if (subsec->firstline[i].PartnerSeg == NULL) return false;
} }
for (DWORD i = 0; i < subsec->numlines; i++) for (uint32_t i = 0; i < subsec->numlines; i++)
{ {
seg_t * seg = subsec->firstline + i; seg_t * seg = subsec->firstline + i;
subsector_t * backsub = seg->PartnerSeg->Subsector; subsector_t * backsub = seg->PartnerSeg->Subsector;
@ -732,7 +732,7 @@ bool FDrawInfo::CheckAnchorFloor(subsector_t * sub)
if (sub->hacked==3) return true; if (sub->hacked==3) return true;
if (sub->flags & SSECF_DEGENERATE) return false; if (sub->flags & SSECF_DEGENERATE) return false;
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (!seg->PartnerSeg) return true; if (!seg->PartnerSeg) return true;
@ -781,7 +781,7 @@ bool FDrawInfo::CollectSubsectorsFloor(subsector_t * sub, sector_t * anchor)
if (!(sub->flags & SSECF_DEGENERATE)) if (!(sub->flags & SSECF_DEGENERATE))
{ {
// Is not being rendered so don't bother. // Is not being rendered so don't bother.
if (!(ss_renderflags[DWORD(sub - subsectors)] & SSRF_PROCESSED)) return true; if (!(ss_renderflags[uint32_t(sub - subsectors)] & SSRF_PROCESSED)) return true;
if (sub->render_sector->GetTexture(sector_t::floor) != anchor->GetTexture(sector_t::floor) || if (sub->render_sector->GetTexture(sector_t::floor) != anchor->GetTexture(sector_t::floor) ||
sub->render_sector->GetPlaneTexZ(sector_t::floor) != anchor->GetPlaneTexZ(sector_t::floor) || sub->render_sector->GetPlaneTexZ(sector_t::floor) != anchor->GetPlaneTexZ(sector_t::floor) ||
@ -794,7 +794,7 @@ bool FDrawInfo::CollectSubsectorsFloor(subsector_t * sub, sector_t * anchor)
// We can assume that all segs in this subsector are connected to a subsector that has // We can assume that all segs in this subsector are connected to a subsector that has
// to be checked as well // to be checked as well
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -838,7 +838,7 @@ bool FDrawInfo::CheckAnchorCeiling(subsector_t * sub)
if (sub->hacked==3) return true; if (sub->hacked==3) return true;
if (sub->flags & SSECF_DEGENERATE) return false; if (sub->flags & SSECF_DEGENERATE) return false;
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (!seg->PartnerSeg) return true; if (!seg->PartnerSeg) return true;
@ -883,7 +883,7 @@ bool FDrawInfo::CollectSubsectorsCeiling(subsector_t * sub, sector_t * anchor)
if (!(sub->flags & SSECF_DEGENERATE)) if (!(sub->flags & SSECF_DEGENERATE))
{ {
// Is not being rendererd so don't bother. // Is not being rendererd so don't bother.
if (!(ss_renderflags[DWORD(sub-subsectors)]&SSRF_PROCESSED)) return true; if (!(ss_renderflags[uint32_t(sub-subsectors)]&SSRF_PROCESSED)) return true;
if (sub->render_sector->GetTexture(sector_t::ceiling) != anchor->GetTexture(sector_t::ceiling) || if (sub->render_sector->GetTexture(sector_t::ceiling) != anchor->GetTexture(sector_t::ceiling) ||
sub->render_sector->GetPlaneTexZ(sector_t::ceiling) != anchor->GetPlaneTexZ(sector_t::ceiling) || sub->render_sector->GetPlaneTexZ(sector_t::ceiling) != anchor->GetPlaneTexZ(sector_t::ceiling) ||
@ -895,7 +895,7 @@ bool FDrawInfo::CollectSubsectorsCeiling(subsector_t * sub, sector_t * anchor)
// We can assume that all segs in this subsector are connected to a subsector that has // We can assume that all segs in this subsector are connected to a subsector that has
// to be checked as well // to be checked as well
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -1037,7 +1037,7 @@ void FDrawInfo::CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor)
if (sub->render_sector->GetGLPortal(sector_t::ceiling) != nullptr) return; if (sub->render_sector->GetGLPortal(sector_t::ceiling) != nullptr) return;
// Don't bother processing unrendered subsectors // Don't bother processing unrendered subsectors
if (sub->numlines>2 && !(ss_renderflags[DWORD(sub-subsectors)]&SSRF_PROCESSED)) return; if (sub->numlines>2 && !(ss_renderflags[uint32_t(sub-subsectors)]&SSRF_PROCESSED)) return;
// Must be the exact same visplane // Must be the exact same visplane
sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false); sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false);
@ -1053,7 +1053,7 @@ void FDrawInfo::CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor)
HandledSubsectors.Push (sub); HandledSubsectors.Push (sub);
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -1080,7 +1080,7 @@ void FDrawInfo::CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor)
if (sub->render_sector->GetGLPortal(sector_t::floor) != nullptr) return; if (sub->render_sector->GetGLPortal(sector_t::floor) != nullptr) return;
// Don't bother processing unrendered subsectors // Don't bother processing unrendered subsectors
if (sub->numlines>2 && !(ss_renderflags[DWORD(sub-subsectors)]&SSRF_PROCESSED)) return; if (sub->numlines>2 && !(ss_renderflags[uint32_t(sub-subsectors)]&SSRF_PROCESSED)) return;
// Must be the exact same visplane // Must be the exact same visplane
sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false); sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false);
@ -1096,7 +1096,7 @@ void FDrawInfo::CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor)
HandledSubsectors.Push (sub); HandledSubsectors.Push (sub);
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -1130,7 +1130,7 @@ void FDrawInfo::ProcessSectorStacks()
if (ss_renderflags[sub-subsectors] & SSRF_PROCESSED) if (ss_renderflags[sub-subsectors] & SSRF_PROCESSED)
{ {
HandledSubsectors.Clear(); HandledSubsectors.Clear();
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -1143,7 +1143,7 @@ void FDrawInfo::ProcessSectorStacks()
for(unsigned int j=0;j<HandledSubsectors.Size();j++) for(unsigned int j=0;j<HandledSubsectors.Size();j++)
{ {
subsector_t *sub = HandledSubsectors[j]; subsector_t *sub = HandledSubsectors[j];
ss_renderflags[DWORD(sub-subsectors)] &= ~SSRF_RENDERCEILING; ss_renderflags[uint32_t(sub-subsectors)] &= ~SSRF_RENDERCEILING;
if (sub->portalcoverage[sector_t::ceiling].subsectors == NULL) if (sub->portalcoverage[sector_t::ceiling].subsectors == NULL)
{ {
@ -1174,7 +1174,7 @@ void FDrawInfo::ProcessSectorStacks()
if (ss_renderflags[sub-subsectors] & SSRF_PROCESSED) if (ss_renderflags[sub-subsectors] & SSRF_PROCESSED)
{ {
HandledSubsectors.Clear(); HandledSubsectors.Clear();
for(DWORD j=0;j<sub->numlines;j++) for(uint32_t j=0;j<sub->numlines;j++)
{ {
seg_t * seg = sub->firstline + j; seg_t * seg = sub->firstline + j;
if (seg->PartnerSeg) if (seg->PartnerSeg)
@ -1188,7 +1188,7 @@ void FDrawInfo::ProcessSectorStacks()
for(unsigned int j=0;j<HandledSubsectors.Size();j++) for(unsigned int j=0;j<HandledSubsectors.Size();j++)
{ {
subsector_t *sub = HandledSubsectors[j]; subsector_t *sub = HandledSubsectors[j];
ss_renderflags[DWORD(sub-subsectors)] &= ~SSRF_RENDERFLOOR; ss_renderflags[uint32_t(sub-subsectors)] &= ~SSRF_RENDERFLOOR;
if (sub->portalcoverage[sector_t::floor].subsectors == NULL) if (sub->portalcoverage[sector_t::floor].subsectors == NULL)
{ {

4
src/gl/scene/gl_sprite.cpp
View file

@ -162,7 +162,7 @@ void GLSprite::CalculateVertices(FVector3 *v)
// [fgsfds] check sprite type mask // [fgsfds] check sprite type mask
DWORD spritetype = (DWORD)-1; uint32_t spritetype = (uint32_t)-1;
if (actor != nullptr) spritetype = actor->renderflags & RF_SPRITETYPEMASK; if (actor != nullptr) spritetype = actor->renderflags & RF_SPRITETYPEMASK;
// [Nash] is a flat sprite // [Nash] is a flat sprite
@ -758,7 +758,7 @@ void GLSprite::Process(AActor* thing, sector_t * sector, int thruportal)
topclip = rendersector->PortalBlocksMovement(sector_t::ceiling) ? LARGE_VALUE : rendersector->GetPortalPlaneZ(sector_t::ceiling); topclip = rendersector->PortalBlocksMovement(sector_t::ceiling) ? LARGE_VALUE : rendersector->GetPortalPlaneZ(sector_t::ceiling);
bottomclip = rendersector->PortalBlocksMovement(sector_t::floor) ? -LARGE_VALUE : rendersector->GetPortalPlaneZ(sector_t::floor); bottomclip = rendersector->PortalBlocksMovement(sector_t::floor) ? -LARGE_VALUE : rendersector->GetPortalPlaneZ(sector_t::floor);
DWORD spritetype = (thing->renderflags & RF_SPRITETYPEMASK); uint32_t spritetype = (thing->renderflags & RF_SPRITETYPEMASK);
x = thingpos.X; x = thingpos.X;
z = thingpos.Z; z = thingpos.Z;
y = thingpos.Y; y = thingpos.Y;

2
src/gl/system/gl_wipe.cpp
View file

@ -527,7 +527,7 @@ bool OpenGLFrameBuffer::Wiper_Burn::Run(int ticks, OpenGLFrameBuffer *fb)
uint8_t rgb_buffer[WIDTH*HEIGHT*4]; uint8_t rgb_buffer[WIDTH*HEIGHT*4];
const uint8_t *src = BurnArray; const uint8_t *src = BurnArray;
DWORD *dest = (DWORD *)rgb_buffer; uint32_t *dest = (uint32_t *)rgb_buffer;
for (int y = HEIGHT; y != 0; --y) for (int y = HEIGHT; y != 0; --y)
{ {
for (int x = WIDTH; x != 0; --x) for (int x = WIDTH; x != 0; --x)

6
src/gl/textures/gl_material.cpp
View file

@ -130,7 +130,7 @@ unsigned char *FGLTexture::LoadHiresTexture(FTexture *tex, int *width, int *heig
{ {
// This is a crappy Doomsday color keyed image // This is a crappy Doomsday color keyed image
// We have to remove the key manually. :( // We have to remove the key manually. :(
DWORD * dwdata=(DWORD*)buffer; uint32_t * dwdata=(uint32_t*)buffer;
for (int i=(w*h);i>0;i--) for (int i=(w*h);i>0;i--)
{ {
if (dwdata[i]==0xffffff00 || dwdata[i]==0xffff00ff) dwdata[i]=0; if (dwdata[i]==0xffffff00 || dwdata[i]==0xffff00ff) dwdata[i]=0;
@ -285,7 +285,7 @@ const FHardwareTexture *FGLTexture::Bind(int texunit, int clampmode, int transla
if (translation <= 0) translation = -translation; if (translation <= 0) translation = -translation;
else else
{ {
alphatrans = (gl.legacyMode && DWORD(translation) == TRANSLATION(TRANSLATION_Standard, 8)); alphatrans = (gl.legacyMode && uint32_t(translation) == TRANSLATION(TRANSLATION_Standard, 8));
translation = GLTranslationPalette::GetInternalTranslation(translation); translation = GLTranslationPalette::GetInternalTranslation(translation);
} }
@ -319,7 +319,7 @@ const FHardwareTexture *FGLTexture::Bind(int texunit, int clampmode, int transla
// need to do software warping // need to do software warping
FWarpTexture *wt = static_cast<FWarpTexture*>(tex); FWarpTexture *wt = static_cast<FWarpTexture*>(tex);
unsigned char *warpbuffer = new unsigned char[w*h*4]; unsigned char *warpbuffer = new unsigned char[w*h*4];
WarpBuffer((DWORD*)warpbuffer, (const DWORD*)buffer, w, h, wt->WidthOffsetMultiplier, wt->HeightOffsetMultiplier, r_FrameTime, wt->Speed, tex->bWarped); WarpBuffer((uint32_t*)warpbuffer, (const uint32_t*)buffer, w, h, wt->WidthOffsetMultiplier, wt->HeightOffsetMultiplier, r_FrameTime, wt->Speed, tex->bWarped);
delete[] buffer; delete[] buffer;
buffer = warpbuffer; buffer = warpbuffer;
wt->GenTime = r_FrameTime; wt->GenTime = r_FrameTime;

10
src/gl/textures/gl_texture.cpp
View file

@ -167,7 +167,7 @@ void gl_GenerateGlobalBrightmapFromColormap()
// component becomes one. // component becomes one.
// //
//=========================================================================== //===========================================================================
static PalEntry averageColor(const DWORD *data, int size, int maxout) static PalEntry averageColor(const uint32_t *data, int size, int maxout)
{ {
int i; int i;
unsigned int r, g, b; unsigned int r, g, b;
@ -311,7 +311,7 @@ void FTexture::GetGlowColor(float *data)
if (buffer) if (buffer)
{ {
gl_info.GlowColor = averageColor((DWORD *) buffer, w*h, 153); gl_info.GlowColor = averageColor((uint32_t *) buffer, w*h, 153);
delete[] buffer; delete[] buffer;
} }
@ -426,10 +426,10 @@ void FTexture::CheckTrans(unsigned char * buffer, int size, int trans)
gl_info.mIsTransparent = trans; gl_info.mIsTransparent = trans;
if (trans == -1) if (trans == -1)
{ {
DWORD * dwbuf = (DWORD*)buffer; uint32_t * dwbuf = (uint32_t*)buffer;
for(int i=0;i<size;i++) for(int i=0;i<size;i++)
{ {
DWORD alpha = dwbuf[i]>>24; uint32_t alpha = dwbuf[i]>>24;
if (alpha != 0xff && alpha != 0) if (alpha != 0xff && alpha != 0)
{ {
@ -457,7 +457,7 @@ void FTexture::CheckTrans(unsigned char * buffer, int size, int trans)
#define SOME_MASK 0x00ffffff #define SOME_MASK 0x00ffffff
#endif #endif
#define CHKPIX(ofs) (l1[(ofs)*4+MSB]==255 ? (( ((DWORD*)l1)[0] = ((DWORD*)l1)[ofs]&SOME_MASK), trans=true ) : false) #define CHKPIX(ofs) (l1[(ofs)*4+MSB]==255 ? (( ((uint32_t*)l1)[0] = ((uint32_t*)l1)[ofs]&SOME_MASK), trans=true ) : false)
bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h) bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h)
{ {

2
src/gl/utility/gl_clock.cpp
View file

@ -104,7 +104,7 @@ void gl_CalculateCPUSpeed ()
do do
{ {
QueryPerformanceCounter (&count2); QueryPerformanceCounter (&count2);
} while ((DWORD)((unsigned __int64)count2.QuadPart - (unsigned __int64)count1.QuadPart) < minDiff); } while ((uint32_t)((uint64_t)count2.QuadPart - (uint64_t)count1.QuadPart) < minDiff);
ClockCalibration = __rdtsc() - ClockCalibration; ClockCalibration = __rdtsc() - ClockCalibration;
QueryPerformanceCounter (&count2); QueryPerformanceCounter (&count2);
SetPriorityClass (GetCurrentProcess (), NORMAL_PRIORITY_CLASS); SetPriorityClass (GetCurrentProcess (), NORMAL_PRIORITY_CLASS);

22
src/oplsynth/opl_mus_player.cpp
View file

@ -75,8 +75,8 @@ fail: delete[] scoredata;
} }
// Check for RDosPlay raw OPL format // Check for RDosPlay raw OPL format
if (((DWORD *)scoredata)[0] == MAKE_ID('R','A','W','A') && if (((uint32_t *)scoredata)[0] == MAKE_ID('R','A','W','A') &&
((DWORD *)scoredata)[1] == MAKE_ID('D','A','T','A')) ((uint32_t *)scoredata)[1] == MAKE_ID('D','A','T','A'))
{ {
RawPlayer = RDosPlay; RawPlayer = RDosPlay;
if (*(uint16_t *)(scoredata + 8) == 0) if (*(uint16_t *)(scoredata + 8) == 0)
@ -86,16 +86,16 @@ fail: delete[] scoredata;
SamplesPerTick = LittleShort(*(uint16_t *)(scoredata + 8)) / ADLIB_CLOCK_MUL; SamplesPerTick = LittleShort(*(uint16_t *)(scoredata + 8)) / ADLIB_CLOCK_MUL;
} }
// Check for DosBox OPL dump // Check for DosBox OPL dump
else if (((DWORD *)scoredata)[0] == MAKE_ID('D','B','R','A') && else if (((uint32_t *)scoredata)[0] == MAKE_ID('D','B','R','A') &&
((DWORD *)scoredata)[1] == MAKE_ID('W','O','P','L')) ((uint32_t *)scoredata)[1] == MAKE_ID('W','O','P','L'))
{ {
if (LittleShort(((uint16_t *)scoredata)[5]) == 1) if (LittleShort(((uint16_t *)scoredata)[5]) == 1)
{ {
RawPlayer = DosBox1; RawPlayer = DosBox1;
SamplesPerTick = OPL_SAMPLE_RATE / 1000; SamplesPerTick = OPL_SAMPLE_RATE / 1000;
ScoreLen = MIN<int>(ScoreLen - 24, LittleLong(((DWORD *)scoredata)[4])) + 24; ScoreLen = MIN<int>(ScoreLen - 24, LittleLong(((uint32_t *)scoredata)[4])) + 24;
} }
else if (((DWORD *)scoredata)[2] == MAKE_ID(2,0,0,0)) else if (((uint32_t *)scoredata)[2] == MAKE_ID(2,0,0,0))
{ {
bool okay = true; bool okay = true;
if (scoredata[21] != 0) if (scoredata[21] != 0)
@ -113,7 +113,7 @@ fail: delete[] scoredata;
RawPlayer = DosBox2; RawPlayer = DosBox2;
SamplesPerTick = OPL_SAMPLE_RATE / 1000; SamplesPerTick = OPL_SAMPLE_RATE / 1000;
int headersize = 0x1A + scoredata[0x19]; int headersize = 0x1A + scoredata[0x19];
ScoreLen = MIN<int>(ScoreLen - headersize, LittleLong(((DWORD *)scoredata)[3]) * 2) + headersize; ScoreLen = MIN<int>(ScoreLen - headersize, LittleLong(((uint32_t *)scoredata)[3]) * 2) + headersize;
} }
else else
{ {
@ -122,7 +122,7 @@ fail: delete[] scoredata;
} }
} }
// Check for modified IMF format (includes a header) // Check for modified IMF format (includes a header)
else if (((DWORD *)scoredata)[0] == MAKE_ID('A','D','L','I') && else if (((uint32_t *)scoredata)[0] == MAKE_ID('A','D','L','I') &&
scoredata[4] == 'B' && scoredata[5] == 1) scoredata[4] == 'B' && scoredata[5] == 1)
{ {
int songlen; int songlen;
@ -143,7 +143,7 @@ fail: delete[] scoredata;
scoredata = NULL; scoredata = NULL;
return; return;
} }
songlen = LittleLong(*(DWORD *)score); songlen = LittleLong(*(uint32_t *)score);
if (songlen != 0 && (songlen +=4) < ScoreLen - (score - scoredata)) if (songlen != 0 && (songlen +=4) < ScoreLen - (score - scoredata))
{ {
ScoreLen = songlen + int(score - scoredata); ScoreLen = songlen + int(score - scoredata);
@ -207,7 +207,7 @@ void OPLmusicFile::Restart ()
while (*score++ != '\0') {} while (*score++ != '\0') {}
} }
score++; // Skip unknown byte score++; // Skip unknown byte
if (*(DWORD *)score != 0) if (*(uint32_t *)score != 0)
{ {
score += 4; // Skip song length score += 4; // Skip song length
} }
@ -487,7 +487,7 @@ int OPLmusicFile::PlayTick ()
delay = 0; delay = 0;
while (delay == 0 && score + 4 - scoredata <= ScoreLen) while (delay == 0 && score + 4 - scoredata <= ScoreLen)
{ {
if (*(DWORD *)score == 0xFFFFFFFF) if (*(uint32_t *)score == 0xFFFFFFFF)
{ // This is a special value that means to end the song. { // This is a special value that means to end the song.
return 0; return 0;
} }

4
src/posix/cocoa/i_system.mm
View file

@ -53,7 +53,7 @@
EXTERN_CVAR(String, language) EXTERN_CVAR(String, language)
DWORD LanguageIDs[4]; uint32_t LanguageIDs[4];
int (*I_GetTime)(bool saveMS); int (*I_GetTime)(bool saveMS);
@ -88,7 +88,7 @@ void SetLanguageIDs()
{ {
size_t langlen = strlen(language); size_t langlen = strlen(language);
DWORD lang = (langlen < 2 || langlen > 3) uint32_t lang = (langlen < 2 || langlen > 3)
? MAKE_ID('e', 'n', 'u', '\0') ? MAKE_ID('e', 'n', 'u', '\0')
: MAKE_ID(language[0], language[1], language[2], '\0'); : MAKE_ID(language[0], language[1], language[2], '\0');

6
src/posix/cocoa/i_video.mm
View file

@ -1376,7 +1376,7 @@ void I_ClosestResolution(int *width, int *height, int bits)
int twidth, theight; int twidth, theight;
int cwidth = 0, cheight = 0; int cwidth = 0, cheight = 0;
int iteration; int iteration;
DWORD closest = DWORD(-1); uint32_t closest = uint32_t(-1);
for (iteration = 0; iteration < 2; ++iteration) for (iteration = 0; iteration < 2; ++iteration)
{ {
@ -1394,7 +1394,7 @@ void I_ClosestResolution(int *width, int *height, int bits)
continue; continue;
} }
const DWORD dist = (twidth - *width) * (twidth - *width) const uint32_t dist = (twidth - *width) * (twidth - *width)
+ (theight - *height) * (theight - *height); + (theight - *height) * (theight - *height);
if (dist < closest) if (dist < closest)
@ -1405,7 +1405,7 @@ void I_ClosestResolution(int *width, int *height, int bits)
} }
} }
if (closest != DWORD(-1)) if (closest != uint32_t(-1))
{ {
*width = cwidth; *width = cwidth;
*height = cheight; *height = cheight;

2
src/posix/cocoa/st_console.mm
View file

@ -53,7 +53,7 @@ static NSColor* RGB(const PalEntry& color)
return RGB(color.r, color.g, color.b); return RGB(color.r, color.g, color.b);
} }
static NSColor* RGB(const DWORD color) static NSColor* RGB(const uint32_t color)
{ {
return RGB(PalEntry(color)); return RGB(PalEntry(color));
} }

2
src/posix/i_system.h
View file

@ -43,7 +43,7 @@ enum
LANGIDX_SysPreferred, LANGIDX_SysPreferred,
LANGIDX_SysDefault LANGIDX_SysDefault
}; };
extern DWORD LanguageIDs[4]; extern uint32_t LanguageIDs[4];
extern void SetLanguageIDs (); extern void SetLanguageIDs ();
// Called by DoomMain. // Called by DoomMain.

4
src/posix/sdl/hardware.cpp
View file

@ -195,7 +195,7 @@ void I_ClosestResolution (int *width, int *height, int bits)
int twidth, theight; int twidth, theight;
int cwidth = 0, cheight = 0; int cwidth = 0, cheight = 0;
int iteration; int iteration;
DWORD closest = 4294967295u; uint32_t closest = 4294967295u;
for (iteration = 0; iteration < 2; iteration++) for (iteration = 0; iteration < 2; iteration++)
{ {
@ -208,7 +208,7 @@ void I_ClosestResolution (int *width, int *height, int bits)
if (iteration == 0 && (twidth < *width || theight < *height)) if (iteration == 0 && (twidth < *width || theight < *height))
continue; continue;
DWORD dist = (twidth - *width) * (twidth - *width) uint32_t dist = (twidth - *width) * (twidth - *width)
+ (theight - *height) * (theight - *height); + (theight - *height) * (theight - *height);
if (dist < closest) if (dist < closest)

4
src/posix/sdl/i_system.cpp
View file

@ -84,7 +84,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad);
int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad); int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad);
#endif #endif
DWORD LanguageIDs[4]; uint32_t LanguageIDs[4];
int (*I_GetTime) (bool saveMS); int (*I_GetTime) (bool saveMS);
int (*I_WaitForTic) (int); int (*I_WaitForTic) (int);
@ -123,7 +123,7 @@ void SetLanguageIDs ()
{ {
size_t langlen = strlen(language); size_t langlen = strlen(language);
DWORD lang = (langlen < 2 || langlen > 3) ? uint32_t lang = (langlen < 2 || langlen > 3) ?
MAKE_ID('e','n','u','\0') : MAKE_ID('e','n','u','\0') :
MAKE_ID(language[0],language[1],language[2],'\0'); MAKE_ID(language[0],language[1],language[2],'\0');

10
src/posix/sdl/i_timer.cpp
View file

@ -13,14 +13,14 @@
#include "templates.h" #include "templates.h"
static DWORD TicStart; static uint32_t TicStart;
static DWORD BaseTime; static uint32_t BaseTime;
static int TicFrozen; static int TicFrozen;
// Signal based timer. // Signal based timer.
static Semaphore timerWait; static Semaphore timerWait;
static int tics; static int tics;
static DWORD sig_start; static uint32_t sig_start;
void I_SelectTimer(); void I_SelectTimer();
@ -54,7 +54,7 @@ int I_GetTimePolled (bool saveMS)
return TicFrozen; return TicFrozen;
} }
DWORD tm = SDL_GetTicks(); uint32_t tm = SDL_GetTicks();
if (saveMS) if (saveMS)
{ {
@ -179,7 +179,7 @@ void I_SelectTimer()
// Returns the fractional amount of a tic passed since the most recent tic // Returns the fractional amount of a tic passed since the most recent tic
double I_GetTimeFrac (uint32_t *ms) double I_GetTimeFrac (uint32_t *ms)
{ {
DWORD now = SDL_GetTicks (); uint32_t now = SDL_GetTicks ();
if (ms) *ms = TicStart + (1000 / TICRATE); if (ms) *ms = TicStart + (1000 / TICRATE);
if (TicStart == 0) if (TicStart == 0)
{ {

12
src/r_data/colormaps.cpp
View file

@ -292,7 +292,7 @@ void FDynamicColormap::BuildLights ()
Fade.r, Fade.g, Fade.b, l * (256 / NUMCOLORMAPS)); Fade.r, Fade.g, Fade.b, l * (256 / NUMCOLORMAPS));
shade = Maps + 256*l; shade = Maps + 256*l;
if ((DWORD)Color == MAKERGB(255,255,255)) if ((uint32_t)Color == MAKERGB(255,255,255))
{ // White light, so we can just pick the colors directly { // White light, so we can just pick the colors directly
for (c = 0; c < 256; c++) for (c = 0; c < 256; c++)
{ {
@ -485,9 +485,9 @@ void R_InitColormaps ()
cm.blend = 0; cm.blend = 0;
fakecmaps.Push(cm); fakecmaps.Push(cm);
DWORD NumLumps = Wads.GetNumLumps(); uint32_t NumLumps = Wads.GetNumLumps();
for (DWORD i = 0; i < NumLumps; i++) for (uint32_t i = 0; i < NumLumps; i++)
{ {
if (Wads.GetLumpNamespace(i) == ns_colormaps) if (Wads.GetLumpNamespace(i) == ns_colormaps)
{ {
@ -650,7 +650,7 @@ static bool R_CheckForFixedLights(const uint8_t *colormaps)
// //
//========================================================================== //==========================================================================
DWORD R_ColormapNumForName (const char *name) uint32_t R_ColormapNumForName (const char *name)
{ {
if (strnicmp (name, "COLORMAP", 8)) if (strnicmp (name, "COLORMAP", 8))
{ // COLORMAP always returns 0 { // COLORMAP always returns 0
@ -674,8 +674,8 @@ DWORD R_ColormapNumForName (const char *name)
// //
//========================================================================== //==========================================================================
DWORD R_BlendForColormap (DWORD map) uint32_t R_BlendForColormap (uint32_t map)
{ {
return APART(map) ? map : return APART(map) ? map :
map < fakecmaps.Size() ? DWORD(fakecmaps[map].blend) : 0; map < fakecmaps.Size() ? uint32_t(fakecmaps[map].blend) : 0;
} }

4
src/r_data/colormaps.h
View file

@ -6,9 +6,9 @@ struct FSWColormap;
void R_InitColormaps (); void R_InitColormaps ();
void R_DeinitColormaps (); void R_DeinitColormaps ();
DWORD R_ColormapNumForName(const char *name); // killough 4/4/98 uint32_t R_ColormapNumForName(const char *name); // killough 4/4/98
void R_SetDefaultColormap (const char *name); // [RH] change normal fadetable void R_SetDefaultColormap (const char *name); // [RH] change normal fadetable
DWORD R_BlendForColormap (DWORD map); // [RH] return calculated blend for a colormap uint32_t R_BlendForColormap (uint32_t map); // [RH] return calculated blend for a colormap
extern FSWColormap realcolormaps; // [RH] make the colormaps externally visible extern FSWColormap realcolormaps; // [RH] make the colormaps externally visible
extern size_t numfakecmaps; extern size_t numfakecmaps;

6
src/r_data/r_translate.h
View file

@ -81,15 +81,15 @@ extern TAutoGrowArray<FRemapTablePtr, FRemapTable *> translationtables[NUM_TRANS
#define TRANSLATION_MASK ((1<<TRANSLATION_SHIFT)-1) #define TRANSLATION_MASK ((1<<TRANSLATION_SHIFT)-1)
#define TRANSLATIONTYPE_MASK (255<<TRANSLATION_SHIFT) #define TRANSLATIONTYPE_MASK (255<<TRANSLATION_SHIFT)
inline DWORD TRANSLATION(uint8_t a, DWORD b) inline uint32_t TRANSLATION(uint8_t a, uint32_t b)
{ {
return (a<<TRANSLATION_SHIFT) | b; return (a<<TRANSLATION_SHIFT) | b;
} }
inline int GetTranslationType(DWORD trans) inline int GetTranslationType(uint32_t trans)
{ {
return (trans&TRANSLATIONTYPE_MASK) >> TRANSLATION_SHIFT; return (trans&TRANSLATIONTYPE_MASK) >> TRANSLATION_SHIFT;
} }
inline int GetTranslationIndex(DWORD trans) inline int GetTranslationIndex(uint32_t trans)
{ {
return (trans&TRANSLATION_MASK); return (trans&TRANSLATION_MASK);
} }

12
src/r_data/sprites.cpp
View file

@ -21,7 +21,7 @@ void gl_InitModels();
// and range check thing_t sprites patches // and range check thing_t sprites patches
TArray<spritedef_t> sprites; TArray<spritedef_t> sprites;
TArray<spriteframe_t> SpriteFrames; TArray<spriteframe_t> SpriteFrames;
DWORD NumStdSprites; // The first x sprites that don't belong to skins. uint32_t NumStdSprites; // The first x sprites that don't belong to skins.
struct spriteframewithrotate : public spriteframe_t struct spriteframewithrotate : public spriteframe_t
{ {
@ -262,7 +262,7 @@ void R_InitSpriteDefs ()
char Frame; char Frame;
} *vhashes; } *vhashes;
unsigned int i, j, smax, vmax; unsigned int i, j, smax, vmax;
DWORD intname; uint32_t intname;
spriteframewithrotate sprtemp[MAX_SPRITE_FRAMES]; spriteframewithrotate sprtemp[MAX_SPRITE_FRAMES];
@ -510,7 +510,7 @@ void R_InitSkins (void)
spritedef_t temp; spritedef_t temp;
int sndlumps[NUMSKINSOUNDS]; int sndlumps[NUMSKINSOUNDS];
char key[65]; char key[65];
DWORD intname, crouchname; uint32_t intname, crouchname;
unsigned i; unsigned i;
int j, k, base; int j, k, base;
int lastlump; int lastlump;
@ -574,13 +574,13 @@ void R_InitSkins (void)
{ {
for (j = 3; j >= 0; j--) for (j = 3; j >= 0; j--)
sc.String[j] = toupper (sc.String[j]); sc.String[j] = toupper (sc.String[j]);
intname = *((DWORD *)sc.String); intname = *((uint32_t *)sc.String);
} }
else if (0 == stricmp (key, "crouchsprite")) else if (0 == stricmp (key, "crouchsprite"))
{ {
for (j = 3; j >= 0; j--) for (j = 3; j >= 0; j--)
sc.String[j] = toupper (sc.String[j]); sc.String[j] = toupper (sc.String[j]);
crouchname = *((DWORD *)sc.String); crouchname = *((uint32_t *)sc.String);
} }
else if (0 == stricmp (key, "face")) else if (0 == stricmp (key, "face"))
{ {
@ -787,7 +787,7 @@ void R_InitSkins (void)
for (k = base + 1; Wads.GetLumpNamespace(k) == basens; k++) for (k = base + 1; Wads.GetLumpNamespace(k) == basens; k++)
{ {
char lname[9]; char lname[9];
DWORD lnameint; uint32_t lnameint;
Wads.GetLumpName (lname, k); Wads.GetLumpName (lname, k);
memcpy(&lnameint, lname, 4); memcpy(&lnameint, lname, 4);
if (lnameint == intname) if (lnameint == intname)

4
src/r_data/voxels.cpp
View file

@ -482,7 +482,7 @@ void FVoxel::RemovePalette()
// //
//========================================================================== //==========================================================================
static bool VOX_ReadSpriteNames(FScanner &sc, TArray<DWORD> &vsprites) static bool VOX_ReadSpriteNames(FScanner &sc, TArray<uint32_t> &vsprites)
{ {
vsprites.Clear(); vsprites.Clear();
while (sc.GetString()) while (sc.GetString())
@ -644,7 +644,7 @@ void R_InitVoxels()
while ((lump = Wads.FindLump("VOXELDEF", &lastlump)) != -1) while ((lump = Wads.FindLump("VOXELDEF", &lastlump)) != -1)
{ {
FScanner sc(lump); FScanner sc(lump);
TArray<DWORD> vsprites; TArray<uint32_t> vsprites;
while (VOX_ReadSpriteNames(sc, vsprites)) while (VOX_ReadSpriteNames(sc, vsprites))
{ {

2
src/r_sky.cpp
View file

@ -161,7 +161,7 @@ void R_InitSkyMap ()
// //
//========================================================================== //==========================================================================
void R_UpdateSky (DWORD mstime) void R_UpdateSky (uint32_t mstime)
{ {
// Scroll the sky // Scroll the sky
double ms = (double)mstime * FRACUNIT; double ms = (double)mstime * FRACUNIT;

2
src/r_sky.h
View file

@ -38,6 +38,6 @@ extern int freelookviewheight;
// Called whenever the sky changes. // Called whenever the sky changes.
void R_InitSkyMap (); void R_InitSkyMap ();
void R_UpdateSky (DWORD mstime); void R_UpdateSky (uint32_t mstime);
#endif //__R_SKY_H__ #endif //__R_SKY_H__

2
src/r_state.h
View file

@ -40,7 +40,7 @@ extern "C" int viewheight;
// Lookup tables for map data. // Lookup tables for map data.
// //
extern TArray<spritedef_t> sprites; extern TArray<spritedef_t> sprites;
extern DWORD NumStdSprites; extern uint32_t NumStdSprites;
extern TArray<vertexdata_t> vertexdatas; extern TArray<vertexdata_t> vertexdatas;

16
src/swrenderer/r_swcanvas.cpp
View file

@ -549,7 +549,7 @@ void SWCanvas::DrawLine(DCanvas *canvas, int x0, int y0, int x1, int y1, int pal
} }
else else
{ // x-major line { // x-major line
fixed_t errorAdj = (((DWORD)deltaY << 16) / (DWORD)deltaX) & 0xffff; fixed_t errorAdj = (((uint32_t)deltaY << 16) / (uint32_t)deltaX) & 0xffff;
if (WeightingScale == 0) if (WeightingScale == 0)
{ {
@ -634,10 +634,10 @@ void SWCanvas::PUTTRANSDOT(DCanvas *canvas, int xx, int yy, int basecolor, int l
else if (!r_blendmethod) else if (!r_blendmethod)
{ {
uint8_t *spot = canvas->GetBuffer() + oldyyshifted + xx; uint8_t *spot = canvas->GetBuffer() + oldyyshifted + xx;
DWORD *bg2rgb = Col2RGB8[1 + level]; uint32_t *bg2rgb = Col2RGB8[1 + level];
DWORD *fg2rgb = Col2RGB8[63 - level]; uint32_t *fg2rgb = Col2RGB8[63 - level];
DWORD fg = fg2rgb[basecolor]; uint32_t fg = fg2rgb[basecolor];
DWORD bg = bg2rgb[*spot]; uint32_t bg = bg2rgb[*spot];
bg = (fg + bg) | 0x1f07c1f; bg = (fg + bg) | 0x1f07c1f;
*spot = RGB32k.All[bg&(bg >> 15)]; *spot = RGB32k.All[bg&(bg >> 15)];
} }
@ -771,8 +771,8 @@ void SWCanvas::Dim(DCanvas *canvas, PalEntry color, float damount, int x1, int y
} }
else else
{ {
DWORD *bg2rgb; uint32_t *bg2rgb;
DWORD fg; uint32_t fg;
uint8_t *spot = canvas->GetBuffer() + x1 + y1*Pitch; uint8_t *spot = canvas->GetBuffer() + x1 + y1*Pitch;
int gap = Pitch - w; int gap = Pitch - w;
@ -800,7 +800,7 @@ void SWCanvas::Dim(DCanvas *canvas, PalEntry color, float damount, int x1, int y
{ {
for (int x = w; x != 0; x--) for (int x = w; x != 0; x--)
{ {
DWORD bg; uint32_t bg;
bg = bg2rgb[(*spot) & 0xff]; bg = bg2rgb[(*spot) & 0xff];
bg = (fg + bg) | 0x1f07c1f; bg = (fg + bg) | 0x1f07c1f;

4
src/swrenderer/scene/r_portal.cpp
View file

@ -279,7 +279,7 @@ namespace swrenderer
// [ZZ] check depth. fill portal with black if it's exceeding the visual recursion limit, and continue like nothing happened. // [ZZ] check depth. fill portal with black if it's exceeding the visual recursion limit, and continue like nothing happened.
if (depth >= r_portal_recursions) if (depth >= r_portal_recursions)
{ {
uint8_t color = (uint8_t)BestColor((DWORD *)GPalette.BaseColors, 0, 0, 0, 0, 255); uint8_t color = (uint8_t)BestColor((uint32_t *)GPalette.BaseColors, 0, 0, 0, 0, 255);
int spacing = viewport->RenderTarget->GetPitch(); int spacing = viewport->RenderTarget->GetPitch();
for (int x = pds->x1; x < pds->x2; x++) for (int x = pds->x1; x < pds->x2; x++)
{ {
@ -479,7 +479,7 @@ namespace swrenderer
if (viewport->RenderTarget->IsBgra()) // Assuming this is just a debug function if (viewport->RenderTarget->IsBgra()) // Assuming this is just a debug function
return; return;
uint8_t color = (uint8_t)BestColor((DWORD *)GPalette.BaseColors, 255, 0, 0, 0, 255); uint8_t color = (uint8_t)BestColor((uint32_t *)GPalette.BaseColors, 255, 0, 0, 0, 255);
uint8_t* pixels = viewport->RenderTarget->GetBuffer(); uint8_t* pixels = viewport->RenderTarget->GetBuffer();
// top edge // top edge

16
src/textures/buildtexture.cpp
View file

@ -147,12 +147,12 @@ const uint8_t *FBuildTexture::GetColumn (unsigned int column, const Span **spans
void FTextureManager::AddTiles (void *tiles) void FTextureManager::AddTiles (void *tiles)
{ {
// int numtiles = LittleLong(((DWORD *)tiles)[1]); // This value is not reliable // int numtiles = LittleLong(((uint32_t *)tiles)[1]); // This value is not reliable
int tilestart = LittleLong(((DWORD *)tiles)[2]); int tilestart = LittleLong(((uint32_t *)tiles)[2]);
int tileend = LittleLong(((DWORD *)tiles)[3]); int tileend = LittleLong(((uint32_t *)tiles)[3]);
const uint16_t *tilesizx = &((const uint16_t *)tiles)[8]; const uint16_t *tilesizx = &((const uint16_t *)tiles)[8];
const uint16_t *tilesizy = &tilesizx[tileend - tilestart + 1]; const uint16_t *tilesizy = &tilesizx[tileend - tilestart + 1];
const DWORD *picanm = (const DWORD *)&tilesizy[tileend - tilestart + 1]; const uint32_t *picanm = (const uint32_t *)&tilesizy[tileend - tilestart + 1];
uint8_t *tiledata = (uint8_t *)&picanm[tileend - tilestart + 1]; uint8_t *tiledata = (uint8_t *)&picanm[tileend - tilestart + 1];
for (int i = tilestart; i <= tileend; ++i) for (int i = tilestart; i <= tileend; ++i)
@ -160,7 +160,7 @@ void FTextureManager::AddTiles (void *tiles)
int pic = i - tilestart; int pic = i - tilestart;
int width = LittleShort(tilesizx[pic]); int width = LittleShort(tilesizx[pic]);
int height = LittleShort(tilesizy[pic]); int height = LittleShort(tilesizy[pic]);
DWORD anm = LittleLong(picanm[pic]); uint32_t anm = LittleLong(picanm[pic]);
int xoffs = (int8_t)((anm >> 8) & 255) + width/2; int xoffs = (int8_t)((anm >> 8) & 255) + width/2;
int yoffs = (int8_t)((anm >> 16) & 255) + height/2; int yoffs = (int8_t)((anm >> 16) & 255) + height/2;
int size = width*height; int size = width*height;
@ -253,14 +253,14 @@ void FTextureManager::AddTiles (void *tiles)
int FTextureManager::CountTiles (void *tiles) int FTextureManager::CountTiles (void *tiles)
{ {
int version = LittleLong(*(DWORD *)tiles); int version = LittleLong(*(uint32_t *)tiles);
if (version != 1) if (version != 1)
{ {
return 0; return 0;
} }
int tilestart = LittleLong(((DWORD *)tiles)[2]); int tilestart = LittleLong(((uint32_t *)tiles)[2]);
int tileend = LittleLong(((DWORD *)tiles)[3]); int tileend = LittleLong(((uint32_t *)tiles)[3]);
return tileend >= tilestart ? tileend - tilestart + 1 : 0; return tileend >= tilestart ? tileend - tilestart + 1 : 0;
} }

6
src/textures/texture.cpp
View file

@ -850,7 +850,7 @@ void FTexture::SetScaledSize(int fitwidth, int fitheight)
namespace namespace
{ {
PalEntry averageColor(const DWORD *data, int size, int maxout) PalEntry averageColor(const uint32_t *data, int size, int maxout)
{ {
int i; int i;
unsigned int r, g, b; unsigned int r, g, b;
@ -901,10 +901,10 @@ PalEntry FTexture::GetSkyCapColor(bool bottom)
const uint32_t *buffer = (const uint32_t *)bitmap.GetPixels(); const uint32_t *buffer = (const uint32_t *)bitmap.GetPixels();
if (buffer) if (buffer)
{ {
CeilingSkyColor = averageColor((DWORD *)buffer, w * MIN(30, h), 0); CeilingSkyColor = averageColor((uint32_t *)buffer, w * MIN(30, h), 0);
if (h>30) if (h>30)
{ {
FloorSkyColor = averageColor(((DWORD *)buffer) + (h - 30)*w, w * 30, 0); FloorSkyColor = averageColor(((uint32_t *)buffer) + (h - 30)*w, w * 30, 0);
} }
else FloorSkyColor = CeilingSkyColor; else FloorSkyColor = CeilingSkyColor;
} }

20
src/textures/textures.h
View file

@ -57,11 +57,11 @@ struct FAnimDef
uint16_t CurFrame; uint16_t CurFrame;
uint8_t AnimType; uint8_t AnimType;
bool bDiscrete; // taken out of AnimType to have better control bool bDiscrete; // taken out of AnimType to have better control
DWORD SwitchTime; // Time to advance to next frame uint32_t SwitchTime; // Time to advance to next frame
struct FAnimFrame struct FAnimFrame
{ {
DWORD SpeedMin; // Speeds are in ms, not tics uint32_t SpeedMin; // Speeds are in ms, not tics
DWORD SpeedRange; uint32_t SpeedRange;
FTextureID FramePic; FTextureID FramePic;
} Frames[1]; } Frames[1];
enum enum
@ -73,7 +73,7 @@ struct FAnimDef
ANIM_Random ANIM_Random
}; };
void SetSwitchTime (DWORD mstime); void SetSwitchTime (uint32_t mstime);
}; };
struct FSwitchDef struct FSwitchDef
@ -110,7 +110,7 @@ struct patch_t
int16_t height; int16_t height;
int16_t leftoffset; // pixels to the left of origin int16_t leftoffset; // pixels to the left of origin
int16_t topoffset; // pixels below the origin int16_t topoffset; // pixels below the origin
DWORD columnofs[]; // only [width] used uint32_t columnofs[]; // only [width] used
// the [0] is &columnofs[width] // the [0] is &columnofs[width]
}; };
@ -470,7 +470,7 @@ public:
int NumTextures () const { return (int)Textures.Size(); } int NumTextures () const { return (int)Textures.Size(); }
void UpdateAnimations (DWORD mstime); void UpdateAnimations (uint32_t mstime);
int GuesstimateNumTextures (); int GuesstimateNumTextures ();
FSwitchDef *FindSwitch (FTextureID texture); FSwitchDef *FindSwitch (FTextureID texture);
@ -493,7 +493,7 @@ private:
void FixAnimations (); void FixAnimations ();
void InitAnimated (); void InitAnimated ();
void InitAnimDefs (); void InitAnimDefs ();
FAnimDef *AddSimpleAnim (FTextureID picnum, int animcount, DWORD speedmin, DWORD speedrange=0); FAnimDef *AddSimpleAnim (FTextureID picnum, int animcount, uint32_t speedmin, uint32_t speedrange=0);
FAnimDef *AddComplexAnim (FTextureID picnum, const TArray<FAnimDef::FAnimFrame> &frames); FAnimDef *AddComplexAnim (FTextureID picnum, const TArray<FAnimDef::FAnimFrame> &frames);
void ParseAnim (FScanner &sc, int usetype); void ParseAnim (FScanner &sc, int usetype);
FAnimDef *ParseRangeAnim (FScanner &sc, FTextureID picnum, int usetype, bool missing); FAnimDef *ParseRangeAnim (FScanner &sc, FTextureID picnum, int usetype, bool missing);
@ -501,7 +501,7 @@ private:
void ParseWarp(FScanner &sc); void ParseWarp(FScanner &sc);
void ParseCameraTexture(FScanner &sc); void ParseCameraTexture(FScanner &sc);
FTextureID ParseFramenum (FScanner &sc, FTextureID basepicnum, int usetype, bool allowMissing); FTextureID ParseFramenum (FScanner &sc, FTextureID basepicnum, int usetype, bool allowMissing);
void ParseTime (FScanner &sc, DWORD &min, DWORD &max); void ParseTime (FScanner &sc, uint32_t &min, uint32_t &max);
FTexture *Texture(FTextureID id) { return Textures[id.GetIndex()].Texture; } FTexture *Texture(FTextureID id) { return Textures[id.GetIndex()].Texture; }
void SetTranslation (FTextureID fromtexnum, FTextureID totexnum); void SetTranslation (FTextureID fromtexnum, FTextureID totexnum);
void ParseAnimatedDoor(FScanner &sc); void ParseAnimatedDoor(FScanner &sc);
@ -569,7 +569,7 @@ public:
void SetSpeed(float fac) { Speed = fac; } void SetSpeed(float fac) { Speed = fac; }
FTexture *GetRedirect(bool wantwarped); FTexture *GetRedirect(bool wantwarped);
DWORD GenTime; uint32_t GenTime;
float Speed; float Speed;
int WidthOffsetMultiplier, HeightOffsetMultiplier; // [mxd] int WidthOffsetMultiplier, HeightOffsetMultiplier; // [mxd]
protected: protected:
@ -577,7 +577,7 @@ protected:
uint8_t *Pixels; uint8_t *Pixels;
Span **Spans; Span **Spans;
virtual void MakeTexture (DWORD time); virtual void MakeTexture (uint32_t time);
int NextPo2 (int v); // [mxd] int NextPo2 (int v); // [mxd]
void SetupMultipliers (int width, int height); // [mxd] void SetupMultipliers (int width, int height); // [mxd]
}; };

8
src/textures/warptexture.cpp
View file

@ -85,7 +85,7 @@ bool FWarpTexture::CheckModified ()
const uint8_t *FWarpTexture::GetPixels () const uint8_t *FWarpTexture::GetPixels ()
{ {
DWORD time = r_FrameTime; uint32_t time = r_FrameTime;
if (Pixels == NULL || time != GenTime) if (Pixels == NULL || time != GenTime)
{ {
@ -96,7 +96,7 @@ const uint8_t *FWarpTexture::GetPixels ()
const uint32_t *FWarpTexture::GetPixelsBgra() const uint32_t *FWarpTexture::GetPixelsBgra()
{ {
DWORD time = r_FrameTime; uint32_t time = r_FrameTime;
if (Pixels == NULL || time != GenTime) if (Pixels == NULL || time != GenTime)
{ {
MakeTexture(time); MakeTexture(time);
@ -115,7 +115,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra()
const uint8_t *FWarpTexture::GetColumn (unsigned int column, const Span **spans_out) const uint8_t *FWarpTexture::GetColumn (unsigned int column, const Span **spans_out)
{ {
DWORD time = r_FrameTime; uint32_t time = r_FrameTime;
if (Pixels == NULL || time != GenTime) if (Pixels == NULL || time != GenTime)
{ {
@ -144,7 +144,7 @@ const uint8_t *FWarpTexture::GetColumn (unsigned int column, const Span **spans_
} }
void FWarpTexture::MakeTexture(DWORD time) void FWarpTexture::MakeTexture(uint32_t time)
{ {
const uint8_t *otherpix = SourcePic->GetPixels(); const uint8_t *otherpix = SourcePic->GetPixels();

70
src/timidity/instrum_sf2.cpp
View file

@ -20,8 +20,8 @@ class CBadVer {};
struct ListHandler struct ListHandler
{ {
DWORD ID; uint32_t ID;
void (*Parser)(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); void (*Parser)(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
}; };
enum enum
@ -155,15 +155,15 @@ static const SFGenComposite DefaultGenerators =
-1 // overridingRootKey -1 // overridingRootKey
}; };
static void ParseIfil(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseIfil(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseSmpl(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseSmpl(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseSm24(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseSm24(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParsePhdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParsePhdr(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseBag(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseBag(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseMod(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseMod(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseGen(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseGen(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseInst(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseInst(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
static void ParseShdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen); static void ParseShdr(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen);
ListHandler INFOHandlers[] = ListHandler INFOHandlers[] =
{ {
@ -218,9 +218,9 @@ static int32_t calc_rate(Renderer *song, int diff, double sec)
} }
static inline DWORD read_id(FileReader *f) static inline uint32_t read_id(FileReader *f)
{ {
DWORD id; uint32_t id;
if (f->Read(&id, 4) != 4) if (f->Read(&id, 4) != 4)
{ {
throw CIOErr(); throw CIOErr();
@ -268,9 +268,9 @@ static inline int read_sword(FileReader *f)
return LittleShort(x); return LittleShort(x);
} }
static inline DWORD read_dword(FileReader *f) static inline uint32_t read_dword(FileReader *f)
{ {
DWORD x; uint32_t x;
if (f->Read(&x, 4) != 4) if (f->Read(&x, 4) != 4)
{ {
throw CIOErr(); throw CIOErr();
@ -287,7 +287,7 @@ static inline void read_name(FileReader *f, char name[21])
name[20] = 0; name[20] = 0;
} }
static inline void skip_chunk(FileReader *f, DWORD len) static inline void skip_chunk(FileReader *f, uint32_t len)
{ {
// RIFF, like IFF, adds an extra pad byte to the end of // RIFF, like IFF, adds an extra pad byte to the end of
// odd-sized chunks so that new chunks are always on even // odd-sized chunks so that new chunks are always on even
@ -298,7 +298,7 @@ static inline void skip_chunk(FileReader *f, DWORD len)
} }
} }
static void check_list(FileReader *f, DWORD id, DWORD filelen, DWORD &chunklen) static void check_list(FileReader *f, uint32_t id, uint32_t filelen, uint32_t &chunklen)
{ {
if (read_id(f) != ID_LIST) if (read_id(f) != ID_LIST)
{ {
@ -315,7 +315,7 @@ static void check_list(FileReader *f, DWORD id, DWORD filelen, DWORD &chunklen)
} }
} }
static void ParseIfil(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseIfil(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
uint16_t major, minor; uint16_t major, minor;
@ -334,11 +334,11 @@ static void ParseIfil(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
sf2->MinorVersion = minor; sf2->MinorVersion = minor;
} }
static void ParseLIST(SFFile *sf2, FileReader *f, DWORD chunklen, ListHandler *handlers) static void ParseLIST(SFFile *sf2, FileReader *f, uint32_t chunklen, ListHandler *handlers)
{ {
ListHandler *handler; ListHandler *handler;
DWORD id; uint32_t id;
DWORD len; uint32_t len;
chunklen -= 4; chunklen -= 4;
while (chunklen > 0) while (chunklen > 0)
@ -368,7 +368,7 @@ static void ParseLIST(SFFile *sf2, FileReader *f, DWORD chunklen, ListHandler *h
} }
} }
static void ParseINFO(SFFile *sf2, FileReader *f, DWORD chunklen) static void ParseINFO(SFFile *sf2, FileReader *f, uint32_t chunklen)
{ {
sf2->MinorVersion = -1; sf2->MinorVersion = -1;
@ -380,7 +380,7 @@ static void ParseINFO(SFFile *sf2, FileReader *f, DWORD chunklen)
} }
} }
static void ParseSdta(SFFile *sf2, FileReader *f, DWORD chunklen) static void ParseSdta(SFFile *sf2, FileReader *f, uint32_t chunklen)
{ {
ParseLIST(sf2, f, chunklen, SdtaHandlers); ParseLIST(sf2, f, chunklen, SdtaHandlers);
if (sf2->SampleDataOffset == 0) if (sf2->SampleDataOffset == 0)
@ -397,7 +397,7 @@ static void ParseSdta(SFFile *sf2, FileReader *f, DWORD chunklen)
} }
} }
static void ParseSmpl(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseSmpl(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
// Only use the first smpl chunk. (Or should we reject files with more than one?) // Only use the first smpl chunk. (Or should we reject files with more than one?)
if (sf2->SampleDataOffset == 0) if (sf2->SampleDataOffset == 0)
@ -412,7 +412,7 @@ static void ParseSmpl(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
skip_chunk(f, chunklen); skip_chunk(f, chunklen);
} }
static void ParseSm24(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseSm24(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
// The sm24 chunk is ignored if the file version is < 2.04 // The sm24 chunk is ignored if the file version is < 2.04
if (sf2->MinorVersion >= 4) if (sf2->MinorVersion >= 4)
@ -427,12 +427,12 @@ static void ParseSm24(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
skip_chunk(f, chunklen); skip_chunk(f, chunklen);
} }
static void ParsePdta(SFFile *sf2, FileReader *f, DWORD chunklen) static void ParsePdta(SFFile *sf2, FileReader *f, uint32_t chunklen)
{ {
ParseLIST(sf2, f, chunklen, PdtaHandlers); ParseLIST(sf2, f, chunklen, PdtaHandlers);
} }
static void ParsePhdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParsePhdr(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
SFPreset *preset; SFPreset *preset;
@ -470,7 +470,7 @@ static void ParsePhdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
} }
} }
static void ParseBag(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseBag(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
SFBag *bags, *bag; SFBag *bags, *bag;
uint16_t prev_mod = 0; uint16_t prev_mod = 0;
@ -532,7 +532,7 @@ static void ParseBag(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
} }
} }
static void ParseMod(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseMod(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
// Section 7.4, page 23: // Section 7.4, page 23:
// It [the PMOD sub-chunk] is always a multiple of ten bytes in length, // It [the PMOD sub-chunk] is always a multiple of ten bytes in length,
@ -545,7 +545,7 @@ static void ParseMod(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
skip_chunk(f, chunklen); skip_chunk(f, chunklen);
} }
static void ParseGen(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseGen(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
SFGenList *gens, *gen; SFGenList *gens, *gen;
int numgens; int numgens;
@ -597,7 +597,7 @@ static void ParseGen(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
} }
} }
static void ParseInst(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseInst(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
int i; int i;
SFInst *inst; SFInst *inst;
@ -632,7 +632,7 @@ static void ParseInst(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
} }
} }
static void ParseShdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen) static void ParseShdr(SFFile *sf2, FileReader *f, uint32_t chunkid, uint32_t chunklen)
{ {
int i; int i;
SFSample *sample; SFSample *sample;
@ -694,8 +694,8 @@ static void ParseShdr(SFFile *sf2, FileReader *f, DWORD chunkid, DWORD chunklen)
SFFile *ReadSF2(const char *filename, FileReader *f) SFFile *ReadSF2(const char *filename, FileReader *f)
{ {
SFFile *sf2 = NULL; SFFile *sf2 = NULL;
DWORD filelen; uint32_t filelen;
DWORD chunklen; uint32_t chunklen;
try try
{ {
@ -1502,7 +1502,7 @@ void SFFile::ApplyGeneratorsToRegion(SFGenComposite *gen, SFSample *sfsamp, Rend
void SFFile::LoadSample(SFSample *sample) void SFFile::LoadSample(SFSample *sample)
{ {
FileReader *fp = pathExpander.openFileReader(Filename, NULL); FileReader *fp = pathExpander.openFileReader(Filename, NULL);
DWORD i; uint32_t i;
if (fp == NULL) if (fp == NULL)
{ {

18
src/timidity/sf2.h
View file

@ -37,11 +37,11 @@ struct SFInst
struct SFSample struct SFSample
{ {
float *InMemoryData; float *InMemoryData;
DWORD Start; uint32_t Start;
DWORD End; uint32_t End;
DWORD StartLoop; uint32_t StartLoop;
DWORD EndLoop; uint32_t EndLoop;
DWORD SampleRate; uint32_t SampleRate;
uint8_t OriginalPitch; uint8_t OriginalPitch;
int8_t PitchCorrection; int8_t PitchCorrection;
uint16_t SampleLink; uint16_t SampleLink;
@ -302,10 +302,10 @@ struct SFFile : public Timidity::FontFile
SFSample *Samples; SFSample *Samples;
TArray<SFPerc> Percussion; TArray<SFPerc> Percussion;
int MinorVersion; int MinorVersion;
DWORD SampleDataOffset; uint32_t SampleDataOffset;
DWORD SampleDataLSBOffset; uint32_t SampleDataLSBOffset;
DWORD SizeSampleData; uint32_t SizeSampleData;
DWORD SizeSampleDataLSB; uint32_t SizeSampleDataLSB;
int NumPresets; int NumPresets;
int NumPresetBags; int NumPresetBags;
int NumPresetGenerators; int NumPresetGenerators;

6
src/v_draw.cpp
View file

@ -323,7 +323,7 @@ static inline FColormapStyle * ListGetColormapStyle(VMVa_List &tags)
} }
template<class T> template<class T>
bool DCanvas::ParseDrawTextureTags(FTexture *img, double x, double y, DWORD tag, T& tags, DrawParms *parms, bool fortext) const bool DCanvas::ParseDrawTextureTags(FTexture *img, double x, double y, uint32_t tag, T& tags, DrawParms *parms, bool fortext) const
{ {
INTBOOL boolval; INTBOOL boolval;
int intval; int intval;
@ -749,8 +749,8 @@ bool DCanvas::ParseDrawTextureTags(FTexture *img, double x, double y, DWORD tag,
} }
// explicitly instantiate both versions for v_text.cpp. // explicitly instantiate both versions for v_text.cpp.
template bool DCanvas::ParseDrawTextureTags<Va_List>(FTexture *img, double x, double y, DWORD tag, Va_List& tags, DrawParms *parms, bool fortext) const; template bool DCanvas::ParseDrawTextureTags<Va_List>(FTexture *img, double x, double y, uint32_t tag, Va_List& tags, DrawParms *parms, bool fortext) const;
template bool DCanvas::ParseDrawTextureTags<VMVa_List>(FTexture *img, double x, double y, DWORD tag, VMVa_List& tags, DrawParms *parms, bool fortext) const; template bool DCanvas::ParseDrawTextureTags<VMVa_List>(FTexture *img, double x, double y, uint32_t tag, VMVa_List& tags, DrawParms *parms, bool fortext) const;
void DCanvas::VirtualToRealCoords(double &x, double &y, double &w, double &h, void DCanvas::VirtualToRealCoords(double &x, double &y, double &w, double &h,
double vwidth, double vheight, bool vbottom, bool handleaspect) const double vwidth, double vheight, bool vbottom, bool handleaspect) const

20
src/v_video.cpp
View file

@ -143,15 +143,15 @@ int DisplayWidth, DisplayHeight, DisplayBits;
FFont *SmallFont, *SmallFont2, *BigFont, *ConFont, *IntermissionFont; FFont *SmallFont, *SmallFont2, *BigFont, *ConFont, *IntermissionFont;
extern "C" { extern "C" {
DWORD Col2RGB8[65][256]; uint32_t Col2RGB8[65][256];
DWORD *Col2RGB8_LessPrecision[65]; uint32_t *Col2RGB8_LessPrecision[65];
DWORD Col2RGB8_Inverse[65][256]; uint32_t Col2RGB8_Inverse[65][256];
ColorTable32k RGB32k; ColorTable32k RGB32k;
ColorTable256k RGB256k; ColorTable256k RGB256k;
} }
static DWORD Col2RGB8_2[63][256]; static uint32_t Col2RGB8_2[63][256];
// [RH] The framebuffer is no longer a mere byte array. // [RH] The framebuffer is no longer a mere byte array.
// There's also only one, not four. // There's also only one, not four.
@ -394,7 +394,7 @@ void DCanvas::ReleaseScreenshotBuffer()
// //
//========================================================================== //==========================================================================
int V_GetColorFromString (const DWORD *palette, const char *cstr, FScriptPosition *sc) int V_GetColorFromString (const uint32_t *palette, const char *cstr, FScriptPosition *sc)
{ {
int c[3], i, p; int c[3], i, p;
char val[3]; char val[3];
@ -586,7 +586,7 @@ FString V_GetColorStringByName (const char *name, FScriptPosition *sc)
// //
//========================================================================== //==========================================================================
int V_GetColor (const DWORD *palette, const char *str, FScriptPosition *sc) int V_GetColor (const uint32_t *palette, const char *str, FScriptPosition *sc)
{ {
FString string = V_GetColorStringByName (str, sc); FString string = V_GetColorStringByName (str, sc);
int res; int res;
@ -602,7 +602,7 @@ int V_GetColor (const DWORD *palette, const char *str, FScriptPosition *sc)
return res; return res;
} }
int V_GetColor(const DWORD *palette, FScanner &sc) int V_GetColor(const uint32_t *palette, FScanner &sc)
{ {
FScriptPosition scc = sc; FScriptPosition scc = sc;
return V_GetColor(palette, sc.String, &scc); return V_GetColor(palette, sc.String, &scc);
@ -902,8 +902,8 @@ void DFrameBuffer::DrawRateStuff ()
// Draws frame time and cumulative fps // Draws frame time and cumulative fps
if (vid_fps) if (vid_fps)
{ {
DWORD ms = I_FPSTime(); uint32_t ms = I_FPSTime();
DWORD howlong = ms - LastMS; uint32_t howlong = ms - LastMS;
if ((signed)howlong >= 0) if ((signed)howlong >= 0)
{ {
char fpsbuff[40]; char fpsbuff[40];
@ -923,7 +923,7 @@ void DFrameBuffer::DrawRateStuff ()
DTA_VirtualHeight, screen->GetHeight() / textScale, DTA_VirtualHeight, screen->GetHeight() / textScale,
DTA_KeepRatio, true, TAG_DONE); DTA_KeepRatio, true, TAG_DONE);
DWORD thisSec = ms/1000; uint32_t thisSec = ms/1000;
if (LastSec < thisSec) if (LastSec < thisSec)
{ {
LastCount = FrameCount / (thisSec - LastSec); LastCount = FrameCount / (thisSec - LastSec);

22
src/v_video.h
View file

@ -59,15 +59,15 @@ class FTexture;
// Think of TagItems as an array of the following structure: // Think of TagItems as an array of the following structure:
// //
// struct TagItem { // struct TagItem {
// DWORD ti_Tag; // uint32_t ti_Tag;
// DWORD ti_Data; // uint32_t ti_Data;
// }; // };
#define TAG_DONE (0) /* Used to indicate the end of the Tag list */ #define TAG_DONE (0) /* Used to indicate the end of the Tag list */
#define TAG_END (0) /* Ditto */ #define TAG_END (0) /* Ditto */
/* list pointed to in ti_Data */ /* list pointed to in ti_Data */
#define TAG_USER ((DWORD)(1u<<30)) #define TAG_USER ((uint32_t)(1u<<30))
enum enum
{ {
@ -104,7 +104,7 @@ enum
DTA_HUDRulesC, // only used internally for marking HUD_HorizCenter DTA_HUDRulesC, // only used internally for marking HUD_HorizCenter
DTA_KeepRatio, // doesn't adjust screen size for DTA_Virtual* if the aspect ratio is not 4:3 DTA_KeepRatio, // doesn't adjust screen size for DTA_Virtual* if the aspect ratio is not 4:3
DTA_RenderStyle, // same as render style for actors DTA_RenderStyle, // same as render style for actors
DTA_ColorOverlay, // DWORD: ARGB to overlay on top of image; limited to black for software DTA_ColorOverlay, // uint32_t: ARGB to overlay on top of image; limited to black for software
DTA_BilinearFilter, // bool: apply bilinear filtering to the image DTA_BilinearFilter, // bool: apply bilinear filtering to the image
DTA_SpecialColormap,// pointer to FSpecialColormapParameters (likely to be forever hardware-only) DTA_SpecialColormap,// pointer to FSpecialColormapParameters (likely to be forever hardware-only)
DTA_ColormapStyle, // pointer to FColormapStyle (hardware-only) DTA_ColormapStyle, // pointer to FColormapStyle (hardware-only)
@ -292,7 +292,7 @@ protected:
virtual void DrawTextureParms(FTexture *img, DrawParms &parms); virtual void DrawTextureParms(FTexture *img, DrawParms &parms);
template<class T> template<class T>
bool ParseDrawTextureTags(FTexture *img, double x, double y, DWORD tag, T& tags, DrawParms *parms, bool fortext) const; bool ParseDrawTextureTags(FTexture *img, double x, double y, uint32_t tag, T& tags, DrawParms *parms, bool fortext) const;
DCanvas() {} DCanvas() {}
@ -489,18 +489,18 @@ extern "C" ColorTable256k RGB256k;
// special R10B10G10 format for efficient blending computation. // special R10B10G10 format for efficient blending computation.
// --RRRRRrrr--BBBBBbbb--GGGGGggg-- at level 64 // --RRRRRrrr--BBBBBbbb--GGGGGggg-- at level 64
// --------rrrr------bbbb------gggg at level 1 // --------rrrr------bbbb------gggg at level 1
extern "C" DWORD Col2RGB8[65][256]; extern "C" uint32_t Col2RGB8[65][256];
// Col2RGB8_LessPrecision is the same as Col2RGB8, but the LSB for red // Col2RGB8_LessPrecision is the same as Col2RGB8, but the LSB for red
// and blue are forced to zero, so if the blend overflows, it won't spill // and blue are forced to zero, so if the blend overflows, it won't spill
// over into the next component's value. // over into the next component's value.
// --RRRRRrrr-#BBBBBbbb-#GGGGGggg-- at level 64 // --RRRRRrrr-#BBBBBbbb-#GGGGGggg-- at level 64
// --------rrr#------bbb#------gggg at level 1 // --------rrr#------bbb#------gggg at level 1
extern "C" DWORD *Col2RGB8_LessPrecision[65]; extern "C" uint32_t *Col2RGB8_LessPrecision[65];
// Col2RGB8_Inverse is the same as Col2RGB8_LessPrecision, except the source // Col2RGB8_Inverse is the same as Col2RGB8_LessPrecision, except the source
// palette has been inverted. // palette has been inverted.
extern "C" DWORD Col2RGB8_Inverse[65][256]; extern "C" uint32_t Col2RGB8_Inverse[65][256];
// "Magic" numbers used during the blending: // "Magic" numbers used during the blending:
// --000001111100000111110000011111 = 0x01f07c1f // --000001111100000111110000011111 = 0x01f07c1f
@ -523,14 +523,14 @@ void V_MarkRect (int x, int y, int width, int height);
class FScanner; class FScanner;
// Returns the closest color to the one desired. String // Returns the closest color to the one desired. String
// should be of the form "rr gg bb". // should be of the form "rr gg bb".
int V_GetColorFromString (const DWORD *palette, const char *colorstring, FScriptPosition *sc = nullptr); int V_GetColorFromString (const uint32_t *palette, const char *colorstring, FScriptPosition *sc = nullptr);
// Scans through the X11R6RGB lump for a matching color // Scans through the X11R6RGB lump for a matching color
// and returns a color string suitable for V_GetColorFromString. // and returns a color string suitable for V_GetColorFromString.
FString V_GetColorStringByName (const char *name, FScriptPosition *sc = nullptr); FString V_GetColorStringByName (const char *name, FScriptPosition *sc = nullptr);
// Tries to get color by name, then by string // Tries to get color by name, then by string
int V_GetColor (const DWORD *palette, const char *str, FScriptPosition *sc = nullptr); int V_GetColor (const uint32_t *palette, const char *str, FScriptPosition *sc = nullptr);
int V_GetColor(const DWORD *palette, FScanner &sc); int V_GetColor(const uint32_t *palette, FScanner &sc);
void V_DrawFrame (int left, int top, int width, int height); void V_DrawFrame (int left, int top, int width, int height);
// If the view size is not full screen, draws a border around it. // If the view size is not full screen, draws a border around it.