gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-02 04:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium 2009-04-26 15:42:45 +00:00
parent 7dd677ced2
commit 85b653bafc
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/genworld_gui.cpp
View File

@ -645,8 +645,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
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);
}
}

3
src/network/network_content_gui.cpp
View File

@ -423,8 +423,7 @@ public:
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;
}

14
src/network/network_gui.cpp
View File

@ -240,8 +240,7 @@ protected:
/* 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) {
@ -414,8 +413,7 @@ public:
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
@ -424,12 +422,8 @@ public:
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);

3
src/roadveh_gui.cpp
View File

@ -72,8 +72,7 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
}
}
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;