diff --git a/src/conio/bitmap_con.c b/src/conio/bitmap_con.c index 81b2c7d744b9c6ebc0e732b971dda1bd064d0e7b..e2f7275ae6bd1e64a607ff427a2b38710c32646e 100644 --- a/src/conio/bitmap_con.c +++ b/src/conio/bitmap_con.c @@ -390,21 +390,17 @@ int bitmap_loadfont(char *filename) unsigned int fontsize; int fw; int fh; - int ch; - int x; - int y; - int charrow; - int charcol; + int i; FILE *fontfile; if(current_font==-99 || current_font>(sizeof(conio_fontdata)/sizeof(struct conio_font_data_struct)-2)) { - for(x=0; conio_fontdata[x].desc != NULL; x++) { - if(!strcmp(conio_fontdata[x].desc, "Codepage 437 English")) { - current_font=x; + for(i=0; conio_fontdata[i].desc != NULL; i++) { + if(!strcmp(conio_fontdata[i].desc, "Codepage 437 English")) { + current_font=i; break; } } - if(conio_fontdata[x].desc==NULL) + if(conio_fontdata[i].desc==NULL) current_font=0; } if(current_font==-1) diff --git a/src/conio/sdl_con.c b/src/conio/sdl_con.c index ecb786fda2846610f0330db7d96363b715a2ac7d..1ebdb5129d72b0d1fb0a96a3a2e6732b76781b15 100644 --- a/src/conio/sdl_con.c +++ b/src/conio/sdl_con.c @@ -241,8 +241,6 @@ struct x11 sdl_x11; void RGBtoYUV(Uint8 r, Uint8 g, Uint8 b, Uint8 *yuv_array, int monochrome, int luminance) { - int i; - if (monochrome) { #if 0 /* these are the two formulas that I found on the FourCC site... */ @@ -311,7 +309,7 @@ void yuv_fillrect(SDL_Overlay *overlay, SDL_Rect *r, int dac_entry) planar: { - int x,y; + int y; Uint8 *Y,*U,*V; int odd_line; int uvlen=(r->w)>>1; @@ -361,9 +359,7 @@ packed: void sdl_user_func(int func, ...) { - unsigned int *i; va_list argptr; - void **args; SDL_Event ev; ev.type=SDL_USEREVENT; @@ -413,12 +409,9 @@ void sdl_user_func(int func, ...) /* Called from main thread only */ int sdl_user_func_ret(int func, ...) { - unsigned int *i; va_list argptr; - void **args; SDL_Event ev; int passed=FALSE; - char *p; sdl.mutexP(sdl_ufunc_lock); ev.type=SDL_USEREVENT; @@ -559,9 +552,6 @@ void sdl_flush(void) int sdl_init_mode(int mode) { - struct video_params vmode; - int idx; /* Index into vmode */ - int i; int oldcols=vstat.cols; bitmap_init_mode(mode, &bitmap_width, &bitmap_height); @@ -1409,7 +1399,6 @@ int sdl_video_event_thread(void *data) { struct update_rect *rect=(struct update_rect *)ev.user.data1; SDL_Rect r; - SDL_Rect dst; int x,y,offset; if(!win) {