diff options
| author | smatz <smatz@openttd.org> | 2010-05-13 11:07:04 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-05-13 11:07:04 +0000 |
| commit | 28d25cadfc87398c3b352a07de377b836e4aa0d1 (patch) | |
| tree | 8770d1a716cbbd56b5c32c62e90b2411d85c6747 | |
| parent | 062dd0e24c283f210216ede06bbde0ed72c7ed25 (diff) | |
| download | openttd-28d25cadfc87398c3b352a07de377b836e4aa0d1.tar.xz | |
(svn r19815) -Cleanup: remove two unused variables
| -rw-r--r-- | src/newgrf.cpp | 3 | ||||
| -rw-r--r-- | src/pathfinder/npf/aystar.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index ac4fcce53..4f6b88bf8 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2183,7 +2183,6 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr /* Allocate space for this industry. */ if (*tilespec == NULL) { - int tempid; *tilespec = CallocT<IndustryTileSpec>(1); tsp = *tilespec; @@ -2199,7 +2198,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr tsp->grf_prop.local_id = indtid + i; tsp->grf_prop.subst_id = subs_id; tsp->grf_prop.grffile = _cur_grffile; - tempid = _industile_mngr.AddEntityID(indtid + i, _cur_grffile->grfid, subs_id); // pre-reserve the tile slot + _industile_mngr.AddEntityID(indtid + i, _cur_grffile->grfid, subs_id); // pre-reserve the tile slot } } break; diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp index ffe62f7fa..a4ea8f70c 100644 --- a/src/pathfinder/npf/aystar.cpp +++ b/src/pathfinder/npf/aystar.cpp @@ -158,7 +158,7 @@ static int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNod */ static int AyStarMain_Loop(AyStar *aystar) { - int i, r; + int i; /* Get the best node from OpenList */ OpenListNode *current = AyStarMain_OpenList_Pop(aystar); @@ -182,7 +182,7 @@ static int AyStarMain_Loop(AyStar *aystar) /* Go through all neighbours */ for (i = 0; i < aystar->num_neighbours; i++) { /* Check and add them to the OpenList if needed */ - r = aystar->checktile(aystar, &aystar->neighbours[i], current); + aystar->checktile(aystar, &aystar->neighbours[i], current); } /* Free the node */ |