diff options
| author | UnavailableDev <ggwildplay@gmail.com> | 2023-03-13 17:11:30 +0100 |
|---|---|---|
| committer | UnavailableDev <ggwildplay@gmail.com> | 2023-03-13 17:11:30 +0100 |
| commit | 2aa4abf6a3c268f7729f91b08115aac8f2e5bdae (patch) | |
| tree | c32d981fb030e05754671f359f1a76eb3d0ded32 /src | |
| parent | 30eca8d3bd03c1efe52f2432c4b6b0c842fffa2d (diff) | |
| parent | bbb794de8878a163e77c05d24b19639b6d609b4d (diff) | |
Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade into game-engine
Diffstat (limited to 'src')
| -rw-r--r-- | src/demo.c | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -18,7 +18,7 @@ hh_s_entity_player g_hh_player_1 = { .pos_x = 31000, // 0b0000 0001 0011 0110 .pos_y = 21000, .radius = 8, - .speed = 1, + .speed = 100, .direction_x = 1, .rotation = 8, .in_air = false, @@ -53,6 +53,7 @@ void hh_demo_setup() { } void hh_demo_loop(unsigned long frame) { + // hh_player_movement(); hh_player_actions(); @@ -72,7 +73,7 @@ void hh_demo_loop(unsigned long frame) { void hh_player_movement() { int8_t directionX = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R - int8_t directionY = (-1 * g_hh_controller_p1.dpad_down) + (1 * g_hh_controller_p1.dpad_up); // -1 = D || 1 == U + int8_t directionY = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down); // -1 = D || 1 == U uint8_t i, j; uint8_t rotation = 0; // 0-7 @@ -110,11 +111,11 @@ void hh_player_movement() { if (g_hh_player_1.in_air == false && directionX != 0) { if (directionX == 1) { - tileColX = ((g_hh_player_1.pos_x / 100) + g_hh_player_1.radius) / 20; - modTileX = (g_hh_player_1.pos_x + (100 * g_hh_player_1.radius)) % 2000; + tileColX = ((g_hh_player_1.pos_x / 100) + g_hh_player_1.radius) / 16; + modTileX = (g_hh_player_1.pos_x + (100 * g_hh_player_1.radius)) % 1600; } else if (directionX == -1) { - tileColX = ((g_hh_player_1.pos_x / 100) - g_hh_player_1.radius) / 20; - modTileX = (g_hh_player_1.pos_x - (100 * g_hh_player_1.radius)) % 2000; + tileColX = ((g_hh_player_1.pos_x / 100) - g_hh_player_1.radius) / 16; + modTileX = (g_hh_player_1.pos_x - (100 * g_hh_player_1.radius)) % 1600; } if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1) { @@ -133,6 +134,11 @@ void hh_player_movement() { { } + + if(directionY != 0) + { + // g_hh_player_1.pos_y = g_hh_player_1.pos_y + (directionY * g_hh_player_1.speed * 2); // NEW x set + } // collision map floor (y-axis) (falling) // if falling no jump press (implement) /* |