Mercurial > repos > blastem

diff render_sdl.c @ 1603:c0727712d529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Read extral SDL2 mappings on startup from controller_types.cfg
author Michael Pavone <pavone@retrodev.com>
date Tue, 31 Jul 2018 23:08:52 -0700
parents 7f39c40b4b25
children 419a0a133b5c
line wrap: on
line diff
--- a/render_sdl.c	Tue Jul 31 22:19:56 2018 -0700
+++ b/render_sdl.c	Tue Jul 31 23:08:52 2018 -0700
@@ -16,6 +16,7 @@
 #include "ppm.h"
 #include "png.h"
 #include "config.h"
+#include "controller_info.h"
 
 #ifndef DISABLE_OPENGL
 #include <GL/glew.h>
@@ -1141,6 +1142,8 @@
 		printf("Added %d game controller mappings from gamecontrollerdb.txt\n", added);
 	}
 	
+	controller_add_mappings();
+	
 	SDL_JoystickEventState(SDL_ENABLE);
 	
 	render_set_video_standard(VID_NTSC);