diff options
| author | UnavailableDev <69792062+UnavailableDev@users.noreply.github.com> | 2023-03-22 10:42:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 10:42:34 +0100 |
| commit | 7f51cd925883bbf958baa289d4d19231667c9eba (patch) | |
| tree | 21800c4233b3be015cb9aa1f1448b2ab4db4c832 /src/ppusim | |
| parent | e43428eef0d96839cd9a5b2d25e31c90555cfb6c (diff) | |
| parent | 49112a1999c008fb6fa6c9c368eb2be0d92d15dc (diff) | |
Merge pull request #44 from UnavailableDev/game-engine
Game engine
Diffstat (limited to 'src/ppusim')
| -rw-r--r-- | src/ppusim/input.c | 1 | ||||
| -rw-r--r-- | src/ppusim/sim.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ppusim/input.c b/src/ppusim/input.c index 5323fb1..4bc7018 100644 --- a/src/ppusim/input.c +++ b/src/ppusim/input.c @@ -13,4 +13,5 @@ void hh_input_read() { g_hh_controller_p1.dpad_left = kb[SDL_SCANCODE_A]; g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D]; g_hh_controller_p1.button_primary = kb[SDL_SCANCODE_SPACE]; + g_hh_controller_p1.button_secondary = kb[SDL_SCANCODE_R]; } diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c index a5fec45..8b67acc 100644 --- a/src/ppusim/sim.c +++ b/src/ppusim/sim.c @@ -29,7 +29,8 @@ void hh_ppu_init() { } void hh_ppu_load_tilemap() { - char* filename = "../test/bin/tiles.bin"; + //TODO: remove magic file name here + char* filename = "static/tiles.bin"; FILE* fp = fopen(filename,"rb"); if (!fp){ fprintf(stderr,"Error: Failed to load tiles."); |