Prepare i18n: use UTF-8, add DejaVu font, convert some maps encoding

git-svn-id: https://s.snth.net/svn/neverball/trunk@18 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/data/map-mym/circuit2.map b/data/map-mym/circuit2.map
index a037f76..843c9df 100644 (file)
--- a/data/map-mym/circuit2.map
+++ b/data/map-mym/circuit2.map
@@ -1,6 +1,6 @@
 // entity 0
 {
-"message" "La course effrénée.\Let's make some laps."
+"message" "La course effrénée.\Let's make some laps."
 "classname" "worldspawn"
 // brush 0
 {

diff --git a/data/map-mym/comeback.map b/data/map-mym/comeback.map
index e0a2226..58738ab 100644 (file)
--- a/data/map-mym/comeback.map
+++ b/data/map-mym/comeback.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le cycle éternel.\Avoid teleporters..."
+"message" "Le cycle éternel.\Avoid teleporters..."
 // brush 0
 {
 ( -136 136 -8 ) ( -136 136 0 ) ( -392 136 0 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/hard.map b/data/map-mym/hard.map
index 3add85e..b443093 100644 (file)
--- a/data/map-mym/hard.map
+++ b/data/map-mym/hard.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "La maîtrise de Neverball.\You still think Neverball is too easy?"
+"message" "La maîtrise de Neverball.\You still think Neverball is too easy?"
 // brush 0
 {
 ( 1624 8714 -240 ) ( 1624 8906 -240 ) ( 1688 8906 -240 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/loop2.map b/data/map-mym/loop2.map
index 601c455..40bd864 100644 (file)
--- a/data/map-mym/loop2.map
+++ b/data/map-mym/loop2.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le contrôle des courbes.\Find the right angle to turn,\to jump, and to land..."
+"message" "Le contrôle des courbes.\Find the right angle to turn,\to jump, and to land..."
 // brush 0
 {
 ( 72 -328 -16 ) ( -56 -328 -16 ) ( -56 -456 -16 ) mtrl/turf-grey -16 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/maze1.map b/data/map-mym/maze1.map
index 9fc7fa1..b0034d8 100644 (file)
--- a/data/map-mym/maze1.map
+++ b/data/map-mym/maze1.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le chemin dissimulé.\Test your memory."
+"message" "Le chemin dissimulé.\Test your memory."
 // brush 0
 {
 ( 744 232 0 ) ( 16 232 0 ) ( 16 232 -8 ) mtrl/wood -80 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/narrow.map b/data/map-mym/narrow.map
index bfc1013..b1adb86 100644 (file)
--- a/data/map-mym/narrow.map
+++ b/data/map-mym/narrow.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le sentier étroit.\Patience and timing.\Tips: maximise speed at the first slope."
+"message" "Le sentier étroit.\Patience and timing.\Tips: maximise speed at the first slope."
 // brush 0
 {
 ( -64 72 -8 ) ( -192 72 -8 ) ( -192 -56 -8 ) mtrl/turf-grey 0 16 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/running.map b/data/map-mym/running.map
index 0e76a9b..22902b4 100644 (file)
--- a/data/map-mym/running.map
+++ b/data/map-mym/running.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Les épreuves minutées.\Run baby, run!"
+"message" "Les épreuves minutées.\Run baby, run!"
 // brush 0
 {
 ( -200 912 8 ) ( -200 896 8 ) ( -200 896 0 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/snow.map b/data/map-mym/snow.map
index e9f859e..ffd15fe 100644 (file)
--- a/data/map-mym/snow.map
+++ b/data/map-mym/snow.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "La descente rafraîchissante.\Not so fast, not so fast."
+"message" "La descente rafraîchissante.\Not so fast, not so fast."
 // brush 0
 {
 ( -384 64 16 ) ( -384 -64 16 ) ( -384 -64 0 ) mtrl/dark-glass 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym/up.map b/data/map-mym/up.map
index 1207964..4e4c36c 100644 (file)
--- a/data/map-mym/up.map
+++ b/data/map-mym/up.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "L'ascension pressée.\Only one piece of advice: don't stop!"
+"message" "L'ascension pressée.\Only one piece of advice: don't stop!"
 // brush 0
 {
 ( 64 704 -8 ) ( -64 704 -8 ) ( -64 384 -8 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/bigcones.map b/data/map-mym2/bigcones.map
index 089b8ea..c278f03 100644 (file)
--- a/data/map-mym2/bigcones.map
+++ b/data/map-mym2/bigcones.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Les grands cônes.\Living in a cone."
+"message" "Les grands cônes.\Living in a cone."
 // brush 0
 {
 ( -304 32 608 ) ( -368 32 608 ) ( -368 -32 608 ) mtrl/invisible -32 0 0 0.5 0.5 134217728 0 0

diff --git a/data/map-mym2/bounces.map b/data/map-mym2/bounces.map
index 2eea4fd..afd15e1 100644 (file)
--- a/data/map-mym2/bounces.map
+++ b/data/map-mym2/bounces.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Les sauts du célèbre plombier.\Follow the coins."
+"message" "Les sauts du célèbre plombier.\Follow the coins."
 // brush 0
 {
 ( 64 64 -4 ) ( -64 64 -4 ) ( -64 -56 -4 ) mtrl/dark-glass 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/littlecones.map b/data/map-mym2/littlecones.map
index 29c56cf..23d6cd4 100644 (file)
--- a/data/map-mym2/littlecones.map
+++ b/data/map-mym2/littlecones.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Ne pas se laisser emporter dans le néant.\Don't go too low."
+"message" "Ne pas se laisser emporter dans le néant.\Don't go too low."
 // brush 0
 {
 ( -264 904 -192 ) ( -264 776 -192 ) ( -120 904 -192 ) mtrl/turf-grey 112 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/morenarrow.map b/data/map-mym2/morenarrow.map
index c2248e7..caf3503 100644 (file)
--- a/data/map-mym2/morenarrow.map
+++ b/data/map-mym2/morenarrow.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Plus dur que la difficulté.\Good luck."
+"message" "Plus dur que la difficulté.\Good luck."
 // brush 0
 {
 ( -64 -64 0 ) ( -64 -192 0 ) ( -64 -192 -32 ) mtrl/edge-green-grey-offset 128 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/movinglumps.map b/data/map-mym2/movinglumps.map
index d1c80fd..e648473 100644 (file)
--- a/data/map-mym2/movinglumps.map
+++ b/data/map-mym2/movinglumps.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Être patient.\Not too hard."
+"message" "Être patient.\Not too hard."
 // brush 0
 {
 ( -64 64 0 ) ( -64 -64 0 ) ( -64 -64 -8 ) mtrl/edge2-orangebig 128 16 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/movingpath.map b/data/map-mym2/movingpath.map
index 06b40b5..a64b115 100644 (file)
--- a/data/map-mym2/movingpath.map
+++ b/data/map-mym2/movingpath.map
@@ -1,7 +1,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le passage éphémère.\Trust the coins."
+"message" "Le passage éphémère.\Trust the coins."
 // brush 0
 {
 ( -700 64 0 ) ( -700 -56 0 ) ( -700 -56 -8 ) mtrl/dark-glass 0 0 0 0.500000 0.500000 0 0 0

diff --git a/data/map-mym2/push.map b/data/map-mym2/push.map
index 3a4c842..18d4440 100644 (file)
--- a/data/map-mym2/push.map
+++ b/data/map-mym2/push.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Hé, on pousse pas !\Not too fast, not too slow."
+"message" "Hé, on pousse pas !\Not too fast, not too slow."
 // brush 0
 {
 ( -112 -48 -8 ) ( -112 -48 0 ) ( -128 -64 0 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/rodeo.map b/data/map-mym2/rodeo.map
index 617d367..3e03074 100644 (file)
--- a/data/map-mym2/rodeo.map
+++ b/data/map-mym2/rodeo.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Le rodéo de Neverball.\You'll fall quickly."
+"message" "Le rodéo de Neverball.\You'll fall quickly."
 // brush 0
 {
 ( 513 512 -287 ) ( 513 -512 -287 ) ( -511 512 -287 ) mtrl/goal 128 128 0 -7.5 7.5 134217728 0 0

diff --git a/data/map-mym2/shaker.map b/data/map-mym2/shaker.map
index 7f864a7..a7ffae8 100644 (file)
--- a/data/map-mym2/shaker.map
+++ b/data/map-mym2/shaker.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Prépare un petit sac.\The stomach-tester"
+"message" "Prépare un petit sac.\The stomach-tester"
 // brush 0
 {
 ( 96 96 384 ) ( 96 -32 384 ) ( -32 96 384 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-mym2/sonic.map b/data/map-mym2/sonic.map
index aae0fc3..c32c067 100644 (file)
--- a/data/map-mym2/sonic.map
+++ b/data/map-mym2/sonic.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"message" "Un petit échauffement.\Welcome to the new Tuxmym's set!"
+"message" "Un petit échauffement.\Welcome to the new Tuxmym's set!"
 // brush 0
 {
 ( 256 1416 -872 ) ( 300 1419 -872 ) ( 256 1416 -616 ) mtrl/chrome 0 0 0 0.5 0.5 0 0 0

diff --git a/data/ttf/DejaVuSans-Bold.ttf b/data/ttf/DejaVuSans-Bold.ttf
new file mode 100644 (file)
index 0000000..ee395ac
Binary files /dev/null and b/data/ttf/DejaVuSans-Bold.ttf differ

diff --git a/share/gui.c b/share/gui.c
index cda2ae0..b30c561 100644 (file)
--- a/share/gui.c
+++ b/share/gui.c
@@ -225,7 +225,7 @@ void gui_init(void)
 
     if (TTF_Init() == 0)
     {
-        int s0 = s / 24;
+        int s0 = s / 26;
         int s1 = s / 12;
         int s2 = s /  6;
         int m;

diff --git a/share/gui.h b/share/gui.h
index 223df11..18987b6 100644 (file)
--- a/share/gui.h
+++ b/share/gui.h
@@ -19,7 +19,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define GUI_FACE "ttf/VeraBd.ttf"
+#define GUI_FACE "ttf/DejaVuSans-Bold.ttf"
 #define GUI_SML  0
 #define GUI_MED  1
 #define GUI_LRG  2

diff --git a/share/image.c b/share/image.c
index b5af04d..884efe9 100644 (file)
--- a/share/image.c
+++ b/share/image.c
@@ -281,7 +281,7 @@ GLuint make_image_from_font(int *W, int *H,
 
     if (text && strlen(text) > 0)
     {
-        if ((src = TTF_RenderText_Blended(font, text, fg)))
+        if ((src = TTF_RenderUTF8_Blended(font, text, fg)))
         {
             int w2;
             int h2;