From 0d74454355d399d41e32cc89d059780fcd9f7d3e Mon Sep 17 00:00:00 2001 From: kichikuou Date: Tue, 23 Nov 2021 12:56:06 +0900 Subject: [PATCH] Clean up ags.c --- src/ags.c | 99 ++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/src/ags.c b/src/ags.c index c79454e..3c5a44e 100644 --- a/src/ags.c +++ b/src/ags.c @@ -43,11 +43,6 @@ #include "cursor.h" #include "image.h" -#define check_param ags_check_param -#define check_param_xy ags_check_param_xy - -static void initPal(Palette256 *sys_pal); - static Palette256 pal_256; static boolean need_update = TRUE; static boolean fade_outed = FALSE; @@ -245,41 +240,41 @@ void ags_setPaletteToSystem(int src, int cnt) { } void ags_drawRectangle(int x, int y, int w, int h, int col) { - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; sdl_drawRectangle(x, y, w, h, col); } void ags_fillRectangle(int x, int y, int w, int h, int col) { - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; sdl_fillRectangle(x, y, w, h, col); } void ags_drawLine(int x0, int y0, int x1, int y1, int col) { - if (!check_param_xy(&x0, &y0)) return; - if (!check_param_xy(&x1, &y1)) return; + if (!ags_check_param_xy(&x0, &y0)) return; + if (!ags_check_param_xy(&x1, &y1)) return; sdl_drawLine(x0, y0, x1, y1, col); } void ags_copyArea(int sx, int sy, int w, int h, int dx, int dy) { - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyArea(sx, sy, w, h, dx, dy); } void ags_scaledCopyArea(int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int mirror_sw) { - if (!check_param(&sx, &sy, &sw, &sh)) return; - if (!check_param(&dx, &dy, &dw, &dh)) return; + if (!ags_check_param(&sx, &sy, &sw, &sh)) return; + if (!ags_check_param(&dx, &dy, &dw, &dh)) return; sdl_scaledCopyArea(sx, sy, sw, sh, dx, dy, dw, dh, mirror_sw); } void ags_copyAreaSP(int sx, int sy, int w, int h, int dx, int dy, int col) { - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP(sx, sy, w, h, dx, dy, col); } @@ -287,13 +282,13 @@ void ags_copyAreaSP(int sx, int sy, int w, int h, int dx, int dy, int col) { void ags_wrapColor(int x, int y, int w, int h, int p1, int p2) { if (nact->sys_world_depth == 8) return; - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; sdl_wrapColor(x, y, w, h, p1, p2); } void ags_getPixel(int x, int y, Palette *cell) { - if (!check_param_xy(&x, &y)) return; + if (!ags_check_param_xy(&x, &y)) return; sdl_getPixel(x, y, cell); } @@ -301,7 +296,7 @@ void ags_getPixel(int x, int y, Palette *cell) { void ags_changeColorArea(int sx, int sy, int w, int h, int dst, int src, int cnt) { if (nact->sys_world_depth != 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; { agsurface_t *dib = nact->ags.dib; @@ -321,7 +316,7 @@ void ags_changeColorArea(int sx, int sy, int w, int h, int dst, int src, int cnt } void* ags_saveRegion(int x, int y, int w, int h) { - if (!check_param(&x, &y, &w, &h)) return NULL; + if (!ags_check_param(&x, &y, &w, &h)) return NULL; return (void *)sdl_saveRegion(x, y, w, h); } @@ -329,7 +324,7 @@ void* ags_saveRegion(int x, int y, int w, int h) { void ags_restoreRegion(void *region, int x, int y) { if (region == NULL) return; - if (!check_param_xy(&x, &y)) return; + if (!ags_check_param_xy(&x, &y)) return; sdl_restoreRegion(region, x, y); } @@ -337,7 +332,7 @@ void ags_restoreRegion(void *region, int x, int y) { void ags_putRegion(void *region, int x, int y) { if (region == NULL) return; - if (!check_param_xy(&x, &y)) return; + if (!ags_check_param_xy(&x, &y)) return; sdl_putRegion(region, x, y); } @@ -345,8 +340,8 @@ void ags_putRegion(void *region, int x, int y) { void ags_copyRegion(void *region, int sx, int sy , int w, int h, int dx, int dy) { if (region == NULL) return; - if (!check_param_xy(&dx, &dy)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param_xy(&dx, &dy)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_CopyRegion(region, sx, sy, w, h, dx, dy); } @@ -358,7 +353,7 @@ void ags_delRegion(void *region) { } MyRectangle ags_drawString(int x, int y, const char *src, int col) { - if (!check_param_xy(&x, &y)) return (MyRectangle){}; + if (!ags_check_param_xy(&x, &y)) return (MyRectangle){}; char *utf8 = toUTF8(src); SDL_Rect r = sdl_drawString(x, y, utf8, col); @@ -396,7 +391,7 @@ void ags_drawCg8bit(cgdata *cg, int x, int y) { w = cg->width; h = cg->height; - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; cg->data_offset = abs(sy - y) * cg->width + abs(sx - x); sdl_drawImage8_fromData(cg, x, y, w, h); @@ -410,7 +405,7 @@ void ags_drawCg16bit(cgdata *cg, int x, int y) { w = cg->width; h = cg->height; - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; cg->data_offset = abs(sy - y) * cg->width + abs(sx - x); sdl_drawImage16_fromData(cg, x, y, w, h); @@ -419,8 +414,8 @@ void ags_drawCg16bit(cgdata *cg, int x, int y) { void ags_copyArea_shadow(int sx, int sy, int w, int h, int dx, int dy) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP16_shadow(sx, sy, w, h, dx, dy, 255); } @@ -428,8 +423,8 @@ void ags_copyArea_shadow(int sx, int sy, int w, int h, int dx, int dy) { void ags_copyArea_transparent(int sx, int sy, int w, int h, int dx, int dy, int col) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP(sx, sy, w, h, dx, dy, col); } @@ -437,8 +432,8 @@ void ags_copyArea_transparent(int sx, int sy, int w, int h, int dx, int dy, int void ags_copyArea_alphaLevel(int sx, int sy, int w, int h, int dx, int dy, int lv) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP16_alphaLevel(sx, sy, w, h, dx, dy, lv); } @@ -446,8 +441,8 @@ void ags_copyArea_alphaLevel(int sx, int sy, int w, int h, int dx, int dy, int l void ags_copyArea_alphaBlend(int sx, int sy, int w, int h, int dx, int dy, int lv) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP16_alphaBlend(sx, sy, w, h, dx, dy, lv); } @@ -455,14 +450,14 @@ void ags_copyArea_alphaBlend(int sx, int sy, int w, int h, int dx, int dy, int l void ags_copyArea_whiteLevel(int sx, int sy, int w, int h, int dx, int dy, int lv) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP16_whiteLevel(sx, sy, w, h, dx, dy, lv); } MyRectangle ags_floodFill(int x, int y, int col) { - if (!check_param_xy(&x, &y)) + if (!ags_check_param_xy(&x, &y)) return (MyRectangle){}; return sdl_floodFill(x, y, col); @@ -471,8 +466,8 @@ MyRectangle ags_floodFill(int x, int y, int col) { void ags_copyFromAlpha(int sx, int sy, int w, int h, int dx, int dy, ALPHA_DIB_COPY_TYPE flg) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copy_from_alpha(sx, sy, w, h, dx, dy, flg); } @@ -480,8 +475,8 @@ void ags_copyFromAlpha(int sx, int sy, int w, int h, int dx, int dy, ALPHA_DIB_C void ags_copyToAlpha(int sx, int sy, int w, int h, int dx, int dy, ALPHA_DIB_COPY_TYPE flg) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copy_to_alpha(sx, sy, w, h, dx, dy, flg); } @@ -489,7 +484,7 @@ void ags_copyToAlpha(int sx, int sy, int w, int h, int dx, int dy, ALPHA_DIB_COP void ags_alpha_uppercut(int sx, int sy, int w, int h, int s, int d) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; alpha_uppercut(nact->ags.dib, sx, sy, w, h, s, d); } @@ -497,7 +492,7 @@ void ags_alpha_uppercut(int sx, int sy, int w, int h, int s, int d) { void ags_alpha_lowercut(int sx, int sy, int w, int h, int s, int d) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; alpha_lowercut(nact->ags.dib, sx, sy, w, h, s, d); } @@ -505,7 +500,7 @@ void ags_alpha_lowercut(int sx, int sy, int w, int h, int s, int d) { void ags_alpha_setLevel(int x, int y, int w, int h, int lv) { if (nact->sys_world_depth == 8) return; - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; alpha_set_level(nact->ags.dib, x, y, w, h, lv); } @@ -513,8 +508,8 @@ void ags_alpha_setLevel(int x, int y, int w, int h, int lv) { void ags_alpha_copyArea(int sx, int sy, int w, int h, int dx, int dy) { if (nact->sys_world_depth == 8) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; alpha_copy_area(nact->ags.dib, sx, sy, w, h, dx, dy); } @@ -522,7 +517,7 @@ void ags_alpha_copyArea(int sx, int sy, int w, int h, int dx, int dy) { void ags_alpha_getPixel(int x, int y, int *pic) { if (nact->sys_world_depth == 8) return; - if (!check_param_xy(&x, &y)) { + if (!ags_check_param_xy(&x, &y)) { *pic = 0; } else { alpha_get_pixel(nact->ags.dib, x, y, (BYTE *)pic); @@ -536,7 +531,7 @@ void ags_alpha_setPixel(int x, int y, int w, int h, BYTE *b) { savey = y; savew = w; - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; offset = abs(savey - y) * savew + abs(savex - x); @@ -688,7 +683,7 @@ void ags_setCursorLocation(int x, int y, boolean is_dibgeo) { int dx[8], dy[8]; int i, delx, dely; MyPoint p; - if (!check_param_xy(&x, &y)) return; + if (!ags_check_param_xy(&x, &y)) return; /* DIB 座表系か Window 座表系か */ if (is_dibgeo) { @@ -738,8 +733,8 @@ void ags_copyArea_shadow_withrate(int sx, int sy, int w, int h, int dx, int dy, if (lv == 0) return; - if (!check_param(&sx, &sy, &w, &h)) return; - if (!check_param(&dx, &dy, &w, &h)) return; + if (!ags_check_param(&sx, &sy, &w, &h)) return; + if (!ags_check_param(&dx, &dy, &w, &h)) return; sdl_copyAreaSP16_shadow(sx, sy, w, h, dx, dy, lv); } @@ -757,7 +752,7 @@ int ags_getCursorMoveTime() { * */ void ags_zoom(int x, int y, int w, int h) { - if (!check_param(&x, &y, &w, &h)) return; + if (!ags_check_param(&x, &y, &w, &h)) return; sdl_zoom(x, y, w, h); }