Ver código fonte

Fix min and max macros

Streetwalrus Einstein 10 anos atrás
pai
commit
21db3e1157
2 arquivos alterados com 4 adições e 4 exclusões
  1. 2 2
      include/misc.h
  2. 2 2
      src/graphics.c

+ 2 - 2
include/misc.h

@@ -1,8 +1,8 @@
 #ifndef INCLUDE_MISC_H
 #define INCLUDE_MISC_H
 
-#define min(a, b) (a < b) ? a : b
-#define max(a, b) (a > b) ? a : b
+#define min(a, b) ((a < b) ? a : b)
+#define max(a, b) ((a > b) ? a : b)
 
 #endif
 

+ 2 - 2
src/graphics.c

@@ -91,8 +91,8 @@ void draw_sprite_sheet(const unsigned short *sheet, int x, int y, const Rect_t *
 	int w = min(window->w + x, 320);
 	int h = min(window->h + y, 240);
 
-	for (int j = max(y, 0), l = max(window->y - y, window->y); j < h; j++, l++)
-	for (int i = max(x, 0), k = max(window->x - x, window->x); i < w; i++, k++)
+	for (int j = max(y, 0), l = window->y - min(y, 0); j < h; j++, l++)
+	for (int i = max(x, 0), k = window->x - min(x, 0); i < w; i++, k++)
 	{
 		color = sprite_pixel_get(sheet, k, l);
 		if (color != sheet[2])