ソースの文字コードと改行コードを修正

[coroid/inqubus.git] / vhook / main.h

diff --git a/vhook/main.h b/vhook/main.h
index 9c200a3..8bf7500 100644 (file)
--- a/vhook/main.h
+++ b/vhook/main.h
@@ -1,63 +1,63 @@
-#ifndef MAIN_H_\r
-#define MAIN_H_\r
-#include <SDL/SDL.h>\r
-#include <SDL/SDL_ttf.h>\r
-#include "nicodef.h"\r
-#include "struct_define.h"\r
-#include "chat/chat.h"\r
-#include "chat/chat_slot.h"\r
-\r
-struct COMMDATA {\r
-    int enable;\r
-    CHAT chat;\r
-    CHAT_SLOT slot;\r
-    int opaque_comment;\r
-    DATA* common;\r
-};\r
-\r
-struct DATA{\r
-       FILE* log;\r
-       TTF_Font* font[CMD_FONT_MAX];\r
-       SDL_Surface* screen;\r
-//     /*\82»\82ê\82¼\82ê\82Ì\83R\83\81\83\93\83g\82É\89\9e\82¶\82½\83f\81[\83^*/\r
-//     //\83\86\81[\83U\83R\83\81\83\93\83g\r
-//     int enable_user_comment;\r
-//     CHAT chat;\r
-//     CHAT_SLOT slot;\r
-//     //\93\8a\8de\8eÒ\83R\83\81\83\93\83g\r
-//     int enable_owner_comment;\r
-        COMMDATA user_comment;\r
-        COMMDATA owner_comment;\r
-       \r
-       //\88ê\94Ê\93I\82È\83f\81[\83^\r
-       int shadow_kind;\r
-       int show_video;\r
-       int fontsize_fix;\r
-       int process_first_called;\r
-       int video_length;\r
-};\r
-\r
-typedef struct SETTING{\r
-       const char* data_user_path;\r
-       const char* data_owner_path;\r
-       const char* font_path;\r
-       int video_length;\r
-       int font_index;\r
-       int user_slot_max;\r
-       int owner_slot_max;\r
-       int shadow_kind;\r
-       /*TRUE OR FALSE*/\r
-       int enable_user_comment;\r
-       int enable_owner_comment;\r
-       int show_video;\r
-       int fontsize_fix;\r
-       int opaque_comment;\r
-}SETTING;\r
-\r
-int init(FILE* log);\r
-int initData(DATA* data,FILE* log,const SETTING* setting);\r
-int main_process(DATA* data,SDL_Surface* surf,const int now_vpos);\r
-int closeData(DATA* data);\r
-int close();\r
-\r
-#endif /*MAIN_H_*/\r
+#ifndef MAIN_H_
+#define MAIN_H_
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include "nicodef.h"
+#include "struct_define.h"
+#include "chat/chat.h"
+#include "chat/chat_slot.h"
+
+struct COMMDATA {
+    int enable;
+    CHAT chat;
+    CHAT_SLOT slot;
+    int opaque_comment;
+    DATA* common;
+};
+
+struct DATA{
+       FILE* log;
+       TTF_Font* font[CMD_FONT_MAX];
+       SDL_Surface* screen;
+//     /*それぞれのコメントに応じたデータ*/
+//     //ユーザコメント
+//     int enable_user_comment;
+//     CHAT chat;
+//     CHAT_SLOT slot;
+//     //投稿者コメント
+//     int enable_owner_comment;
+        COMMDATA user_comment;
+        COMMDATA owner_comment;
+       
+       //一般的なデータ
+       int shadow_kind;
+       int show_video;
+       int fontsize_fix;
+       int process_first_called;
+       int video_length;
+};
+
+typedef struct SETTING{
+       const char* data_user_path;
+       const char* data_owner_path;
+       const char* font_path;
+       int video_length;
+       int font_index;
+       int user_slot_max;
+       int owner_slot_max;
+       int shadow_kind;
+       /*TRUE OR FALSE*/
+       int enable_user_comment;
+       int enable_owner_comment;
+       int show_video;
+       int fontsize_fix;
+       int opaque_comment;
+}SETTING;
+
+int init(FILE* log);
+int initData(DATA* data,FILE* log,const SETTING* setting);
+int main_process(DATA* data,SDL_Surface* surf,const int now_vpos);
+int closeData(DATA* data);
+int close();
+
+#endif /*MAIN_H_*/