summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2007-03-11 02:53:44 +0000
committerbelugas <belugas@openttd.org>2007-03-11 02:53:44 +0000
commitc90cfa1df03d2025d228f174941bcb8b884ab01c (patch)
tree77f3ccdb19ba095e6e9aec1b6e4a8d9873f8cc70
parenta06fb56746d0121af0ee2aa84def1a5452cb3b8a (diff)
downloadopenttd-c90cfa1df03d2025d228f174941bcb8b884ab01c.tar.xz
(svn r9108) -Fix(9093) : MSVC was a bit unhappy with some of the type changes. So basically, widening the types makes the difference
-rw-r--r--src/newgrf.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 9edf93195..09e63d6ee 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1352,7 +1352,7 @@ static bool SoundEffectChangeInfo(uint sid, int numinfo, int prop, byte **bufp,
static void FeatureChangeInfo(byte *buf, int len)
{
byte *bufend = buf + len;
- int i;
+ uint i;
/* <00> <feature> <num-props> <num-info> <id> (<property <new-info>)...
*
@@ -1394,8 +1394,8 @@ static void FeatureChangeInfo(byte *buf, int len)
buf++;
uint8 feature = grf_load_byte(&buf);
uint8 numprops = grf_load_byte(&buf);
- uint8 numinfo = grf_load_byte(&buf);
- uint8 engine = grf_load_byte(&buf);
+ uint numinfo = grf_load_byte(&buf);
+ uint engine = grf_load_byte(&buf);
grfmsg(6, "FeatureChangeInfo: feature %d, %d properties, to apply to %d+%d",
feature, numprops, engine, numinfo);
@@ -1614,7 +1614,7 @@ static void NewSpriteSet(byte *buf, int len)
_cur_spriteid, feature, num_sets, num_ents, num_sets * num_ents
);
- for (uint i = 0; i < num_sets * num_ents; i++) {
+ for (uint16 i = 0; i < num_sets * num_ents; i++) {
LoadNextSprite(_cur_spriteid++, _file_index);
_nfo_line++;
}