summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-03-21 22:46:17 +0000
committerrubidium <rubidium@openttd.org>2009-03-21 22:46:17 +0000
commitf11300d1f95afd4aef64f994aecaaa5af446bf04 (patch)
treee1ae57a53d4852b46ae40e594822c459c6ed726a /src/network
parentce513b46b7d69e2ff53982341b214da07c9a8a1e (diff)
downloadopenttd-f11300d1f95afd4aef64f994aecaaa5af446bf04.tar.xz
(svn r15794) -Codechange: remove the DoDrawString part of the old text drawing API
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_chat_gui.cpp2
-rw-r--r--src/network/network_gui.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 56ec30a3d..81ab4f30b 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -237,7 +237,7 @@ void NetworkDrawChatMessage()
/* Paint the chat messages starting with the lowest at the bottom */
for (uint y = NETWORK_CHAT_LINE_HEIGHT; count-- != 0; y += NETWORK_CHAT_LINE_HEIGHT) {
- DoDrawString(_chatmsg_list[count].message, _chatmsg_box.x + 3, _screen.height - _chatmsg_box.y - y + 1, _chatmsg_list[count].colour);
+ DrawString(_chatmsg_box.x + 3, _chatmsg_box.x + _chatmsg_box.width - 1, _screen.height - _chatmsg_box.y - y + 1, _chatmsg_list[count].message, _chatmsg_list[count].colour);
}
/* Make sure the data is updated next flush */
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index ef4548472..3a05806f0 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -906,7 +906,7 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
this->DrawEditBox(NSSW_GAMENAME);
/* if password is set, draw red '*' next to 'Set password' button */
- if (!StrEmpty(_settings_client.network.server_password)) DoDrawString("*", 408, 23, TC_RED);
+ if (!StrEmpty(_settings_client.network.server_password)) DrawString(408, this->width - 2, 23, "*", TC_RED);
/* draw list of maps */
GfxFillRect(11, 63, 258, 215, 0xD7); // black background of maps list
@@ -919,7 +919,7 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
if (pos == 0) {
DrawString(14, y, STR_4010_GENERATE_RANDOM_NEW_GAME, TC_DARK_GREEN);
} else {
- DoDrawString(item->title, 14, y, _fios_colours[item->type] );
+ DrawString(14, this->width - 1, y, item->title, _fios_colours[item->type] );
}
y += NSSWND_ROWSIZE;
@@ -1609,7 +1609,7 @@ struct NetworkClientListPopupWindow : Window {
colour = TC_BLACK;
}
- DoDrawString(this->action[i], 4, y, colour);
+ DrawString(4, this->width - 4, y, this->action[i], colour);
}
}
@@ -1718,7 +1718,7 @@ struct NetworkClientListWindow : Window
/* Filter out spectators */
if (IsValidCompanyID(ci->client_playas)) DrawCompanyIcon(ci->client_playas, 64, y + 1);
- DoDrawString(ci->client_name, 81, y, colour);
+ DrawString(81, this->width - 2, y, ci->client_name, colour);
y += CLNWND_ROWSIZE;
}