day8 1 and 2 done + refactoring
This commit is contained in:
+4
-6
@@ -64,13 +64,11 @@ int main() {
|
||||
exit(255);
|
||||
break;
|
||||
}
|
||||
if (!AreWeInBounds(conditional_operation(posX, 1, op_x),
|
||||
conditional_operation(posY, 1, op_y), map)) {
|
||||
if (!AreWeInBounds(condop(posX, 1, op_x), condop(posY, 1, op_y), map)) {
|
||||
break;
|
||||
}
|
||||
|
||||
switch (map[conditional_operation(posX, 1, op_x)]
|
||||
[conditional_operation(posY, 1, op_y)]) {
|
||||
switch (map[condop(posX, 1, op_x)][condop(posY, 1, op_y)]) {
|
||||
case '#':
|
||||
direction++;
|
||||
if (direction > 3) {
|
||||
@@ -78,8 +76,8 @@ int main() {
|
||||
}
|
||||
break;
|
||||
default:
|
||||
posX = conditional_operation(posX, 1, op_x);
|
||||
posY = conditional_operation(posY, 1, op_y);
|
||||
posX = condop(posX, 1, op_x);
|
||||
posY = condop(posY, 1, op_y);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-6
@@ -39,13 +39,11 @@ bool WillHeGetStuck(int posX, int posY, int direction, int locX, int locY,
|
||||
exit(255);
|
||||
break;
|
||||
}
|
||||
if (!AreWeInBounds(conditional_operation(posX, 1, op_x),
|
||||
conditional_operation(posY, 1, op_y), map)) {
|
||||
if (!AreWeInBounds(condop(posX, 1, op_x), condop(posY, 1, op_y), map)) {
|
||||
break;
|
||||
}
|
||||
|
||||
switch (map[conditional_operation(posX, 1, op_x)]
|
||||
[conditional_operation(posY, 1, op_y)]) {
|
||||
switch (map[condop(posX, 1, op_x)][condop(posY, 1, op_y)]) {
|
||||
case '#':
|
||||
direction++;
|
||||
if (direction > 3) {
|
||||
@@ -53,8 +51,8 @@ bool WillHeGetStuck(int posX, int posY, int direction, int locX, int locY,
|
||||
}
|
||||
break;
|
||||
default:
|
||||
posX = conditional_operation(posX, 1, op_x);
|
||||
posY = conditional_operation(posY, 1, op_y);
|
||||
posX = condop(posX, 1, op_x);
|
||||
posY = condop(posY, 1, op_y);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user