cpp/openttd-patchpack/source Changeset - r2103:d4b2ab6a0279

Changeset - r2103:d4b2ab6a0279

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

Darkvater - 19 years ago 2005-07-17 17:15:33
darkvater@openttd.org

(svn r2613) - Truncate savegames, and vehicle-texts in their window.
- Hardcoded width 5 for saves-path...oops :O

5 files changed with 22 insertions and 26 deletions:

aircraft_gui.c

misc_gui.c

roadveh_gui.c

ship_gui.c

train_gui.c

0 comments (0 inline, 0 general)

aircraft_gui.c

➞

Show inline comments

@@ @@ -523,10 +523,6 @@ static void AircraftViewWndProc(Window * @@
 		SetDParam(1, v->unitnumber);
 		DrawWindowWidgets(w);
 		/* draw the flag */
 		DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2,
 			w->widget[5].top + 1);
 		if (v->vehstatus & VS_CRASHED) {
 			str = STR_8863_CRASHED;
 		} else if (v->vehstatus & VS_STOPPED) {
@@ @@ -559,8 +555,11 @@ static void AircraftViewWndProc(Window * @@
+			}
+		}
 		DrawStringCentered((w->widget[5].right - w->widget[5].left) / 2,
 			w->widget[5].top + 1, str, 0);
 		/* draw the flag plus orders */
 		{	int w_width = w->widget[5].right - w->widget[5].left;
 			DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2, w->widget[5].top + 1);
 			DrawStringCenteredTruncated(w_width / 2 + 6, w->widget[5].top + 1, str, 0, w_width - 8);
+		}
 		DrawWindowViewport(w);
 	} break;

misc_gui.c

➞

Show inline comments

@@ @@ -1176,7 +1176,7 @@ static void DrawFiosTexts(uint maxw) @@
 	if (str != STR_4006_UNABLE_TO_READ_DRIVE) SetDParam(0, tot);
 	DrawString(2, 37, str, 0);
-	DoDrawStringTruncated(path, 2, 27, 16, 5);
+	DoDrawStringTruncated(path, 2, 27, 16, maxw);
+}
 static void MakeSortedSaveGameList(void)
@@ @@ -1245,7 +1245,7 @@ static void SaveLoadDlgWndProc(Window *w @@
 		pos = w->vscroll.pos;
 		while (pos < _fios_num) {
 			item = _fios_list + pos;
-			DoDrawString(item->title, 4, y, _fios_colors[item->type]);
+			DoDrawStringTruncated(item->title, 4, y, _fios_colors[item->type], w->width - 18);
 			pos++;
 			y+=10;
 			if (y >= w->vscroll.cap*10+w->widget[6].top+1)

roadveh_gui.c

➞

Show inline comments

@@ @@ -240,10 +240,6 @@ static void RoadVehViewWndProc(Window *w @@
 		SetDParam(1, v->unitnumber);
 		DrawWindowWidgets(w);
 		/* draw the flag */
 		DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2,
 			w->widget[5].top + 1);
 		if (v->u.road.crashed_ctr != 0) {
 			str = STR_8863_CRASHED;
 		} else if (v->breakdown_ctr == 1) {
@@ @@ -280,8 +276,11 @@ static void RoadVehViewWndProc(Window *w @@
+			}
+		}
 		DrawStringCentered((w->widget[5].right - w->widget[5].left) / 2,
 			w->widget[5].top + 1, str, 0);
 		/* draw the flag plus orders */
 		{	int w_width = w->widget[5].right - w->widget[5].left;
 			DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2, w->widget[5].top + 1);
 			DrawStringCenteredTruncated(w_width / 2 + 6, w->widget[5].top + 1, str, 0, w_width - 8);
+		}
 		DrawWindowViewport(w);
 	} break;

ship_gui.c

➞

Show inline comments

@@ @@ -481,10 +481,6 @@ static void ShipViewWndProc(Window *w, W @@
 		SetDParam(1, v->unitnumber);
 		DrawWindowWidgets(w);
 		/* draw the flag */
 		DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2,
 			w->widget[5].top + 1);
 		if (v->breakdown_ctr == 1) {
 			str = STR_885C_BROKEN_DOWN;
 		} else if (v->vehstatus & VS_STOPPED) {
@@ @@ -519,8 +515,11 @@ static void ShipViewWndProc(Window *w, W @@
+			}
+		}
 		DrawStringCentered((w->widget[5].right - w->widget[5].left) / 2,
 			w->widget[5].top + 1, str, 0);
 		/* draw the flag plus orders */
 		{	int w_width = w->widget[5].right - w->widget[5].left;
 			DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2, w->widget[5].top + 1);
 			DrawStringCenteredTruncated(w_width / 2 + 6, w->widget[5].top + 1, str, 0, w_width - 8);
+		}
 		DrawWindowViewport(w);
 	} break;

train_gui.c

➞

Show inline comments

@@ @@ -834,10 +834,6 @@ static void TrainViewWndProc(Window *w, @@
 		SetDParam(1, v->unitnumber);
 		DrawWindowWidgets(w);
 		/* draw the flag */
 		DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2,
 			w->widget[5].top + 1);
 		if (v->u.rail.crash_anim_pos != 0) {
 			str = STR_8863_CRASHED;
 		} else if (v->breakdown_ctr == 1) {
@@ @@ -886,8 +882,11 @@ static void TrainViewWndProc(Window *w, @@
+			}
+		}
 		DrawStringCentered((w->widget[5].right - w->widget[5].left) / 2,
 			w->widget[5].top + 1, str, 0);
 		/* draw the flag plus orders */
 		{	int w_width = w->widget[5].right - w->widget[5].left;
 			DrawSprite(v->vehstatus & VS_STOPPED ? 0xC12 : 0xC13, 2, w->widget[5].top + 1);
 			DrawStringCenteredTruncated(w_width / 2 + 6, w->widget[5].top + 1, str, 0, w_width - 8);
+		}
 		DrawWindowViewport(w);
 	}	break;

0 comments (0 inline, 0 general)