cpp/openttd-patchpack/source Changeset - r11768:8679e8bbb8cb

Changeset - r11768:8679e8bbb8cb

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 15 years ago 2009-04-26 15:42:45
rubidium@openttd.org

(svn r16163) -Codechange: instead of SetDParamStr(0, string); DrawString(..., STR_JUST_RAW_STRING, ...) use DrawString(..., string, ...).

4 files changed with 7 insertions and 16 deletions:

src/genworld_gui.cpp

src/network/network_content_gui.cpp

src/network/network_gui.cpp

src/roadveh_gui.cpp

0 comments (0 inline, 0 general)

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -642,14 +642,13 @@ struct GenerateLandscapeWindow : public @@
 				SetDParam(0, this->x);
 				SetDParam(1, this->y);
+			}
 			int right = DrawString(0, 326, 91, STR_HEIGHTMAP_SIZE, TC_FROMSTRING, SA_RIGHT);
 			DrawString( 12, 114, 91, STR_HEIGHTMAP_NAME);
 			SetDParamStr(0, this->name);
 			DrawString(114, right - 5, 91, STR_JUST_RAW_STRING, TC_ORANGE);
 			DrawString(114, right - 5, 91, this->name, TC_ORANGE);
+		}
+	}
 	virtual void OnClick(Point pt, int widget)
+	{
 		switch (widget) {

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -420,14 +420,13 @@ public: @@
+			}
 			DrawSprite(sprite, pal, this->widget[NCLWW_CHECKBOX].left + (pal == PAL_NONE ? 3 : 4), y + (pal == PAL_NONE ? 1 : 0));
 			StringID str = STR_CONTENT_TYPE_BASE_GRAPHICS + ci->type - CONTENT_TYPE_BASE_GRAPHICS;
 			DrawString(this->widget[NCLWW_TYPE].left, this->widget[NCLWW_TYPE].right, y, str, TC_BLACK, SA_CENTER);
 			SetDParamStr(0, ci->name);
 			DrawString(this->widget[NCLWW_NAME].left + 5, this->widget[NCLWW_NAME].right, y, STR_JUST_RAW_STRING, TC_BLACK);
 			DrawString(this->widget[NCLWW_NAME].left + 5, this->widget[NCLWW_NAME].right, y, ci->name, TC_BLACK);
 			y += this->resize.step_height;
+		}
 		/* Create the nice grayish rectangle at the details top */
 		GfxFillRect(this->widget[NCLWW_DETAILS].left + 1, this->widget[NCLWW_DETAILS].top + 1, this->widget[NCLWW_DETAILS].right - 1, this->widget[NCLWW_DETAILS].top + 50, 157);
 		DrawString(this->widget[NCLWW_DETAILS].left + 2, this->widget[NCLWW_DETAILS].right - 2, this->widget[NCLWW_DETAILS].top + 11, STR_CONTENT_DETAIL_TITLE, TC_FROMSTRING, SA_CENTER);

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -237,14 +237,13 @@ protected: @@
 	 */
 	void DrawServerLine(const NetworkGameList *cur_item, uint y, bool highlight)
+	{
 		/* show highlighted item with a different colour */
 		if (highlight) GfxFillRect(this->widget[NGWW_NAME].left + 1, y - 2, this->widget[NGWW_INFO].right - 1, y + 9, 10);
 		SetDParamStr(0, cur_item->info.server_name);
 		DrawString(this->widget[NGWW_NAME].left + 5, this->widget[NGWW_NAME].right, y, STR_JUST_RAW_STRING, TC_BLACK);
 		DrawString(this->widget[NGWW_NAME].left + 5, this->widget[NGWW_NAME].right, y, cur_item->info.server_name, TC_BLACK);
 		/* only draw details if the server is online */
 		if (cur_item->online) {
 			SetDParam(0, cur_item->info.clients_on);
 			SetDParam(1, cur_item->info.clients_max);
 			SetDParam(2, cur_item->info.companies_on);
@@ @@ -411,28 +410,23 @@ public: @@
 		/* Draw the right menu */
 		GfxFillRect(this->widget[NGWW_DETAILS].left + 1, 43, this->widget[NGWW_DETAILS].right - 1, 92, 157);
 		if (sel == NULL) {
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 58, STR_NETWORK_GAME_INFO, TC_FROMSTRING, SA_CENTER);
 		} else if (!sel->online) {
 			SetDParamStr(0, sel->info.server_name);
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 68, STR_JUST_RAW_STRING, TC_ORANGE, SA_CENTER); // game name
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 68, sel->info.server_name, TC_ORANGE, SA_CENTER); // game name
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 132, STR_NETWORK_SERVER_OFFLINE, TC_FROMSTRING, SA_CENTER); // server offline
 		} else { // show game info
 			uint16 y = 100;
 			const uint16 x = this->widget[NGWW_DETAILS].left + 5;
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 48, STR_NETWORK_GAME_INFO, TC_FROMSTRING, SA_CENTER);
 			SetDParamStr(0, sel->info.server_name);
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 62, STR_JUST_RAW_STRING, TC_ORANGE, SA_CENTER); // game name
 			SetDParamStr(0, sel->info.map_name);
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 74, STR_JUST_RAW_STRING, TC_BLACK, SA_CENTER); // map name
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 62, sel->info.server_name, TC_ORANGE, SA_CENTER); // game name
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 74, sel->info.map_name, TC_BLACK, SA_CENTER); // map name
 			SetDParam(0, sel->info.clients_on);
 			SetDParam(1, sel->info.clients_max);
 			SetDParam(2, sel->info.companies_on);
 			SetDParam(3, sel->info.companies_max);
 			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_CLIENTS);

src/roadveh_gui.cpp

➞

Show inline comments

@@ @@ -69,14 +69,13 @@ void DrawRoadVehDetails(const Vehicle *v @@
+				}
 				first = false;
+			}
+		}
 		SetDParamStr(0, capacity);
 		DrawString(left, right, y + 10 + y_offset, STR_JUST_RAW_STRING, TC_BLUE);
 		DrawString(left, right, y + 10 + y_offset, capacity, TC_BLUE);
 		for (const Vehicle *u = v; u != NULL; u = u->Next()) {
 			if (u->cargo_cap == 0) continue;
 			str = STR_VEHICLE_DETAILS_CARGO_EMPTY;
 			if (!u->cargo.Empty()) {

0 comments (0 inline, 0 general)