From 57fe8f3c4124819b95164547333a33f4c45eac8d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 10 Mar 2019 12:07:40 -0400 Subject: Editor now allows tile placement You can scroll through the three layers (map, track, object) with Z/X. You can swap between focusing on the map and the tileset with TAB. You can place tiles with enter or space. Pretty rudimentary, but it's a start. --- src/main.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index cbac5bb..cd8ee3e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,13 +39,13 @@ int main(int argc, char** argv) throw sdl_error(); } - Level level; + Level level(ren.get()); std::unique_ptr state; if (argc == 2 && !strcmp(argv[1], "--editor")) { - state.reset(new Editor()); + state.reset(new Editor(ren.get())); } else { state.reset(new Simulation(level)); } @@ -63,20 +63,12 @@ int main(int argc, char** argv) while (SDL_PollEvent(&e)) { - if (e.type == SDL_QUIT) + if (e.type == SDL_QUIT || + (e.type == SDL_KEYDOWN && + e.key.keysym.sym == SDLK_ESCAPE)) { quit = true; - } else if (e.type == SDL_KEYDOWN) - { - switch (e.key.keysym.sym) - { - case SDLK_ESCAPE: - { - quit = true; - - break; - } - } + break; } } -- cgit 1.4.1