Combine occupied and monster check

Author: LiquidityC

src/monster.c

@@ -335,7 +335,7 @@ has_collided(Monster *monster, RoomMatrix *matrix, Vector2d direction)
 		monster_behaviour_check_post_attack(monster);
 	}
 
-	return SPACE_IS_OCCUPIED(space) || space->monster;
+	return SPACE_IS_BLOCKED(space);
 }
 
 static bool

src/projectile.c

@@ -136,7 +136,7 @@ projectile_update(Projectile *p, UpdateData *data)
 	p->processedSpaces[roomPos.x][roomPos.y] = true;
 
 	RoomSpace *space = &data->matrix->spaces[roomPos.x][roomPos.y];
-	if (!SPACE_IS_OCCUPIED(space) && !space->monster)
+	if (!SPACE_IS_BLOCKED(space))
 		return;
 
 	if (space->player)

src/roommatrix.h

@@ -68,6 +68,8 @@ typedef struct RoomSpace {
 #define SPACE_CLEAR_FLAG(space, flag) ((space) && ((space)->flags &= ~flag))
 #define SPACE_TOGGLE_FLAG(space, flag) ((space) && ((space)->flags ^= flag))
 
+#define SPACE_IS_BLOCKED(space) (SPACE_IS_OCCUPIED(space) || (space)->monster)
+
 typedef struct RoomMatrix_t {
 	RoomSpace spaces[MAP_ROOM_WIDTH][MAP_ROOM_HEIGHT];
 	Position roomPos;

src/skill.c

@@ -808,7 +808,7 @@ skill_charge(Skill *skill, SkillData *data)
 	Position lastAvailableDest = playerStartPos;
 	while (position_in_roommatrix(&destination))
 	{
-		if (SPACE_IS_OCCUPIED(space) || space->monster) {
+		if (SPACE_IS_BLOCKED(space)) {
 			if (!space->monster || passThroughCount >= chargeThroughLvl)
 				break;
 			else