aboutsummaryrefslogtreecommitdiff
path: root/frontend/main.c
diff options
context:
space:
mode:
authorAndrés2016-05-15 17:29:01 -0500
committerAndrés2016-05-15 17:29:01 -0500
commit05311a18fb23799776f9552614ef4c5fb5d852fa (patch)
tree93dfb321a3aae5421fdb3aef533987e271211d06 /frontend/main.c
parent93fed87bed7cc0bdc0f74e3f852282d938f7db4f (diff)
parent3b1a5e21b399fcb38c5d8ead3c16603f566d7ffa (diff)
downloadpcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.tar.gz
pcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.tar.bz2
pcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.zip
Merge pull request #39 from dankcushions/master
Added multitap 1 & 2 core options - adds 3-8 player support.
Diffstat (limited to 'frontend/main.c')
-rw-r--r--frontend/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/frontend/main.c b/frontend/main.c
index f048584..89e96e4 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -151,8 +151,8 @@ void emu_set_default_config(void)
new_dynarec_hacks = 0;
cycle_multiplier = 200;
- in_type1 = PSE_PAD_TYPE_STANDARD;
- in_type2 = PSE_PAD_TYPE_STANDARD;
+ in_type[0] = PSE_PAD_TYPE_STANDARD;
+ in_type[1] = PSE_PAD_TYPE_STANDARD;
}
void do_emu_action(void)
@@ -1030,4 +1030,3 @@ void SysCloseLibrary(void *lib) {
dlclose(lib);
#endif
}
-