zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-07-15 03:48:13 -04:00
commit a3e782a164
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_main.cpp
View file

@ -2055,6 +2055,7 @@ static void D_DoomInit()
rngseed = I_MakeRNGSeed();
use_staticrng = false;
}
srand(rngseed);
FRandom::StaticClearRandom ();

2
src/gl/textures/gl_material.h
View file

@ -57,7 +57,7 @@ class FGLTexture
public:
FTexture * tex;
FTexture * hirestexture;
char bIsTransparent;
int8_t bIsTransparent;
int HiresLump;
private:

32
src/m_misc.cpp
View file

@ -432,27 +432,27 @@ void M_LoadDefaults ()
struct pcx_t
{
char manufacturer;
char version;
char encoding;
char bits_per_pixel;
int8_t manufacturer;
int8_t version;
int8_t encoding;
int8_t bits_per_pixel;
unsigned short xmin;
unsigned short ymin;
unsigned short xmax;
unsigned short ymax;
uint16_t xmin;
uint16_t ymin;
uint16_t xmax;
uint16_t ymax;
unsigned short hdpi;
unsigned short vdpi;
uint16_t hdpi;
uint16_t vdpi;
unsigned char palette[48];
uint8_t palette[48];
char reserved;
char color_planes;
unsigned short bytes_per_line;
unsigned short palette_type;
int8_t reserved;
int8_t color_planes;
uint16_t bytes_per_line;
uint16_t palette_type;
char filler[58];
int8_t filler[58];
};

2
src/scripting/vm/vmops.h
View file

@ -250,7 +250,7 @@ xx(EQV3_K, beqv3, CVRK, NOP, 0, 0), // this will never be used.
// Pointer math.
xx(ADDA_RR, add, RPRPRI, NOP, 0, 0), // pA = pB + dkC
xx(ADDA_RK, add, RPRPKI, ADDA_RR,4, REGT_POINTER),
xx(ADDA_RK, add, RPRPKI, ADDA_RR,4, REGT_INT),
xx(SUBA, sub, RIRPRP, NOP, 0, 0), // dA = pB - pC
xx(EQA_R, beq, CPRR, NOP, 0, 0), // if ((pB == pkC) != A) then pc++
xx(EQA_K, beq, CPRK, EQA_R, 4, REGT_POINTER),