X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kagecgi%2Fkagecomb.c;h=68e1ac555f3e05f46adae1817421ddcda158a07b;hb=5f6d5b338d65dab4f7a893bfdedea22599eac3eb;hp=d90f0e0a4a845953e549872ce5ca08260255bab3;hpb=b755cadf536858496296e43b30baec2cd9ec8c13;p=chise%2Fkage.git

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