openttd-mini: comparison src/newgrf.cpp

equal deleted inserted replaced

-:ae595994eb03
+:dbe2317185eb
 static byte _grf_data_blocks;
 static GrfDataType _grf_data_type;
-typedef void (*SpecialSpriteHandler)(byte *buf, int len);
+typedef void (*SpecialSpriteHandler)(byte *buf, size_t len);
 enum {
 	MAX_STATIONS = 256,
 };
 	va_end(va);
 	DEBUG(grf, severity, "[%s:%d] %s", _cur_grfconfig->filename, _nfo_line, buf);
 }
-static inline bool check_length(int real, int wanted, const char *str)
+static inline bool check_length(size_t real, size_t wanted, const char *str)
 {
 	if (real >= wanted) return true;
 	grfmsg(0, "%s: Invalid pseudo sprite length %d (expected %d)!", str, real, wanted);
 	return false;
 }
 	*bufp = buf;
 	return ret;
 }
 /* Action 0x00 */
-static void FeatureChangeInfo(byte *buf, int len)
+static void FeatureChangeInfo(byte *buf, size_t len)
 {
 	byte *bufend = buf + len;
 	/* <00> <feature> <num-props> <num-info> <id> (<property <new-info>)...
 	 *
 		if (ignoring) grfmsg(1, "FeatureChangeInfo: Ignoring property 0x%02X of feature 0x%02X (not implemented)", prop, feature);
 	}
 }
 /* Action 0x00 (GLS_SAFETYSCAN) */
-static void SafeChangeInfo(byte *buf, int len)
+static void SafeChangeInfo(byte *buf, size_t len)
 {
 	if (!check_length(len, 6, "SafeChangeInfo")) return;
 	buf++;
 	uint8 feature  = grf_load_byte(&buf);
 	uint8 numprops = grf_load_byte(&buf);
 	/* Skip remainder of GRF */
 	_skip_sprites = -1;
 }
 /* Action 0x00 (GLS_RESERVE) */
-static void ReserveChangeInfo(byte *buf, int len)
+static void ReserveChangeInfo(byte *buf, size_t len)
 {
 	byte *bufend = buf + len;
 	if (!check_length(len, 6, "ReserveChangeInfo")) return;
 	buf++;
 	group->g.result.num_sprites = num_sprites;
 	return group;
 }
 /* Action 0x01 */
-static void NewSpriteSet(byte *buf, int len)
+static void NewSpriteSet(byte *buf, size_t len)
 {
 	/* <01> <feature> <num-sets> <num-ent>
 	 *
 	 * B feature       feature to define sprites for
 	 *                 0, 1, 2, 3: veh-type, 4: train stations
 		LoadNextSprite(_cur_spriteid++, _file_index, _nfo_line);
 	}
 }
 /* Action 0x01 (SKIP) */
-static void SkipAct1(byte *buf, int len)
+static void SkipAct1(byte *buf, size_t len)
 {
 	if (!check_length(len, 4, "SkipAct1")) return;
 	buf++;
 	grf_load_byte(&buf);
 	uint8 num_sets  = grf_load_byte(&buf);
 	return NewResultSpriteGroup(_cur_grffile->spriteset_start + spriteid * num_sprites, num_sprites);
 }
 /* Action 0x02 */
-static void NewSpriteGroup(byte *buf, int len)
+static void NewSpriteGroup(byte *buf, size_t len)
 {
 	/* <02> <feature> <set-id> <type/num-entries> <feature-specific-data...>
 	 *
 	 * B feature       see action 1
 	 * B set-id        ID of this particular definition
 	}
 }
 /* Action 0x03 */
-static void FeatureMapSpriteGroup(byte *buf, int len)
+static void FeatureMapSpriteGroup(byte *buf, size_t len)
 {
 	/* <03> <feature> <n-id> <ids>... <num-cid> [<cargo-type> <cid>]... <def-cid>
 	 * id-list    := [<id>] [id-list]
 	 * cargo-list := <cargo-type> <cid> [cargo-list]
 	 *
 			return;
 	}
 }
 /* Action 0x04 */
-static void FeatureNewName(byte *buf, int len)
+static void FeatureNewName(byte *buf, size_t len)
 {
 	/* <04> <veh-type> <language-id> <num-veh> <offset> <data...>
 	 *
 	 * B veh-type      see action 0 (as 00..07, + 0A
 	 *                 But IF veh-type = 48, then generic text
 	return 0;
 }
 /* Action 0x05 */
-static void GraphicsNew(byte *buf, int len)
+static void GraphicsNew(byte *buf, size_t len)
 {
 	/* <05> <graphics-type> <num-sprites> <other data...>
 	 *
 	 * B graphics-type What set of graphics the sprites define.
 	 * E num-sprites   How many sprites are in this set?
 	_skip_sprites = skip_num;
 }
 /* Action 0x05 (SKIP) */
-static void SkipAct5(byte *buf, int len)
+static void SkipAct5(byte *buf, size_t len)
 {
 	if (!check_length(len, 2, "SkipAct5")) return;
 	buf++;
 	/* Ignore type byte */
 			return UINT_MAX;
 	}
 }
 /* Action 0x06 */
-static void CfgApply(byte *buf, int len)
+static void CfgApply(byte *buf, size_t len)
 {
 	/* <06> <param-num> <param-size> <offset> ... <FF>
 	 *
 	 * B param-num     Number of parameter to substitute (First = "zero")
 	 *                 Ignored if that parameter was not specified in newgrf.cfg
 	}
 }
 /* Action 0x07 */
 /* Action 0x09 */
-static void SkipIf(byte *buf, int len)
+static void SkipIf(byte *buf, size_t len)
 {
 	/* <07/09> <param-num> <param-size> <condition-type> <value> <num-sprites>
 	 *
 	 * B param-num
 	 * B param-size
 	}
 }
 /* Action 0x08 (GLS_FILESCAN) */
-static void ScanInfo(byte *buf, int len)
+static void ScanInfo(byte *buf, size_t len)
 {
 	if (!check_length(len, 8, "Info")) return;
 	buf++;
 	grf_load_byte(&buf);
 	uint32 grfid  = grf_load_dword(&buf);
 	/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */
 	_skip_sprites = -1;
 }
 /* Action 0x08 */
-static void GRFInfo(byte *buf, int len)
+static void GRFInfo(byte *buf, size_t len)
 {
 	/* <08> <version> <grf-id> <name> <info>
 	 *
 	 * B version       newgrf version, currently 06
 	 * 4*B grf-id      globally unique ID of this .grf file
 	/* Do swap the GRFID for displaying purposes since people expect that */
 	DEBUG(grf, 1, "GRFInfo: Loaded GRFv%d set %08lX - %s", version, BSWAP32(grfid), name);
 }
 /* Action 0x0A */
-static void SpriteReplace(byte *buf, int len)
+static void SpriteReplace(byte *buf, size_t len)
 {
 	/* <0A> <num-sets> <set1> [<set2> ...]
 	 * <set>: <num-sprites> <first-sprite>
 	 *
 	 * B num-sets      How many sets of sprites to replace.
 		}
 	}
 }
 /* Action 0x0A (SKIP) */
-static void SkipActA(byte *buf, int len)
+static void SkipActA(byte *buf, size_t len)
 {
 	buf++;
 	uint8 num_sets = grf_load_byte(&buf);
 	for (uint i = 0; i < num_sets; i++) {
 	grfmsg(3, "SkipActA: Skipping %d sprites", _skip_sprites);
 }
 /* Action 0x0B */
-static void GRFLoadError(byte *buf, int len)
+static void GRFLoadError(byte *buf, size_t len)
 {
 	/* <0B> <severity> <language-id> <message-id> [<message...> 00] [<data...>] 00 [<parnum>]
 	 *
 	 * B severity      00: notice, contine loading grf file
 	 *                 01: warning, continue loading grf file
 	_cur_grfconfig->error = error;
 }
 /* Action 0x0C */
-static void GRFComment(byte *buf, int len)
+static void GRFComment(byte *buf, size_t len)
 {
 	/* <0C> [<ignored...>]
 	 *
 	 * V ignored       Anything following the 0C is ignored */
 	if (len == 1) return;
-	int text_len = len - 1;
+	size_t text_len = len - 1;
 	const char *text = (const char*)(buf + 1);
 	grfmsg(2, "GRFComment: %.*s", text_len, text);
 }
 /* Action 0x0D (GLS_SAFETYSCAN) */
-static void SafeParamSet(byte *buf, int len)
+static void SafeParamSet(byte *buf, size_t len)
 {
 	if (!check_length(len, 5, "SafeParamSet")) return;
 	buf++;
 	uint8 target = grf_load_byte(&buf);
 	return UINT_MAX;
 }
 /* Action 0x0D */
-static void ParamSet(byte *buf, int len)
+static void ParamSet(byte *buf, size_t len)
 {
 	/* <0D> <target> <operation> <source1> <source2> [<data>]
 	 *
 	 * B target        parameter number where result is stored
 	 * B operation     operation to perform, see below
 			break;
 	}
 }
 /* Action 0x0E (GLS_SAFETYSCAN) */
-static void SafeGRFInhibit(byte *buf, int len)
+static void SafeGRFInhibit(byte *buf, size_t len)
 {
 	/* <0E> <num> <grfids...>
 	 *
 	 * B num           Number of GRFIDs that follow
 	 * D grfids        GRFIDs of the files to deactivate */
 		}
 	}
 }
 /* Action 0x0E */
-static void GRFInhibit(byte *buf, int len)
+static void GRFInhibit(byte *buf, size_t len)
 {
 	/* <0E> <num> <grfids...>
 	 *
 	 * B num           Number of GRFIDs that follow
 	 * D grfids        GRFIDs of the files to deactivate */
 		}
 	}
 }
 /* Action 0x0F */
-static void FeatureTownName(byte *buf, int len)
+static void FeatureTownName(byte *buf, size_t len)
 {
 	/* <0F> <id> <style-name> <num-parts> <parts>
 	 *
 	 * B id          ID of this definition in bottom 7 bits (final definition if bit 7 set)
 	 * V style-name  Name of the style (only for final definition)
 		grfmsg(6, "FeatureTownName: part %d, total probability %d", i, townname->partlist[id][i].maxprob);
 	}
 }
 /* Action 0x10 */
-static void DefineGotoLabel(byte *buf, int len)
+static void DefineGotoLabel(byte *buf, size_t len)
 {
 	/* <10> <label> [<comment>]
 	 *
 	 * B label      The label to define
 	 * V comment    Optional comment - ignored */
 	grfmsg(2, "DefineGotoLabel: GOTO target with label 0x%02X", label->label);
 }
 /* Action 0x11 */
-static void GRFSound(byte *buf, int len)
+static void GRFSound(byte *buf, size_t len)
 {
 	/* <11> <num>
 	 *
 	 * W num      Number of sound files that follow */
 	if (_cur_grffile->sound_offset == 0) _cur_grffile->sound_offset = GetNumSounds();
 }
 /* Action 0x11 (SKIP) */
-static void SkipAct11(byte *buf, int len)
+static void SkipAct11(byte *buf, size_t len)
 {
 	/* <11> <num>
 	 *
 	 * W num      Number of sound files that follow */
 		}
 	}
 }
 /* Action 0x12 */
-static void LoadFontGlyph(byte *buf, int len)
+static void LoadFontGlyph(byte *buf, size_t len)
 {
 	/* <12> <num_def> <font_size> <num_char> <base_char>
 	 *
 	 * B num_def      Number of definitions
 	 * B font_size    Size of font (0 = normal, 1 = small, 2 = large)
 		}
 	}
 }
 /* Action 0x12 (SKIP) */
-static void SkipAct12(byte *buf, int len)
+static void SkipAct12(byte *buf, size_t len)
 {
 	/* <12> <num_def> <font_size> <num_char> <base_char>
 	 *
 	 * B num_def      Number of definitions
 	 * B font_size    Size of font (0 = normal, 1 = small, 2 = large)
 	grfmsg(3, "SkipAct12: Skipping %d sprites", _skip_sprites);
 }
 /* Action 0x13 */
-static void TranslateGRFStrings(byte *buf, int len)
+static void TranslateGRFStrings(byte *buf, size_t len)
 {
 	/* <13> <grfid> <num-ent> <offset> <text...>
 	 *
 	 * 4*B grfid     The GRFID of the file whose texts are to be translated
 	 * B   num-ent   Number of strings
 	}
 }
 /* Used during safety scan on unsafe actions */
-static void GRFUnsafe(byte *buf, int len)
+static void GRFUnsafe(byte *buf, size_t len)
 {
 	SetBit(_cur_grfconfig->flags, GCF_UNSAFE);
 	/* Skip remainder of GRF */
 	_skip_sprites = -1;

changeset 9146	dbe2317185eb
parent 9113	c2856e41abf3
child 9208	191eb01c025a