Adjust LR combine function.

[chise/kage.git] / kagecgi / kagedf.c

diff --git a/kagecgi/kagedf.c b/kagecgi/kagedf.c
index 079c432..17273da 100755 (executable)
--- a/kagecgi/kagedf.c
+++ b/kagecgi/kagedf.c
@@ -1,6 +1,7 @@
 //kagedf.c\r
 //\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
 \r
 void dfDrawFont(int a1, int a2, int a3,\r
        int x1, int y1,\r
@@ -149,10 +150,14 @@ void dfDrawFont(int a1, int a2, int a3,
                break;\r
            case 6:\r
                if(a3 == 5){\r
+                               /* only implimented for gothic\r
                                tx1 = x4 - kMage;\r
                                ty1 = y4;\r
                                tx2 = x4 + kMage * 0.5;\r
                                ty2 = y4 - kMage * 2;\r
+                               */\r
+                               cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, 15);\r
+                               /*\r
                                if(a2 == 7 || a3 == 7){\r
                                        cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 17);\r
                                        cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 17, 15);\r
@@ -161,8 +166,11 @@ void dfDrawFont(int a1, int a2, int a3,
                                        cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 8);\r
                                        cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, 15);\r
                                }\r
+                               */\r
                        }\r
                        else{\r
+                               cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, a3);\r
+                               /*\r
                                if(a2 == 7 || a3 == 7){\r
                                        cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 17);\r
                                        cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 17, a3);\r
@@ -171,6 +179,7 @@ void dfDrawFont(int a1, int a2, int a3,
                                        cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 8);\r
                                        cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, a3);\r
                                }\r
+                               */\r
                        }\r
                        break;\r
        case 7:\r
@@ -178,6 +187,8 @@ void dfDrawFont(int a1, int a2, int a3,
          cdDrawCurve(x2, y2, x3, y3, x4, y4, 1, 7);\r
          break;\r
        case 9: // may not be exist\r
+          kageCanvas[y1][x1] = 0;\r
+          kageCanvas[y2][x2] = 0;\r
          break;\r
        default:\r
          break;\r
@@ -334,13 +345,19 @@ void dfDrawFont(int a1, int a2, int a3,
                                ty1 = y4;\r
                                tx2 = x4 + kMage * 0.5;\r
                                ty2 = y4 - kMage * 2;\r
+                               /*\r
                                cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 1);\r
                                cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, tx1, ty1, 1, 1);\r
+                               */\r
+                               cdDrawBezier(x1, y1, x2, y2, x3, y3, tx1, ty1, a2, 1);\r
                                cdDrawCurve(tx1, ty1, x4, y4, tx2, ty2, 1, 0);\r
                }\r
                else{\r
+                               /*\r
                                cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 1);\r
                                cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, a3);\r
+                               */\r
+                               cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, a3);\r
                }\r
                break;\r
        case 7:\r
@@ -348,6 +365,8 @@ void dfDrawFont(int a1, int a2, int a3,
                cdDrawCurve(x2, y2, x3, y3, x4, y4, 1, a3);\r
                break;\r
        case 9: // may not be exist\r
+          kageCanvas[y1][x1] = 0;\r
+          kageCanvas[y2][x2] = 0;\r
                break;\r
        default:\r
                        break;\r