[Scummvm-git-logs] scummvm master -> 8aac0d2cf2ec85273313260278541cacb8b8e839

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8aac0d2cf2 ICB: Remove duplicate types


Commit: 8aac0d2cf2ec85273313260278541cacb8b8e839
    https://github.com/scummvm/scummvm/commit/8aac0d2cf2ec85273313260278541cacb8b8e839
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-12-25T05:16:57+01:00

Commit Message:
ICB: Remove duplicate types

Changed paths:
    engines/icb/common/px_rcutypes.h
    engines/icb/common/px_types.h
    engines/icb/gfx/rab_api.h
    engines/icb/set_pc.h
    engines/icb/surface_manager.h


diff --git a/engines/icb/common/px_rcutypes.h b/engines/icb/common/px_rcutypes.h
index 7ac8bccd98..ef1d2e1f8c 100644
--- a/engines/icb/common/px_rcutypes.h
+++ b/engines/icb/common/px_rcutypes.h
@@ -30,44 +30,12 @@
 
 #include "engines/icb/common/px_rccommon.h" // This should be included in every file before anything else
 
-#include <limits.h>
+#include "common/scummsys.h"
 
 namespace ICB {
 
 typedef const char *cstr;
 
-typedef unsigned int uint; // Short hand for unsigned int
-
-#if CHAR_MAX == 255
-typedef signed char int8;
-typedef unsigned char uint8;
-#else
-typedef char int8;
-typedef unsigned char uint8;
-#endif
-
-typedef unsigned int word;
-
-#if USHRT_MAX == 0xffff
-typedef short int int16;
-typedef unsigned short int uint16;
-#elif UINT_MAX == 0xffff
-typedef short int int16;
-typedef unsigned short int uint16;
-#else
-#error Cannot define types: int16, uint16
-#endif
-
-#if UINT_MAX == 0xffffffff
-typedef int int32;
-typedef unsigned int uint32;
-#elif ULONG_MAX == 0xffffffff
-typedef int int32;
-typedef unsigned int uint32;
-#else
-#error Cannot define types: int32, uint32
-#endif
-
 // Definition of a boolean value that can be used across the PC and PSX.  I stopped true being 0xff because
 // C++ weak typing allows you to assign a bool8 to an int8 without warning, whereupon '==' fails for TRUE8 because
 // one is signed and one isn't.
diff --git a/engines/icb/common/px_types.h b/engines/icb/common/px_types.h
index 25940e2252..79fbc22c3e 100644
--- a/engines/icb/common/px_types.h
+++ b/engines/icb/common/px_types.h
@@ -37,8 +37,6 @@ typedef struct {
 	int32 bottom;
 } LRECT;
 
-#define _MAX_PATH 260
-
 } // End of namespace ICB
 
 #endif
diff --git a/engines/icb/gfx/rab_api.h b/engines/icb/gfx/rab_api.h
index d6c6895a8f..7035bc588a 100644
--- a/engines/icb/gfx/rab_api.h
+++ b/engines/icb/gfx/rab_api.h
@@ -49,7 +49,6 @@ namespace ICB {
 #define NONZERO_DELTAS_16_BYTE_SIZE (3)
 #define NONZERO_DELTAS_8_BYTE_SIZE (2)
 
-#define FRAME_SIZE_ERROR (INT_MAX)
 #define ZERO_ANGLE (0)
 
 #define DELTA_24_NBITS (8)
diff --git a/engines/icb/set_pc.h b/engines/icb/set_pc.h
index 1de779a687..96c6b1c893 100644
--- a/engines/icb/set_pc.h
+++ b/engines/icb/set_pc.h
@@ -101,22 +101,22 @@ public: /* Drawing Functions */
 	const char *GetSetName() const { return set_name; }
 
 private:                       /* Member variables .... Move this to private section */
-	char set_name[_MAX_PATH];    // the camera name (no url)
-	char set_url[_MAX_PATH];     // the full url of the camera
+	char set_name[MAXPATHLEN];    // the camera name (no url)
+	char set_url[MAXPATHLEN];     // the full url of the camera
 	uint32 set_url_hash;         // the hashed url of the camera
-	char set_cluster[_MAX_PATH]; // cluster file name
+	char set_cluster[MAXPATHLEN]; // cluster file name
 	uint32 set_cluster_hash;     // hashed cluster file name
 	/* Waiting for removal */
-	char h_set_name[_MAX_PATH]; // just the hash camera name - not full url
-	char rvpcm_file_name[_MAX_PATH]; // Props & Construction Matrix
+	char h_set_name[MAXPATHLEN]; // just the hash camera name - not full url
+	char rvpcm_file_name[MAXPATHLEN]; // Props & Construction Matrix
 	uint32 rvpcm_file_hash;          // Props & Construction Matrix hash value
-	char rvcam_file_name[_MAX_PATH]; // Camera
+	char rvcam_file_name[MAXPATHLEN]; // Camera
 	uint32 rvcam_file_hash;          // Camera hash value
-	char rvsl_file_name[_MAX_PATH];  // Static Layers
+	char rvsl_file_name[MAXPATHLEN];  // Static Layers
 	uint32 rvsl_file_hash;           // Static Layers hash value
-	char rvbg_file_name[_MAX_PATH];  // Background
+	char rvbg_file_name[MAXPATHLEN];  // Background
 	uint32 rvbg_file_hash;           // Background hash value
-	char rlx_file_name[_MAX_PATH];   // Poly Lighting rig
+	char rlx_file_name[MAXPATHLEN];   // Poly Lighting rig
 	uint32 rlx_file_hash;            // Poly Lighting rig hash
 	void SettleCamera();
 	/* Waiting for removal */
diff --git a/engines/icb/surface_manager.h b/engines/icb/surface_manager.h
index f48acbe2a9..d861bdf2f5 100644
--- a/engines/icb/surface_manager.h
+++ b/engines/icb/surface_manager.h
@@ -55,7 +55,6 @@ namespace ICB {
 #define SYSTEM 0x00000000 // Surface is in system
 #define VIDEO 0x00000001  // Surface must be in vram
 
-typedef unsigned int uint32;
 extern uint32 effect_time; // Time spent doing postprocessing effects (fades ect)
 extern uint32 working_buffer_id;
 extern uint32 bg_buffer_id;