OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code 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
commit 9b87a167d7
38 changed files with 207 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/r_data/sprites.cpp
View file

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