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

(svn r19829) -Codechange: Extract assignment from the condition-check in the for statement.

release/1.1
alberth 2010-05-16 18:22:07 +00:00
parent d8b9cf482a
commit 8b582edb38
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf_gui.cpp
View File

@ -715,12 +715,13 @@ struct NewGRFWindow : public Window {
break; break;
case SNGRFS_REMOVE: { // Remove GRF case SNGRFS_REMOVE: { // Remove GRF
GRFConfig **pc, *c, *newsel; GRFConfig **pc, *newsel;
/* Choose the next GRF file to be the selected file */ /* Choose the next GRF file to be the selected file */
newsel = this->sel->next; newsel = this->sel->next;
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next) { for (pc = &this->list; *pc != NULL; pc = &(*pc)->next) {
GRFConfig *c = *pc;
/* If the new selection is empty (i.e. we're deleting the last item /* If the new selection is empty (i.e. we're deleting the last item
* in the list, pick the file just before the selected file */ * in the list, pick the file just before the selected file */
if (newsel == NULL && c->next == this->sel) newsel = c; if (newsel == NULL && c->next == this->sel) newsel = c;
@ -740,11 +741,12 @@ struct NewGRFWindow : public Window {
} }
case SNGRFS_MOVE_UP: { // Move GRF up case SNGRFS_MOVE_UP: { // Move GRF up
GRFConfig **pc, *c; GRFConfig **pc;
if (this->sel == NULL) break; if (this->sel == NULL) break;
int pos = 0; int pos = 0;
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next, pos++) { for (pc = &this->list; *pc != NULL; pc = &(*pc)->next, pos++) {
GRFConfig *c = *pc;
if (c->next == this->sel) { if (c->next == this->sel) {
c->next = this->sel->next; c->next = this->sel->next;
this->sel->next = c; this->sel->next = c;
@ -759,11 +761,12 @@ struct NewGRFWindow : public Window {
} }
case SNGRFS_MOVE_DOWN: { // Move GRF down case SNGRFS_MOVE_DOWN: { // Move GRF down
GRFConfig **pc, *c; GRFConfig **pc;
if (this->sel == NULL) break; if (this->sel == NULL) break;
int pos = 1; // Start at 1 as we swap the selected newgrf with the next one int pos = 1; // Start at 1 as we swap the selected newgrf with the next one
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next, pos++) { for (pc = &this->list; *pc != NULL; pc = &(*pc)->next, pos++) {
GRFConfig *c = *pc;
if (c == this->sel) { if (c == this->sel) {
*pc = c->next; *pc = c->next;
c->next = c->next->next; c->next = c->next->next;