needsDownloadメソッドをインタフェースから削除

[coroid/inqubus.git] / vhook / comment / com_surface.c

diff --git a/vhook/comment/com_surface.c b/vhook/comment/com_surface.c
index 8841821..98a8910 100644 (file)
--- a/vhook/comment/com_surface.c
+++ b/vhook/comment/com_surface.c
@@ -11,9 +11,9 @@
 #include "shadow.h"\r
 \r
 \r
-SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str);\r
+SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str);\r
 \r
-SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width,int video_height){\r
+SDL_Surface* makeCommentSurface(COMMDATA* data,const CHAT_ITEM* item,int video_width,int video_height){\r
        Uint16* index = item->str;\r
        Uint16* last = item->str;\r
        SDL_Surface* ret = NULL;\r
@@ -43,26 +43,26 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        }\r
        \r
        if(ret->w == 0 || ret->h == 0){\r
-               fprintf(data->log,"[comsurface/make]comment %04d has no char.\n",item->no);\r
-               fflush(data->log);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d has no char.\n",item->no);\r
+               fflush(data->common->log);\r
                return ret;\r
        }\r
        \r
         /*\r
          * \89e\8f\88\97\9d\r
          */\r
-         int shadow = data->shadow_kind;\r
+         int shadow = data->common->shadow_kind;\r
          if(shadow >= SHADOW_MAX){\r
                shadow = SHADOW_DEFAULT;\r
          }\r
-         ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->fontsize_fix);\r
+         ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->common->fontsize_fix);\r
 \r
        /*\r
         * \83A\83\8b\83t\83@\92l\82Ì\90Ý\92è\r
         */\r
         if(!data->opaque_comment){\r
                float alpha_t = (((float)(item->no)/(item->chat->max_no)) * 0.4) + 0.6;\r
-               fprintf(data->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100);\r
                setAlpha(ret,alpha_t);\r
         }\r
 \r
@@ -74,7 +74,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        //double zoomy = 1.0f;\r
        //\8fk\8f¬\r
        \r
-       if(data->fontsize_fix){\r
+       if(data->common->fontsize_fix){\r
                zoomx = (0.5f * (double)video_width) / (double)NICO_WIDTH;\r
                //zoomy = (0.5f * (double)video_height) / (double)NICO_HEIGHT;\r
        }\r
@@ -94,8 +94,8 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        //if(zoomx != 1.0f || zoomy != 1.0f){\r
        if(zoomx != 1.0f){\r
                //fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%,%5.2f%%)\n",item->no,zoomx*100,zoomy*100);\r
-               fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100);\r
-               fflush(data->log);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100);\r
+               fflush(data->common->log);\r
                SDL_Surface* tmp = ret;\r
                ret = zoomSurface(tmp,zoomx,zoomx,SMOOTHING_ON);\r
                SDL_FreeSurface(tmp);\r
@@ -107,7 +107,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
  * \95¶\8e\9a\82ð\95`\89æ\r
  */\r
 \r
-SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){\r
+SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str){\r
        if(str[0] == '\0'){\r
                return SDL_CreateRGBSurface(    SDL_SRCALPHA | SDL_HWSURFACE | SDL_HWACCEL,\r
                                                                                0,COMMENT_FONT_SIZE[size],32,\r
@@ -148,6 +148,6 @@ SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){
        SDL_FreeSurface(tmp);\r
        SDL_FreeSurface(fmt);\r
        */\r
-       SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->font[size],str,COMMENT_COLOR[color]);\r
+       SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->common->font[size],str,COMMENT_COLOR[color]);\r
        return surf;\r
 }\r