DarthMooMancer/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: a more intuitive move function

Browse Source
This commit is contained in:
DarthMooMancer
2025-09-17 09:25:08 -04:00
parent 3091026d95
commit d6a769900f
2 changed files with 25 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
-42
View File
@@ -4,39 +4,6 @@
#include "window.hpp"
#include "elements.hpp"
bool _check_collision(Point &a, Point &b) {
if(a.m_row == b.m_row && a.m_col == b.m_col && a.m_symbol == b.m_symbol) {
return true;
}
return false;
}
void _increment_point(Point &p) {
p.m_symbol *= 2;
}
void _handle_point(PointCollection &collection, int index, Point &a, Point &b) {
if(a.m_symbol == b.m_symbol && !b.m_collide) {
collection.m_point_list.erase(collection.m_point_list.begin() + index);
_increment_point(b);
b.m_collide = true;
}
else if(b.m_collide) {
if(a.m_symbol == 'u' && b.m_symbol == 'u') {
a.assign(b.m_row - 1, a.m_col);
}
if(a.m_symbol == 'd' && b.m_symbol == 'd') {
a.assign(b.m_row + 1, a.m_col);
}
if(a.m_symbol == 'l' && b.m_symbol == 'l') {
a.assign(b.m_row, a.m_col + 1);
}
if(a.m_symbol == 'r' && b.m_symbol == 'r') {
a.assign(b.m_row, a.m_col - 1);
}
}
}
int main() {
Input input;
Window window;
@@ -48,17 +15,8 @@ int main() {
collection.m_point_list.back().assign();
while (running) {
// collection.check_collision();
collection.move(window.m_board);
window.draw_window(collection);
// for(int i = collection.m_point_list.size() - 1; i >= 0; i--) {
// for(int a = collection.m_point_list.size() - 1; a >= 0; a--) {
// if (i == a) break;
// if(_check_collision(collection.m_point_list[i], collection.m_point_list[a])) {
// _handle_point(collection, i, collection.m_point_list[i], collection.m_point_list[a]);
// }
// }
// }
}
input_thread.join();