OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- most WORD and SWORD are gone.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-08 18:50:37 +01:00
commit ba0f5a3f94
84 changed files with 471 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/edata.cpp
View file

@ -95,8 +95,8 @@ struct EDMapthing
int type;
double height;
int args[5];
WORD skillfilter;
DWORD flags;
uint16_t skillfilter;
uint32_t flags;
};
struct EDLinedef
@ -107,8 +107,8 @@ struct EDLinedef
int id;
int args[5];
double alpha;
DWORD flags;
DWORD activation;
uint32_t flags;
uint32_t activation;
};
@ -117,9 +117,9 @@ struct EDSector
{
int recordnum;
DWORD flags;
DWORD flagsRemove;
DWORD flagsAdd;
uint32_t flags;
uint32_t flagsRemove;
uint32_t flagsAdd;
int damageamount;
int damageinterval;
@ -130,11 +130,11 @@ struct EDSector
int floorterrain;
int ceilingterrain;
DWORD color;
uint32_t color;
DWORD damageflags;
DWORD damageflagsAdd;
DWORD damageflagsRemove;
uint32_t damageflags;
uint32_t damageflagsAdd;
uint32_t damageflagsRemove;
bool flagsSet;
bool damageflagsSet;
@ -143,7 +143,7 @@ struct EDSector
// colormaptop//bottom cannot be used because ZDoom has no corresponding properties.
double xoffs[2], yoffs[2];
DAngle angle[2];
DWORD portalflags[2];
uint32_t portalflags[2];
double Overlayalpha[2];
};
@ -222,8 +222,8 @@ static void parseLinedef(FScanner &sc)
else if (sc.Compare("extflags"))
{
// these are needed to build the proper activation mask out of the possible flags which do not match ZDoom 1:1.
DWORD actmethod = 0;
DWORD acttype = 0;
uint32_t actmethod = 0;
uint32_t acttype = 0;
do
{
sc.CheckString("=");
@ -291,7 +291,7 @@ static void parseSector(FScanner &sc)
}
else if (sc.Compare("flags"))
{
DWORD *flagvar = NULL;
uint32_t *flagvar = NULL;
if (sc.CheckString("."))
{
sc.MustGetString();
@ -348,7 +348,7 @@ static void parseSector(FScanner &sc)
}
else if (sc.Compare("damageflags"))
{
DWORD *flagvar = NULL;
uint32_t *flagvar = NULL;
uint8_t *leakvar = NULL;
if (sc.CheckString("."))
{
@ -449,7 +449,7 @@ static void parseSector(FScanner &sc)
sc.MustGetString();
// Eternity is based on SMMU and uses colormaps differently than all other ports.
// The only solution here is to convert the colormap to an RGB value and set it as the sector's color.
DWORD cmap = R_ColormapNumForName(sc.String);
uint32_t cmap = R_ColormapNumForName(sc.String);
if (cmap != 0)
{
sec.color = R_BlendForColormap(cmap) & 0xff000000;
@ -700,7 +700,7 @@ void ProcessEDLinedef(line_t *ld, int recordnum)
ld->special = 0;
return;
}
const DWORD fmask = ML_REPEAT_SPECIAL | ML_FIRSTSIDEONLY | ML_ADDTRANS | ML_BLOCKEVERYTHING | ML_ZONEBOUNDARY | ML_CLIP_MIDTEX;
const uint32_t fmask = ML_REPEAT_SPECIAL | ML_FIRSTSIDEONLY | ML_ADDTRANS | ML_BLOCKEVERYTHING | ML_ZONEBOUNDARY | ML_CLIP_MIDTEX;
ld->special = eld->special;
ld->activation = eld->activation;
ld->flags = (ld->flags&~fmask) | eld->flags;
@ -719,7 +719,7 @@ void ProcessEDSector(sector_t *sec, int recordnum)
}
// In ZDoom the regular and the damage flags are part of the same flag word so we need to do some masking.
const DWORD flagmask = SECF_SECRET | SECF_WASSECRET | SECF_FRICTION | SECF_PUSH | SECF_SILENT | SECF_SILENTMOVE;
const uint32_t flagmask = SECF_SECRET | SECF_WASSECRET | SECF_FRICTION | SECF_PUSH | SECF_SILENT | SECF_SILENTMOVE;
if (esec->flagsSet) sec->Flags = (sec->Flags & ~flagmask);
sec->Flags = (sec->Flags | esec->flags | esec->flagsAdd) & ~esec->flagsRemove;
@ -740,7 +740,7 @@ void ProcessEDSector(sector_t *sec, int recordnum)
if (esec->colorSet) sec->SetColor(RPART(esec->color), GPART(esec->color), BPART(esec->color), 0);
const DWORD pflagmask = PLANEF_DISABLED | PLANEF_NORENDER | PLANEF_NOPASS | PLANEF_BLOCKSOUND | PLANEF_ADDITIVE;
const uint32_t pflagmask = PLANEF_DISABLED | PLANEF_NORENDER | PLANEF_NOPASS | PLANEF_BLOCKSOUND | PLANEF_ADDITIVE;
for (int i = 0; i < 2; i++)
{
sec->SetXOffset(i, esec->xoffs[i]);