# HG changeset patch # User richk # Date 1186332863 0 # Node ID 1997cef8a94f5bc75a7757acc41bf222825410e3 # Parent d449df6f7eaf9093a47e8df01ebc7e459e173a99 (svn r10795) [NewGRF_ports] -Change: GSF_FSMPORTS now uses separate explicit Case, rather than default fallthrough. diff -r d449df6f7eaf -r 1997cef8a94f src/newgrf.cpp --- a/src/newgrf.cpp Sun Aug 05 16:52:48 2007 +0000 +++ b/src/newgrf.cpp Sun Aug 05 16:54:23 2007 +0000 @@ -3531,6 +3531,32 @@ break; } + case GSF_FSMPORTS: { + switch (GB(id, 8, 8)) { + case 0xCD: // FSMport class name + if (_cur_grffile->fsmports == NULL || _cur_grffile->fsmports[GB(id, 0, 8)] == NULL) { + grfmsg(1, "FeatureNewName: Attempt to name undefined fsmport class 0x%X, ignoring", GB(id, 0, 8)); + } else { + FSMportsClassID sclass = _cur_grffile->fsmports[GB(id, 0, 8)]->sclass; + SetFSMportsClassName(sclass, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED)); + } + break; + + case 0xCE: // FSMport name + if (_cur_grffile->fsmports == NULL || _cur_grffile->fsmports[GB(id, 0, 8)] == NULL) { + grfmsg(1, "FeatureNewName: Attempt to name undefined fsmport 0x%X, ignoring", GB(id, 0, 8)); + } else { + _cur_grffile->fsmports[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); + } + break; + + default: + grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id); + break; + } + break; + } + case GSF_TOWNHOUSE: default: switch (GB(id, 8, 8)) { @@ -3559,23 +3585,6 @@ } break; - case 0xCD: // FSMport class name - if (_cur_grffile->fsmports == NULL || _cur_grffile->fsmports[GB(id, 0, 8)] == NULL) { - grfmsg(1, "FeatureNewName: Attempt to name undefined fsmport class 0x%X, ignoring", GB(id, 0, 8)); - } else { - FSMportsClassID sclass = _cur_grffile->fsmports[GB(id, 0, 8)]->sclass; - SetFSMportsClassName(sclass, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED)); - } - break; - - case 0xCE: // FSMport name - if (_cur_grffile->fsmports == NULL || _cur_grffile->fsmports[GB(id, 0, 8)] == NULL) { - grfmsg(1, "FeatureNewName: Attempt to name undefined fsmport 0x%X, ignoring", GB(id, 0, 8)); - } else { - _cur_grffile->fsmports[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); - } - break; - case 0xD0: case 0xDC: AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);