diff options
| author | Twinaphex | 2014-08-06 20:25:56 +0200 |
|---|---|---|
| committer | Twinaphex | 2014-08-06 20:25:56 +0200 |
| commit | 1929a792755405a011ff905d6a4782f79089f056 (patch) | |
| tree | 8c32563d9212642852039bfcf616dac763de5664 | |
| parent | d9849c9a5ea08171671a75cd499fefc26e9747b5 (diff) | |
| parent | a19f6faa80beabe1137a766c4c5c508d7b84ebb4 (diff) | |
| download | pcsx_rearmed-1929a792755405a011ff905d6a4782f79089f056.tar.gz pcsx_rearmed-1929a792755405a011ff905d6a4782f79089f056.tar.bz2 pcsx_rearmed-1929a792755405a011ff905d6a4782f79089f056.zip | |
Merge pull request #7 from tobiasjakobi/fixes
libretro: adjust indentation style
| -rw-r--r-- | frontend/libretro.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index c7c14c0..e5496cb 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -870,17 +870,17 @@ static void update_variables(bool in_flight) } #endif - if (in_flight) { - // inform core things about possible config changes - plugin_call_rearmed_cbs(); + if (in_flight) { + // inform core things about possible config changes + plugin_call_rearmed_cbs(); - if (GPU_open != NULL && GPU_close != NULL) { - GPU_close(); - GPU_open(&gpuDisp, "PCSX", NULL); - } + if (GPU_open != NULL && GPU_close != NULL) { + GPU_close(); + GPU_open(&gpuDisp, "PCSX", NULL); + } - dfinput_activate(); - } + dfinput_activate(); + } } void retro_run(void) @@ -902,13 +902,13 @@ void retro_run(void) if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i)) in_keystate |= retro_psx_map[i]; - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) - { - in_a1[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; - in_a1[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; - in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; - in_a2[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; - } + if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) + { + in_a1[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; + in_a1[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; + in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; + in_a2[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; + } stop = 0; psxCpu->Execute(); @@ -1055,7 +1055,7 @@ void retro_init(void) SaveFuncs.close = save_close; update_variables(false); - check_system_specs(); + check_system_specs(); } void retro_deinit(void) |