# HG changeset patch # User smatz # Date 1273748824 0 # Node ID db17dc614727a1d9ca4a34aaeb286d91050258a2 # Parent 418c3a29b00b50846acb0c7d368118bbe7a39c9b (svn r19815) -Cleanup: remove two unused variables diff --git a/src/newgrf.cpp b/src/newgrf.cpp --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2183,7 +2183,6 @@ /* Allocate space for this industry. */ if (*tilespec == NULL) { - int tempid; *tilespec = CallocT(1); tsp = *tilespec; @@ -2199,7 +2198,7 @@ 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 --- a/src/pathfinder/npf/aystar.cpp +++ b/src/pathfinder/npf/aystar.cpp @@ -158,7 +158,7 @@ */ 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 @@ /* 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 */