Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r10044) -Fix: Minor NewGRF debug message fixes, and skip sprites of an unsupported Action 5 feature.

Browse Source
pull/155/head
peter1138 17 years ago
parent 3c522a7451
commit 6c11a1f9b7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File

7
src/newgrf.cpp
Unescape Escape View File

@ -2504,7 +2504,7 @@ static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8
/* Don't tell me you don't love duplicated code! */ /* Don't tell me you don't love duplicated code! */
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) { if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", grfmsg(1, "VehicleMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping",
groupid, _cur_grffile->spritegroups_count); groupid, _cur_grffile->spritegroups_count);
continue; continue;
} }
@ -2914,7 +2914,7 @@ static void GraphicsNew(byte *buf, int len)
case 0x0B: // tramways case 0x0B: // tramways
if (num != 113) { if (num != 113) {
grfmsg(1, "GraphicsNews: Tramway graphics sprite count must be 113, skipping"); grfmsg(1, "GraphicsNew: Tramway graphics sprite count must be 113, skipping");
return; return;
} }
replace = SPR_TRAMWAY_BASE; replace = SPR_TRAMWAY_BASE;
@ -2947,6 +2947,7 @@ static void GraphicsNew(byte *buf, int len)
default: default:
grfmsg(2, "GraphicsNew: Custom graphics (type 0x%02X) sprite block of length %u (unimplemented, ignoring)", grfmsg(2, "GraphicsNew: Custom graphics (type 0x%02X) sprite block of length %u (unimplemented, ignoring)",
type, num); type, num);
_skip_sprites = num;
return; return;
} }
@ -3428,7 +3429,7 @@ static void GRFLoadError(byte *buf, int len)
/* Skip the error until the activation stage unless bit 7 of the severity /* Skip the error until the activation stage unless bit 7 of the severity
* is set. */ * is set. */
if (!HASBIT(severity, 7) && _cur_stage < GLS_ACTIVATION) { if (!HASBIT(severity, 7) && _cur_stage < GLS_ACTIVATION) {
grfmsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage 1"); grfmsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage %d", _cur_stage);
return; return;
} }
CLRBIT(severity, 7); CLRBIT(severity, 7);

Write Preview
Loading…
Cancel
Save