Fixed Parts{Width, Height}().

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

diff --git a/kagecgi/kagecomb.c b/kagecgi/kagecomb.c
index d90f0e0..68e1ac5 100755 (executable)
--- a/kagecgi/kagecomb.c
+++ b/kagecgi/kagecomb.c
@@ -1,12 +1,11 @@
 //kagecomb.c\r
 //\r
-#include <glib.h>\r
-#include <math.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
+\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
-void combineYoko2(const GString *parts1, const GString *parts3, int *result){\r
+void combineYoko2(const KGString *parts1, const KGString *parts3, int *result){\r
     int f, g, h, i, j, k, l;\r
     int flg_boxL, flg_boxR;\r
     int Xside, YsideLa, YsideLb, YsideRa, YsideRb, YheightL, YnanameL, YsmallL;\r
@@ -194,11 +193,11 @@ void combineYoko2(const GString *parts1, const GString *parts3, int *result){
        kShotai = tempShotai;\r
 }\r
 \r
-void combineYoko3(const GString *parts1, const GString *parts2, const GString *parts3, int *result){\r
+void combineYoko3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result){\r
        //not yet\r
 }\r
 \r
-void combineTate2(const GString *parts1, const GString *parts3, int *result){\r
+void combineTate2(const KGString *parts1, const KGString *parts3, int *result){\r
     int f, g, h, i, j, k, l;\r
     int flg_boxL, flg_boxR;\r
     int pxL, pxR, pyL, pyR;\r
@@ -373,14 +372,16 @@ void combineTate2(const GString *parts1, const GString *parts3, int *result){
        kShotai = tempShotai;\r
 }\r
 \r
-void combineTate3(const GString *parts1, const GString *parts2, const GString *parts3, int *result){\r
+void combineTate3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result){\r
   //not yet\r
 }\r
 \r
-void combineHame2(const GString *parts1, const GString *parts3, int *result){\r
-  int i;\r
+void combineHame2(const KGString *parts1, const KGString *parts3, int *result){\r
+  int i, flag;\r
   int *buf, strokes;\r
 \r
+  flag = 0;\r
+\r
   //set results\r
   result[0] = 0;\r
   result[1] = 0;\r
@@ -389,12 +390,18 @@ void combineHame2(const GString *parts1, const GString *parts3, int *result){
   buf = convertStroke(parts1->str, buf, &strokes);\r
   for(i = 0; i < strokes; i++){\r
     if(buf[i * 11 + 0] == 9){\r
-\r
       result[8] = buf[i * 11 + 3];\r
       result[9] = buf[i * 11 + 4];\r
       result[10] = buf[i * 11 + 5];\r
       result[11] = buf[i * 11 + 6];\r
+      flag = 1;\r
     }\r
   }\r
-       //not yet\r
+  if(flag == 0){ //error\r
+    result[8] = 50;\r
+    result[9] = 50;\r
+    result[10] = 150;\r
+    result[11] = 150;\r
+  }\r
+  //not yet\r
 }\r