cpp/openttd-patchpack/source Changeset - r17952:b3b330b8aebd

Changeset - r17952:b3b330b8aebd

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 13 years ago 2011-08-20 17:46:03
rubidium@openttd.org

(svn r22771) -Codechange: unify some NewGRFScan calling code

4 files changed with 24 insertions and 26 deletions:

src/console_cmds.cpp

src/network/network_content_gui.cpp

src/newgrf_config.cpp

src/newgrf_gui.cpp

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -1269,7 +1269,6 @@ DEF_CONSOLE_CMD(ConRescanNewGRF) @@
 	TarScanner::DoScan();
 	ScanNewGRFFiles();
 	InvalidateWindowData(WC_GAME_OPTIONS, 0, GOID_NEWGRF_RESCANNED);
 	return true;
+}

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -115,9 +115,6 @@ public: @@
 				case CONTENT_TYPE_NEWGRF:
 					ScanNewGRFFiles();
 					/* Yes... these are the NewGRF windows */
 					InvalidateWindowClassesData(WC_SAVELOAD);
 					InvalidateWindowData(WC_GAME_OPTIONS, 0, GOID_NEWGRF_RESCANNED);
 					break;
 				case CONTENT_TYPE_SCENARIO:

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -605,33 +605,37 @@ void ScanNewGRFFiles() @@
 	uint num = GRFFileScanner::DoScan();
 	DEBUG(grf, 1, "Scan complete, found %d files", num);
 	if (num == 0 || _all_grfs == NULL) return;
 	/* Sort the linked list using quicksort.
 	 * For that we first have to make an array, then sort and
 	 * then remake the linked list. */
 	GRFConfig **to_sort = MallocT<GRFConfig*>(num);
 	if (num != 0 && _all_grfs != NULL) {
 		/* Sort the linked list using quicksort.
 		* For that we first have to make an array, then sort and
 		* then remake the linked list. */
 		GRFConfig **to_sort = MallocT<GRFConfig*>(num);
 	uint i = 0;
 	for (GRFConfig *p = _all_grfs; p != NULL; p = p->next, i++) {
 		to_sort[i] = p;
+	}
 	/* Number of files is not necessarily right */
 	num = i;
 		uint i = 0;
 		for (GRFConfig *p = _all_grfs; p != NULL; p = p->next, i++) {
 			to_sort[i] = p;
+		}
 		/* Number of files is not necessarily right */
 		num = i;
 	QSortT(to_sort, num, &GRFSorter);
+		QSortT(to_sort, num, &GRFSorter);
 	for (i = 1; i < num; i++) {
 		to_sort[i - 1]->next = to_sort[i];
+	}
 	to_sort[num - 1]->next = NULL;
 	_all_grfs = to_sort[0];
 		for (i = 1; i < num; i++) {
 			to_sort[i - 1]->next = to_sort[i];
+		}
 		to_sort[num - 1]->next = NULL;
 		_all_grfs = to_sort[0];
 	free(to_sort);
+		free(to_sort);
 #ifdef ENABLE_NETWORK
 	NetworkAfterNewGRFScan();
+		NetworkAfterNewGRFScan();
 #endif
+	}
 	/* Yes... these are the NewGRF windows */
 	InvalidateWindowClassesData(WC_SAVELOAD);
 	InvalidateWindowData(WC_GAME_OPTIONS, 0, GOID_NEWGRF_RESCANNED);
+}

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -989,9 +989,7 @@ struct NewGRFWindow : public QueryString @@
 				this->avail_sel = NULL;
 				this->avail_pos = -1;
 				this->avails.ForceRebuild();
 				this->InvalidateData(GOID_NEWGRF_RESCANNED);
 				this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window
 				InvalidateWindowClassesData(WC_SAVELOAD);
 				break;
+		}
+	}

0 comments (0 inline, 0 general)