summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/Color.h3
-rw-r--r--po/fr.po3
-rw-r--r--src/Makefile.am4
3 files changed, 6 insertions, 4 deletions
diff --git a/include/Color.h b/include/Color.h
index 293c55c..1d262d4 100644
--- a/include/Color.h
+++ b/include/Color.h
@@ -5,6 +5,9 @@ struct Color {
Color(unsigned char aR, unsigned char aG, unsigned char aB, unsigned char aA = 255) :
R(aR), G(aG), B(aB), A(aA) { }
unsigned char R, G, B, A;
+#ifdef GL_COLOR
+ void Bind() { glColor4d((double) R / 255, (double) G / 255, (double) B / 255, (double) A / 255); }
+#endif
};
#endif
diff --git a/po/fr.po b/po/fr.po
index 8cea32b..b387c4d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -85,9 +85,8 @@ msgid "Can't SetZ a virtual Handle."
msgstr "Ne peut SetZ sur un Handle virtuel."
#: lib/Handle.cc:232
-#, fuzzy
msgid "Was not able to gzdopen."
-msgstr "N'a pu faire de gzdopen.\n"
+msgstr "N'a pu faire de gzdopen."
#: lib/Handle.cc:253
msgid "Error in zlib during gzwrite: "
diff --git a/src/Makefile.am b/src/Makefile.am
index 1754324..dc5372e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,9 +8,9 @@ INCLUDES = -I.. -I../include -I$(includedir)
noinst_PROGRAMS = Baltisot
-#noinst_JAVA = TestApplet.java
+noinst_JAVA = TestApplet.java
-#JAVAROOT = datas
+JAVAROOT = datas
Baltisot_SOURCES = Main.cc