(svn r1341) -Fix: fix WWT_FRAME drawing when there is no text there (STR_NULL)
authordarkvater
Mon, 03 Jan 2005 17:55:25 +0000
changeset 860 fad6642f6217
parent 859 611a03925f9a
child 861 856b669da209
(svn r1341) -Fix: fix WWT_FRAME drawing when there is no text there (STR_NULL)
-Copyright notice is now 2002-2005 for all languages
lang/american.txt
lang/catalan.txt
lang/czech.txt
lang/danish.txt
lang/dutch.txt
lang/finnish.txt
lang/french.txt
lang/galician.txt
lang/german.txt
lang/hungarian.txt
lang/icelandic.txt
lang/italian.txt
lang/norwegian.txt
lang/polish.txt
lang/portuguese.txt
lang/romanian.txt
lang/slovak.txt
lang/spanish.txt
lang/swedish.txt
misc_gui.c
widget.c
--- a/lang/american.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/american.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Can't clear this area....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/catalan.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/catalan.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}No es pot netejar l'ŕrea....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Tots els Drets reservats
 STR_00B7_VERSION						:{BLACK}OpenTTD versió {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/czech.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/czech.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Nemuzes vycistit tuto oblast...
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Puvodni copyright: {COPYRIGHT} 1995 Chris Sawyer, vsechna práva vyhrazena
 STR_00B7_VERSION						:{BLACK}OpenTTD verze {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 Tým OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 Tým OpenTTD
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/danish.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/danish.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -157,7 +157,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Kan ikke rydde omrĺdet....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle retigheder reserveret
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/dutch.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/dutch.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Kan gebied niet ontruimen....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Origineel copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rechten voorbehouden
 STR_00B7_VERSION						:{BLACK}OpenTTD versie {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 Het OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 Het OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/finnish.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/finnish.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Aluetta ei voi puhdistaa....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Alkuperäinen {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään
 STR_00B7_VERSION						:{BLACK}OpenTTD versio {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-ryhmä
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-ryhmä
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/french.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/french.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Impossible de balayer....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright originel {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/galician.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/galician.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Non podes limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados
 STR_00B7_VERSION						:{BLACK}OpenTTD versión {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/german.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/german.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Kann das Gebiet nicht räumen....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle Rechte vorbehalten
 STR_00B7_VERSION						:{BLACK}OpenTTD Version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-Team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-Team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/hungarian.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/hungarian.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Nem tisztíthatod meg a területet...
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/icelandic.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/icelandic.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Get ekki hreinsađ ţetta svćđi....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin
 STR_00B7_VERSION						:{BLACK}OpenTTD útgáfa {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD hópurinn
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD hópurinn
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/italian.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/italian.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Non puoi ripulire l'area....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright Originale{COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati
 STR_00B7_VERSION						:{BLACK}OpenTTD versione {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/norwegian.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/norwegian.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Kan ikke rydde feltet....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Opprinnelig copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert
 STR_00B7_VERSION						:{BLACK}OpenTTD versjon {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-teamet
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-teamet
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/polish.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/polish.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Nie mozna wyczyscic terenu....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION						:{BLACK}Wersja OpenTTD {REV}: Language Pack by Tom and PolPot and Spooqy
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/portuguese.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/portuguese.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Năo é possível limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
 STR_00B7_VERSION						:{BLACK}OpenTTD versăo {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 A equipa do OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 A equipa do OpenTTD
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/romanian.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/romanian.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Nu pot curăta terenul....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate
 STR_00B7_VERSION						:{BLACK}OpenTTD versiunea {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 Echipa OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 Echipa OpenTTD
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/slovak.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/slovak.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Oblast sa neda vycistit...
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/spanish.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/spanish.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}No se puede desbrozar esta zona....
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados
 STR_00B7_VERSION						:{BLACK}OpenTTD versión {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 El equipo OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 El equipo OpenTTD
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/lang/swedish.txt	Mon Jan 03 16:45:42 2005 +0000
+++ b/lang/swedish.txt	Mon Jan 03 17:55:25 2005 +0000
@@ -186,7 +186,7 @@
 STR_00B5_CAN_T_CLEAR_THIS_AREA					:{WHITE}Kan inte röja omrĺdet...
 STR_00B6_ORIGINAL_COPYRIGHT					:{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
 STR_00B7_VERSION						:{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-teamet
+STR_00BA_COPYRIGHT_OPENTTD					:{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-teamet
 
 STR_00C5							:{BLACK}{CROSS}
 STR_00C6							:{SILVER}{CROSS}
--- a/misc_gui.c	Mon Jan 03 16:45:42 2005 +0000
+++ b/misc_gui.c	Mon Jan 03 17:55:25 2005 +0000
@@ -256,7 +256,7 @@
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,					STR_NULL},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_015B_OPENTTD,	STR_NULL},
 {      WWT_PANEL,    14,     0,   399,    14,   271, 0x0,								STR_NULL},
-{      WWT_FRAME,    14,     5,   394,    40,   245, STR_EMPTY,					STR_NULL},
+{      WWT_FRAME,    14,     5,   394,    40,   245, STR_NULL,					STR_NULL},
 {    WIDGETS_END},
 };
 
--- a/widget.c	Mon Jan 03 16:45:42 2005 +0000
+++ b/widget.c	Mon Jan 03 17:55:25 2005 +0000
@@ -361,7 +361,7 @@
 
 		case WWT_FRAME: {
 			int c1,c2;
-			int x2 = 0;
+			int x2 = r.left; // by default the left side is the left side of the widget
 
 			if (wi->unkA != 0) {
 				x2 = DrawString(r.left+6, r.top, wi->unkA, 0);