ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

p2mic thing

This commit is contained in:
qeed 2010-05-01 21:17:42 +00:00
parent da1a1c7b61
commit 5308b98264
4 changed files with 1829 additions and 1808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/sdl/config.cpp
View File

@ -234,7 +234,7 @@ InitConfig()
config->addOption(prefix + GamePadNames[j], DefaultGamePad[i][j]); config->addOption(prefix + GamePadNames[j], DefaultGamePad[i][j]);
} }
} }
// PowerPad 0 - 1 // PowerPad 0 - 1
for(unsigned int i = 0; i < POWERPAD_NUM_DEVICES; i++) { for(unsigned int i = 0; i < POWERPAD_NUM_DEVICES; i++) {
char buf[64]; char buf[64];
@ -296,7 +296,13 @@ InitConfig()
config->addOption(prefix + FamilyKeyBoardNames[j], config->addOption(prefix + FamilyKeyBoardNames[j],
DefaultFamilyKeyBoard[j]); DefaultFamilyKeyBoard[j]);
} }
// for FAMICOM microphone in pad 2 pad 1 didn't have it
// Takeshi no Chousenjou uses it for example.
prefix = "SDL.Input.FamicomPad2.";
config->addOption("rp2mic", prefix + "EnableMic", 0);
const int Hotkeys[HK_MAX] = { const int Hotkeys[HK_MAX] = {
SDLK_F1, // cheat menu SDLK_F1, // cheat menu
SDLK_F2, // bind state SDLK_F2, // bind state

3607
src/drivers/sdl/input.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/drivers/sdl/input.h
View File

@ -31,6 +31,8 @@ void ConfigButton(char *text, ButtConfig *bc);
void InitInputInterface(void); void InitInputInterface(void);
void InputUserActiveFix(void); void InputUserActiveFix(void);
extern bool replaceP2StartWithMicrophone;
extern ButtConfig GamePadConfig[4][10]; extern ButtConfig GamePadConfig[4][10];
//extern ButtConfig powerpadsc[2][12]; //extern ButtConfig powerpadsc[2][12];
//extern ButtConfig QuizKingButtons[6]; //extern ButtConfig QuizKingButtons[6];

20
src/drivers/sdl/sdl.cpp
View File

@ -115,7 +115,9 @@ Option Value Description\n\
--user x Set the nickname to use in network play.\n\ --user x Set the nickname to use in network play.\n\
--pass x Set password to use for connecting to the server.\n\ --pass x Set password to use for connecting to the server.\n\
--netkey s Use string 's' to create a unique session for the game loaded.\n\ --netkey s Use string 's' to create a unique session for the game loaded.\n\
--players x Set the number of local players.\n"; --players x Set the number of local players.\n\
--rp2mic {0,1} Replace Port 2 Start with microphone (Famicom).\n";
// these should be moved to the man file // these should be moved to the man file
//--nospritelim {0|1} Disables the 8 sprites per scanline limitation.\n //--nospritelim {0|1} Disables the 8 sprites per scanline limitation.\n
@ -542,10 +544,18 @@ int main(int argc, char *argv[])
std::string s; std::string s;
g_config->getOption("SDL.InputCfg", &s); g_config->getOption("SDL.InputCfg", &s);
// update the input devices // set the FAMICOM PAD 2 Mic thing
{
int t;
g_config->getOption("SDL.Input.FamicomPad2.EnableMic", &t);
if (t)
replaceP2StartWithMicrophone = t;
}
// update the input devices
UpdateInput(g_config); UpdateInput(g_config);
// check for a .fcm file to convert to .fm2 // check for a .fcm file to convert to .fm2
g_config->getOption ("SDL.FCMConvert", &s); g_config->getOption ("SDL.FCMConvert", &s);
g_config->setOption ("SDL.FCMConvert", ""); g_config->setOption ("SDL.FCMConvert", "");
@ -768,7 +778,7 @@ int main(int argc, char *argv[])
if (id) if (id)
newppu = 1; newppu = 1;
} }
g_config->getOption("SDL.Frameskip", &frameskip); g_config->getOption("SDL.Frameskip", &frameskip);
// loop playing the game // loop playing the game
#ifdef _GTK #ifdef _GTK