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

ZDoom · Jul 15, 2017 · a3e782a · a3e782a
2 parents 9eb0b64 + ac30e47
commit a3e782a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/src/d_main.cpp b/src/d_main.cpp
@@ -2055,6 +2055,7 @@ static void D_DoomInit()
 		rngseed = I_MakeRNGSeed();
 		use_staticrng = false;
 	}
+	srand(rngseed);
 
 	FRandom::StaticClearRandom ();
 

diff --git a/src/gl/textures/gl_material.h b/src/gl/textures/gl_material.h
@@ -57,7 +57,7 @@ class FGLTexture
 public:
 	FTexture * tex;
 	FTexture * hirestexture;
-	char bIsTransparent;
+	int8_t bIsTransparent;
 	int HiresLump;
 
 private:

diff --git a/src/m_misc.cpp b/src/m_misc.cpp
@@ -432,27 +432,27 @@ void M_LoadDefaults ()
 
 struct pcx_t
 {
-	char				manufacturer;
-	char				version;
-	char				encoding;
-	char				bits_per_pixel;
-
-	unsigned short		xmin;
-	unsigned short		ymin;
-	unsigned short		xmax;
-	unsigned short		ymax;
+	int8_t				manufacturer;
+	int8_t				version;
+	int8_t				encoding;
+	int8_t				bits_per_pixel;
+
+	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];
 };
 
 

diff --git a/src/scripting/vm/vmops.h b/src/scripting/vm/vmops.h
@@ -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),