cpp/openttd-patchpack/source Changeset - r2107:9afd88815f5d

Changeset - r2107:9afd88815f5d

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

Darkvater - 19 years ago 2005-07-17 18:11:17
darkvater@openttd.org

(svn r2617) - Fix: fix some warnings, and reenable vs.net2003 signed/unsigned warnings

6 files changed with 15 insertions and 13 deletions:

gfx.c

players.c

roadveh_cmd.c

stdafx.h

strgen/strgen.c

strings.c

0 comments (0 inline, 0 general)

gfx.c

➞

Show inline comments

@@ @@ -261,9 +261,9 @@ enum { @@
  * @param *dest string that is checked and possibly truncated
  * @param maxw maximum width in pixels of the string
  * @return new width of (truncated) string */
-static int TruncateString(char *str, uint maxw)
+static uint TruncateString(char *str, uint maxw)
+{
-	int w = 0;
+	uint w = 0;
 	int base = _stringwidth_base;
 	int ddd, ddd_w;
@@ @@ -305,7 +305,7 @@ static int TruncateString(char *str, uin @@
 	return w;
+}
-static inline int TruncateStringID(StringID src, char *dest, uint maxw)
+static inline uint TruncateStringID(StringID src, char *dest, uint maxw)
+{
 	GetString(dest, src);
 	return TruncateString(dest, maxw);
@@ @@ -361,7 +361,7 @@ int DrawStringCentered(int x, int y, Str @@
 int DrawStringCenteredTruncated(int x, int y, StringID str, uint16 color, uint maxw)
+{
 	char buffer[512];
-	int w = TruncateStringID(str, buffer, maxw);
+	uint w = TruncateStringID(str, buffer, maxw);
 	return DoDrawString(buffer, x - (w / 2), y, color);
+}

players.c

➞

Show inline comments

@@ @@ -522,7 +522,7 @@ static void MaybeStartNewPlayer(void) @@
 	// when there's a lot of computers in game, the probability that a new one starts is lower
 	if (n < (uint)_opt.diff.max_no_competitors)
-		if (n < (!_network_server) ? RandomRange(_opt.diff.max_no_competitors + 2) : InteractiveRandomRange(_opt.diff.max_no_competitors + 2))
+		if (n < (!_network_server ? RandomRange(_opt.diff.max_no_competitors + 2) : InteractiveRandomRange(_opt.diff.max_no_competitors + 2)) )
 		DoStartupNewPlayer(true);
 	// The next AI starts like the difficulty setting said, with +2 month max

roadveh_cmd.c

➞

Show inline comments

@@ @@ -1154,6 +1154,7 @@ found_best_track:; @@
 	return best_track;
+}
 #if 0
 static uint RoadFindPathToStation(const Vehicle *v, TileIndex tile)
+{
   NPFFindStationOrTileData fstd;
@@ @@ -1165,6 +1166,7 @@ static uint RoadFindPathToStation(const @@
   return NPFRouteToStationOrTile(v->tile, trackdir, &fstd, TRANSPORT_ROAD, v->owner, INVALID_RAILTYPE, PBS_MODE_NONE).best_path_dist;
+}
 #endif
 typedef struct RoadDriveEntry {
 	byte x,y;
@@ @@ -1664,19 +1666,19 @@ void OnNewDay_RoadVeh(Vehicle *v) @@
 				// In that case, add penalty.
 				switch(v->direction) {
 				case 1: // going north east,x position decreasing
 					if (v->x_pos <= TileX(rs->xy) * 16 + 15)
+					if (v->x_pos <= (int32)TileX(rs->xy) * 16 + 15)
 						dist += 6;
 					break;
 				case 3: // Going south east, y position increasing
 					if (v->y_pos >= TileY(rs->xy) * 16)
+					if (v->y_pos >= (int32)TileY(rs->xy) * 16)
 						dist += 6;
 					break;
 				case 5: // Going south west, x position increasing
 					if (v->x_pos >= TileX(rs->xy) * 16)
+					if (v->x_pos >= (int32)TileX(rs->xy) * 16)
 						dist += 6;
 					break;
 				case 7: // Going north west, y position decrasing.
 					if (v->y_pos <= TileY(rs->xy) * 16 + 15)
+					if (v->y_pos <= (int32)TileY(rs->xy) * 16 + 15)
 						dist += 6;
 					break;
+				}

stdafx.h

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ @@
 #pragma warning(disable: 4244) // conversion
 #pragma warning(disable: 4245) // conversion
 #pragma warning(disable: 4305) // 'initializing' : truncation from 'const int ' to 'char '
 #pragma warning(disable: 4018) // warning C4018: '==' : signed/unsigned mismatch
+//#pragma warning(disable: 4018) // warning C4018: '==' : signed/unsigned mismatch
 #pragma warning(disable: 4201) // nameless union
 #pragma warning(disable: 4514) // removed unref inline
 #pragma warning(disable: 4127) // constant conditional expression

strgen/strgen.c

➞

Show inline comments

@@ @@ -634,7 +634,7 @@ static void ExtractCommandString(ParsedC @@
 	for(;;) {
 		// read until next command from a.
 		ar = ParseCommandString(&s, param, &argno, &casei);
+		ar = ParseCommandString((const char **)&s, param, &argno, &casei);
 		if (ar == NULL)
 			break;
@@ @@ -891,7 +891,7 @@ static void MakeHashOfStrings() @@
 			hash = MyHashStr(hash, s + 1);
 			s = ls->english;
 			while ((cs = ParseCommandString(&s, buf, &argno, &casei)) != NULL) {
+			while ((cs = ParseCommandString((const char **)&s, buf, &argno, &casei)) != NULL) {
 				if (cs->flags & C_DONTCOUNT)
 					continue;

strings.c

➞

Show inline comments

@@ @@ -763,7 +763,7 @@ static char *FormatString(char *buff, co @@
 			// Each LEN is printed using 2 bytes in big endian order.
 			uint num = (byte)*str++;
 			while (num) {
 				if (str[0] == casei) {
+				if ((byte)str[0] == casei) {
 					// Found the case, adjust str pointer and continue
 					str += 3;
 					break;

0 comments (0 inline, 0 general)