Declare for loop indexes in the loop

src/graphics.c

@@ -63,9 +63,8 @@ void buffer_copy()
 void buffer_fill(unsigned color)
 {
 	unsigned *buffer_back_32 = (unsigned *) buffer_back;
-	int i;
 	color += color << 16;
-	for (i = 0; i < (BUFFER_SIZE / 4); i++)
+	for (int i = 0; i < (BUFFER_SIZE / 4); i++)
 		buffer_back_32[i] = color;
 }
 
@@ -96,10 +95,9 @@ void draw_sprite_sheet(const unsigned short *sheet, int x, int y, const Rect_t *
 	unsigned short color;
 	int w = window->w + x;
 	int h = window->h + y;
-	int i, j, k, l;
 
-	for (j = y, l = window->y; j < h; j++, l++)
-	for (i = x, k = window->x; i < w; i++, k++)
+	for (int j = y, l = window->y; j < h; j++, l++)
+	for (int i = x, k = window->x; i < w; i++, k++)
 	{
 		color = sprite_pixel_get(sheet, k, l);
 		if (color != sheet[2])

src/map.c

@@ -15,14 +15,13 @@ void map_draw(unsigned x, unsigned y, const Map_t map)
 	unsigned offset_x = x % 24 * -1;
 	unsigned offset_y = y % 24 * -1;
 
-	unsigned i, j;
 	Rect_t sprite;
 	sprite.y = 0;
 	sprite.w = 24;
 	sprite.h = 24;
 
-	for (j = 0; j < 11; j++)
-	for (i = 0; i < 15; i++)
+	for (unsigned j = 0; j < 11; j++)
+	for (unsigned i = 0; i < 15; i++)
 	{
 		sprite.x = map.layer0[(x / 24 - 7 + i) + (y / 24 - 5 + j) * map.w] * 24;
 		draw_sprite_sheet(tiles, offset_x + i * 24, offset_y + j * 24, &sprite);
@@ -50,7 +49,7 @@ static unsigned map_walk_speed_read(unsigned time, unsigned div)
 
 void map_walk(unsigned x, unsigned y, Map_t map)
 {
-	unsigned i, walk_time, walk_div;
+	unsigned walk_time, walk_div;
 
 	while (!isKeyPressed(KEY_NSPIRE_ESC))
 	{
@@ -69,7 +68,7 @@ void map_walk(unsigned x, unsigned y, Map_t map)
 		{
 			map_walk_speed_load(walk_time);
 
-			for (i = 0; i < 24; i++)
+			for (unsigned i = 0; i < 24; i++)
 			{
 				if (i >= map_walk_speed_read(walk_time, walk_div))
 				{
@@ -86,7 +85,7 @@ void map_walk(unsigned x, unsigned y, Map_t map)
 		{
 			map_walk_speed_load(walk_time);
 
-			for (i = 0; i < 24; i++)
+			for (unsigned i = 0; i < 24; i++)
 			{
 				if (i >= map_walk_speed_read(walk_time, walk_div))
 				{
@@ -103,7 +102,7 @@ void map_walk(unsigned x, unsigned y, Map_t map)
 		{
 			map_walk_speed_load(walk_time);
 
-			for (i = 0; i < 24; i++)
+			for (unsigned i = 0; i < 24; i++)
 			{
 				if (i >= map_walk_speed_read(walk_time, walk_div))
 				{
@@ -120,7 +119,7 @@ void map_walk(unsigned x, unsigned y, Map_t map)
 		{
 			map_walk_speed_load(walk_time);
 
-			for (i = 0; i < 24; i++)
+			for (unsigned i = 0; i < 24; i++)
 			{
 				if (i >= map_walk_speed_read(walk_time, walk_div))
 				{