コメント, 投稿者コメントの情報保持部分を配列に変更

[coroid/inqubus.git] / vhook / framehook.c

diff --git a/vhook/framehook.c b/vhook/framehook.c
index a9ab1cd..f6da2b2 100644 (file)
--- a/vhook/framehook.c
+++ b/vhook/framehook.c
@@ -108,10 +108,7 @@ int init_setting(FILE*log,const toolbox *tbox,SETTING* setting,int argc, char *a
        /*以降オプション*/
        
        //コメントを見せるか否か？
-       setting->enable_user_comment = FALSE;
-       setting->enable_owner_comment = FALSE;
-       setting->data_user_path = NULL;
-       setting->data_owner_path = NULL;
+    memset(setting->comment, 0x00, sizeof(setting->comment));
        //一般的な設定
        setting->font_path = NULL;
        setting->font_index = 0;
@@ -124,20 +121,20 @@ int init_setting(FILE*log,const toolbox *tbox,SETTING* setting,int argc, char *a
     setting->aspect_mode = 0;
        int i;
        char* arg;
-       for(i=0;i<argc;i++){
-               arg = argv[i];
-               if(!setting->data_user_path && strncmp(FRAMEHOOK_OPT_DATA_USER,arg,FRAMEHOOK_OPT_DATA_USER_LEN) == 0){
-                       char* data_user = arg+FRAMEHOOK_OPT_DATA_USER_LEN;
-                       setting->data_user_path = data_user;
-                       setting->enable_user_comment = TRUE;
-                       fprintf(log,"[framehook/init]User Comment data path:%s\n",setting->data_user_path);
-                       fflush(log);
-               }else if(!setting->data_owner_path && strncmp(FRAMEHOOK_OPT_DATA_OWNER,arg,FRAMEHOOK_OPT_DATA_OWNER_LEN) == 0){
-                       char* data_owner = arg+FRAMEHOOK_OPT_DATA_OWNER_LEN;
-                       setting->data_owner_path = data_owner;
-                       setting->enable_owner_comment = TRUE;
-                       fprintf(log,"[framehook/init]Owner Comment data path:%s\n",setting->data_owner_path);
-                       fflush(log);
+       for(i=0;i<argc;i++) {
+        arg = argv[i];
+        if (!setting->comment[0].path && strncmp(FRAMEHOOK_OPT_DATA_USER, arg, FRAMEHOOK_OPT_DATA_USER_LEN) == 0) {
+            char* data = arg + FRAMEHOOK_OPT_DATA_USER_LEN;
+            setting->comment[0].path = data;
+            setting->comment[0].enable = TRUE;
+            fprintf(log, "[framehook/init]User Comment data path:%s\n", setting->comment[0].path);
+            fflush(log);
+        } else if (!setting->comment[1].path && strncmp(FRAMEHOOK_OPT_DATA_OWNER, arg, FRAMEHOOK_OPT_DATA_OWNER_LEN) == 0) {
+            char* data = arg + FRAMEHOOK_OPT_DATA_OWNER_LEN;
+            setting->comment[1].path = data;
+            setting->comment[1].enable = TRUE;
+            fprintf(log, "[framehook/init]Owner Comment data path:%s\n", setting->comment[1].path);
+            fflush(log);
                }else if(!setting->font_path && strncmp(FRAMEHOOK_OPT_FONT,arg,FRAMEHOOK_OPT_FONT_LEN) == 0){
                        char* font = arg+FRAMEHOOK_OPT_FONT_LEN;
                        setting->font_path = font;