From 1f6767178a78240dfdb93da9d558ab3f1f40d04b Mon Sep 17 00:00:00 2001 From: Ilya Shurumov Date: Mon, 26 Apr 2021 02:47:53 +0600 Subject: [PATCH] - misc changes --- src_rebuild/Game/C/civ_ai.c | 4 ++-- src_rebuild/Game/C/debris.c | 2 +- src_rebuild/Game/C/denting.c | 6 +++--- src_rebuild/Game/C/motion_c.c | 2 +- src_rebuild/Game/C/overmap.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src_rebuild/Game/C/civ_ai.c b/src_rebuild/Game/C/civ_ai.c index 19df025f..37edf0dd 100644 --- a/src_rebuild/Game/C/civ_ai.c +++ b/src_rebuild/Game/C/civ_ai.c @@ -42,10 +42,10 @@ struct int TooCloseNuddaCar; int TooClosePlayer; int InvalidRegion; -} civPingTest = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +} civPingTest; char modelRandomList[] = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 0, 1, 0, 4 }; -unsigned char reservedSlots[MAX_CARS] = { 0 }; +u_char reservedSlots[MAX_CARS] = { 0 }; int distFurthestCivCarSq = 0; char furthestCivID = 0; diff --git a/src_rebuild/Game/C/debris.c b/src_rebuild/Game/C/debris.c index 80126621..7959170d 100644 --- a/src_rebuild/Game/C/debris.c +++ b/src_rebuild/Game/C/debris.c @@ -176,7 +176,7 @@ CVECTOR debris_colour[4][31] = } }; -unsigned char grassColour[4][3] = { +u_char grassColour[4][3] = { {110, 115, 67}, {64, 55, 49}, {91, 104, 56}, diff --git a/src_rebuild/Game/C/denting.c b/src_rebuild/Game/C/denting.c index 981220ef..107a3bc1 100644 --- a/src_rebuild/Game/C/denting.c +++ b/src_rebuild/Game/C/denting.c @@ -29,9 +29,9 @@ char* DentingFiles[] = #define MAX_FILE_DAMAGE_ZONE_POLYS 70 #define MAX_FILE_DAMAGE_LEVELS 256 -unsigned char gCarDamageZoneVerts[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_VERTS]; -unsigned char gHDCarDamageZonePolys[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_POLYS]; -unsigned char gHDCarDamageLevels[MAX_CAR_MODELS][MAX_DAMAGE_LEVELS]; +u_char gCarDamageZoneVerts[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_VERTS]; +u_char gHDCarDamageZonePolys[MAX_CAR_MODELS][NUM_DAMAGE_ZONES][MAX_DAMAGE_ZONE_POLYS]; +u_char gHDCarDamageLevels[MAX_CAR_MODELS][MAX_DAMAGE_LEVELS]; // [D] [T] void InitialiseDenting(void) diff --git a/src_rebuild/Game/C/motion_c.c b/src_rebuild/Game/C/motion_c.c index 28ba14d6..b77a1a50 100644 --- a/src_rebuild/Game/C/motion_c.c +++ b/src_rebuild/Game/C/motion_c.c @@ -1752,7 +1752,7 @@ RECT16 rectTannerWindow; // [D] [T] void InitTannerShadow(void) { - unsigned char brightness; + u_char brightness; TILE* tile; POLY_FT4* poly; int i; diff --git a/src_rebuild/Game/C/overmap.c b/src_rebuild/Game/C/overmap.c index ca70591f..a5b59bab 100644 --- a/src_rebuild/Game/C/overmap.c +++ b/src_rebuild/Game/C/overmap.c @@ -1848,7 +1848,7 @@ void WorldToMultiplayerMap(VECTOR *in, VECTOR *out) void WorldToOverheadMapPositions(VECTOR *pGlobalPosition, VECTOR *pOverheadMapPosition, int count, char inputRelative,int outputRelative) { int scale, cs, sn; - MATRIX tempMatrix = {0}; + MATRIX tempMatrix; SVECTOR tempVector; XZPAIR playerPos; long flag;