dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving).

Browse Source
This commit is contained in:
frosch
2012-04-22 16:27:55 +00:00
parent 73d926c8d4
commit 6f4d2160c2
9 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_gui.cpp
View File

@@ -78,7 +78,7 @@ public:
switch (widget) {
case WID_BO_CLASS_LIST: {
for (uint i = 0; i < ObjectClass::GetCount(); i++) {
size->width = max(size->width, GetStringBoundingBox(ObjectClass::GetName((ObjectClassID)i)).width);
size->width = max(size->width, GetStringBoundingBox(ObjectClass::Get((ObjectClassID)i)->name).width);
}
size->width += padding.width;
this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
@@ -156,7 +156,7 @@ public:
case WID_BO_CLASS_LIST: {
int y = r.top;
for (uint i = this->vscroll->GetPosition(); this->vscroll->IsVisible(i) && i < ObjectClass::GetCount(); i++) {
SetDParam(0, ObjectClass::GetName((ObjectClassID)i));
SetDParam(0, ObjectClass::Get((ObjectClassID)i)->name);
DrawString(r.left + WD_MATRIX_LEFT, r.right + WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, STR_JUST_STRING,
((int)i == _selected_object_class) ? TC_WHITE : TC_BLACK);
y += this->line_height;