mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED()

release/1.4
rubidium 2013-11-23 18:13:30 +00:00
parent 729d64d8d9
commit be6b64f4e6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/api/script_list.cpp
View File

@ -520,9 +520,7 @@ void ScriptList::Sort(SorterType sorter, bool ascending)
} }
break; break;
default: default: NOT_REACHED();
this->Sort(SORT_BY_ITEM, false);
return;
} }
this->sorter_type = sorter; this->sorter_type = sorter;
this->sort_ascending = ascending; this->sort_ascending = ascending;
@ -641,6 +639,7 @@ void ScriptList::RemoveBottom(int32 count)
if (--size == 0) break; if (--size == 0) break;
} }
} }
break;
case SORT_BY_ITEM: case SORT_BY_ITEM:
for (ScriptListMap::reverse_iterator iter = this->items.rbegin(); iter != this->items.rend(); iter = this->items.rbegin()) { for (ScriptListMap::reverse_iterator iter = this->items.rbegin(); iter != this->items.rend(); iter = this->items.rbegin()) {

2
src/tunnelbridge_cmd.cpp
View File

@ -680,7 +680,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, DoCommandFlag flags, uint32 p1,
switch (transport_type) { switch (transport_type) {
case TRANSPORT_ROAD: cost.AddCost((tiles + 2) * _price[PR_BUILD_ROAD] * 2); break; case TRANSPORT_ROAD: cost.AddCost((tiles + 2) * _price[PR_BUILD_ROAD] * 2); break;
case TRANSPORT_RAIL: cost.AddCost((tiles + 2) * RailBuildCost(railtype)); break; case TRANSPORT_RAIL: cost.AddCost((tiles + 2) * RailBuildCost(railtype)); break;
default: break; default: NOT_REACHED();
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {