X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=838b1ee8e94168fd02c163803f123383b559c701;hb=f506afdcb23fed22f2c7f345b94cb411487f89c9;hp=02f2781c5e8f9cdb2326c1933092fd9105569ff1;hpb=7354c74fb8f409336db3a6d70455fbc10232ae64;p=blank.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 02f2781..838b1ee 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -597,20 +597,19 @@ void Interface::HandlePress(const SDL_KeyboardEvent &event) {
 			break;
 
 		case Keymap::TOGGLE_AUDIO:
-			config.audio.enabled = !config.audio.enabled;
-			client_ctrl.SetAudio(config.audio.enabled);
+			client_ctrl.SetAudio(!config.audio.enabled);
 			break;
 		case Keymap::TOGGLE_VIDEO:
-			config.video.world = !config.video.world;
-			client_ctrl.SetVideo(config.video.world);
+			client_ctrl.SetVideo(!config.video.world);
 			break;
 		case Keymap::TOGGLE_HUD:
-			config.video.hud = !config.video.hud;
-			client_ctrl.SetHUD(config.video.hud);
+			client_ctrl.SetHUD(!config.video.hud);
 			break;
 		case Keymap::TOGGLE_DEBUG:
-			config.video.debug = !config.video.debug;
-			client_ctrl.SetDebug(config.video.debug);
+			client_ctrl.SetDebug(!config.video.debug);
+			break;
+		case Keymap::CAMERA_NEXT:
+			client_ctrl.NextCamera();
 			break;
 
 		default:
@@ -780,7 +779,6 @@ void Keymap::LoadDefault() {
 	Map(SDL_SCANCODE_0, INV_10);
 
 	Map(SDL_SCANCODE_INSERT, SECONDARY);
-	Map(SDL_SCANCODE_RETURN, SECONDARY);
 	Map(SDL_SCANCODE_MENU, TERTIARY);
 	Map(SDL_SCANCODE_DELETE, PRIMARY);
 	Map(SDL_SCANCODE_BACKSPACE, PRIMARY);
@@ -789,6 +787,7 @@ void Keymap::LoadDefault() {
 	Map(SDL_SCANCODE_F2, TOGGLE_VIDEO);
 	Map(SDL_SCANCODE_F3, TOGGLE_DEBUG);
 	Map(SDL_SCANCODE_F4, TOGGLE_AUDIO);
+	Map(SDL_SCANCODE_F5, CAMERA_NEXT);
 
 	Map(SDL_SCANCODE_ESCAPE, EXIT);
 }
@@ -874,6 +873,7 @@ std::map<std::string, Keymap::Action> action_map = {
 	{ "toggle_video", Keymap::TOGGLE_VIDEO },
 	{ "toggle_hud", Keymap::TOGGLE_HUD },
 	{ "toggle_debug", Keymap::TOGGLE_DEBUG },
+	{ "camera_next", Keymap::CAMERA_NEXT },
 
 	{ "exit", Keymap::EXIT },
 };