From c39de3f8a811a1ac1aef333c3467d77a50002921 Mon Sep 17 00:00:00 2001 From: gimmedonutnow Date: Thu, 3 Aug 2006 00:31:31 +0000 Subject: [PATCH] - pretty much done commenting... might have a chance to start cleanup tonight - had to change the name of the 'brk' variable name again... please don't change it back... brk is a reserved word in *nix. --- src/boards/sl1632.cpp | 19 +- src/drivers/sdl/input.cpp | 1047 ++++++++++++++++++------------ src/drivers/sdl/main.cpp | 3 + src/drivers/sdl/sdl-joystick.cpp | 3 +- 4 files changed, 650 insertions(+), 422 deletions(-) diff --git a/src/boards/sl1632.cpp b/src/boards/sl1632.cpp index 11c5c5a8..fee5552b 100644 --- a/src/boards/sl1632.cpp +++ b/src/boards/sl1632.cpp @@ -21,13 +21,14 @@ #include "mapinc.h" #include "mmc3.h" -static uint8 chrcmd[8], prg0, prg1, brk, latc, mirr; +// brk is a system call in *nix, and is an illegal variable name - soules +static uint8 chrcmd[8], prg0, prg1, bbrk, latc, mirr; static SFORMAT StateRegs[]= { {chrcmd, 8, "CHRCMD"}, {&prg0, 1, "PRG0"}, {&prg1, 1, "PRG1"}, - {&brk, 1, "BRK"}, + {&bbrk, 1, "BRK"}, {&mirr, 1, "MIRR"}, {0} }; @@ -47,9 +48,9 @@ static void Sync(void) static void UNLSL1632CW(uint32 A, uint8 V) { int cbase=(MMC3_cmd&0x80)<<5; - int page0=(brk&0x08)<<5; - int page1=(brk&0x20)<<3; - int page2=(brk&0x80)<<1; + int page0=(bbrk&0x08)<<5; + int page1=(bbrk&0x20)<<3; + int page2=(bbrk&0x80)<<1; setchr1(cbase^0x0000,page0|(DRegBuf[0]&(~1))); setchr1(cbase^0x0400,page0|DRegBuf[0]|1); setchr1(cbase^0x0800,page0|(DRegBuf[1]&(~1))); @@ -64,10 +65,10 @@ static DECLFW(UNLSL1632CMDWrite) { if((A&0xA131)==0xA131) { - brk=V; - latc = brk; + bbrk=V; + latc = bbrk; } - if(brk&2) + if(bbrk&2) { FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); @@ -99,7 +100,7 @@ static DECLFW(UNLSL1632CMDWrite) static void StateRestore(int version) { - if(brk&2) + if(bbrk&2) { FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index 71ab158f..6c001d6f 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -35,28 +35,40 @@ static int cspec=0; extern int gametype; -/* Necessary for proper GUI functioning(configuring when a game isn't loaded). */ -void InputUserActiveFix(void) +/** + * Necessary for proper GUI functioning (configuring when a game isn't loaded). + */ +void +InputUserActiveFix() { - int x; - for(x=0;x<3;x++) InputType[x]=UsrInputType[x]; + int x; + for(x = 0; x < 3; x++) { + InputType[x] = UsrInputType[x]; + } } -void ParseGIInput(FCEUGI *gi) +/** + * Parse game information and configure the input devices accordingly. + */ +void +ParseGIInput(FCEUGI *gi) { - gametype=gi->type; + gametype=gi->type; - InputType[0]=UsrInputType[0]; - InputType[1]=UsrInputType[1]; - InputType[2]=UsrInputType[2]; + InputType[0] = UsrInputType[0]; + InputType[1] = UsrInputType[1]; + InputType[2] = UsrInputType[2]; - if(gi->input[0]>=0) - InputType[0]=gi->input[0]; - if(gi->input[1]>=0) - InputType[1]=gi->input[1]; - if(gi->inputfc>=0) - InputType[2]=gi->inputfc; - cspec = gi->cspecial; + if(gi->input[0]>=0) { + InputType[0] = gi->input[0]; + } + if(gi->input[1]>=0) { + InputType[1] = gi->input[1]; + } + if(gi->inputfc>=0) { + InputType[2] = gi->inputfc; + } + cspec = gi->cspecial; } @@ -79,16 +91,21 @@ static void UpdateTopRider(void); static uint32 JSreturn=0; int NoWaiting=1; -static void DoCheatSeq(void) +/** + * Configure cheat devices (game genie, etc.). Restarts the keyboard + * and video subsystems. + */ +static void +DoCheatSeq() { - SilenceSound(1); - KillKeyboard(); - KillVideo(); + SilenceSound(1); + KillKeyboard(); + KillVideo(); - DoConsoleCheatConfig(); - InitVideo(CurGame); - InitKeyboard(); - SilenceSound(0); + DoConsoleCheatConfig(); + InitVideo(CurGame); + InitKeyboard(); + SilenceSound(0); } #include "keyscan.h" @@ -98,168 +115,230 @@ static int DIPS=0; static uint8 keyonce[MKK_COUNT]; #define KEY(__a) keys[MKK(__a)] -static int _keyonly(int a) +static int +_keyonly(int a) { - if(keys[a]) - { - if(!keyonce[a]) - { - keyonce[a]=1; - return(1); - } - } - else - keyonce[a]=0; - return(0); + if(keys[a]) { + if(!keyonce[a]) { + keyonce[a] = 1; + return(1); + } + } else { + keyonce[a] = 0; + } + return(0); } #define keyonly(__a) _keyonly(MKK(__a)) static int cidisabled=0; -static void KeyboardCommands(void) +/** + * Parse keyboard commands and execute accordingly. + */ +static void +KeyboardCommands() { - int is_shift, is_alt; + int is_shift, is_alt; - keys=GetKeyboard(); + // get the keyboard input + keys = GetKeyboard(); - if(InputType[2]==SIFC_FKB) - { - if(keyonly(SCROLLLOCK)) - { - cidisabled^=1; - FCEUI_DispMessage("Family Keyboard %sabled.",cidisabled?"en":"dis"); - } - #ifdef SDL - SDL_WM_GrabInput(cidisabled?SDL_GRAB_ON:SDL_GRAB_OFF); - #endif - if(cidisabled) return; - } - - is_shift = KEY(LEFTSHIFT) | KEY(RIGHTSHIFT); - is_alt = KEY(LEFTALT) | KEY(RIGHTALT); - - if(keyonly(F4)) - { - if(is_shift) FCEUI_SetRenderDisable(-1, 2); - else FCEUI_SetRenderDisable(2, -1); - } - #ifdef SDL - if(keyonly(ENTER) && is_alt) ToggleFS(); - #endif - - NoWaiting&=~1; - if(KEY(GRAVE)) - NoWaiting|=1; - - if(gametype==GIT_FDS) - { - if(keyonly(F6)) FCEUI_FDSSelect(); - if(keyonly(F8)) FCEUI_FDSInsert(); - } - - if(keyonly(F9)) FCEUI_SaveSnapshot(); - if(gametype!=GIT_NSF) - { - if(keyonly(F2)) DoCheatSeq(); - if(keyonly(F5)) - { - if(is_shift) - FCEUI_SaveMovie(NULL,0,NULL); - else - FCEUI_SaveState(NULL); - } - if(keyonly(F7)) - { - if(is_shift) - FCEUI_LoadMovie(NULL,0,0); //mbg merge 7/23/06 loadmovie takes another arg now - else - FCEUI_LoadState(NULL); - } - } - - if(keyonly(F1)) FCEUI_ToggleTileView(); - - if(keyonly(MINUS)) DecreaseEmulationSpeed(); - if(keyonly(EQUAL)) IncreaseEmulationSpeed(); - if(keyonly(BACKSPACE)) FCEUI_MovieToggleFrameDisplay(); - if(keyonly(BACKSLASH)) FCEUI_ToggleEmulationPause(); - if(keyonly(RIGHTCONTROL)) FCEUI_FrameAdvance(); - - if(keyonly(F10)) FCEUI_ResetNES(); - if(keyonly(F11)) FCEUI_PowerNES(); - - if(KEY(F12) || KEY(ESCAPE)) CloseGame(); - - if(gametype==GIT_VSUNI) - { - if(keyonly(F8)) FCEUI_VSUniCoin(); - if(keyonly(F6)) - { - DIPS^=1; - FCEUI_VSUniToggleDIPView(); - } - if(!(DIPS&1)) goto DIPSless; - if(keyonly(1)) FCEUI_VSUniToggleDIP(0); - if(keyonly(2)) FCEUI_VSUniToggleDIP(1); - if(keyonly(3)) FCEUI_VSUniToggleDIP(2); - if(keyonly(4)) FCEUI_VSUniToggleDIP(3); - if(keyonly(5)) FCEUI_VSUniToggleDIP(4); - if(keyonly(6)) FCEUI_VSUniToggleDIP(5); - if(keyonly(7)) FCEUI_VSUniToggleDIP(6); - if(keyonly(8)) FCEUI_VSUniToggleDIP(7); - } - else - { - static uint8 bbuf[32]; - static int bbuft; - static int barcoder = 0; - - if(keyonly(H)) FCEUI_NTSCSELHUE(); - if(keyonly(T)) FCEUI_NTSCSELTINT(); - if(KEY(KP_MINUS) || KEY(MINUS)) FCEUI_NTSCDEC(); - if(KEY(KP_PLUS) || KEY(EQUAL)) FCEUI_NTSCINC(); - - if((InputType[2] == SIFC_BWORLD) || (cspec == SIS_DATACH)) - { - if(keyonly(F8)) - { - barcoder ^= 1; - if(!barcoder) - { - if(InputType[2] == SIFC_BWORLD) - { - strcpy((char *)&BWorldData[1],(char *)bbuf); - BWorldData[0]=1; - } - else - FCEUI_DatachSet(bbuf); - FCEUI_DispMessage("Barcode Entered"); - } - else { bbuft = 0; FCEUI_DispMessage("Enter Barcode");} + // check if the family keyboard is enabled + if(InputType[2] == SIFC_FKB) { + if(keyonly(SCROLLLOCK)) { + cidisabled ^= 1; + FCEUI_DispMessage("Family Keyboard %sabled.", + cidisabled ? "en" : "dis"); + } + SDL_WM_GrabInput(cidisabled ? SDL_GRAB_ON : SDL_GRAB_OFF); + if(cidisabled) { + return; + } } - } else barcoder = 0; - #define SSM(x) \ - { if(barcoder) { if(bbuft < 13) {bbuf[bbuft++] = '0' + x; bbuf[bbuft] = 0;} FCEUI_DispMessage("Barcode: %s",bbuf);} \ - else { \ - if(is_shift) FCEUI_SelectMovie(x,1); \ - else FCEUI_SelectState(x,1); \ - } } + is_shift = KEY(LEFTSHIFT) | KEY(RIGHTSHIFT); + is_alt = KEY(LEFTALT) | KEY(RIGHTALT); - DIPSless: - if(keyonly(0)) SSM(0); - if(keyonly(1)) SSM(1); - if(keyonly(2)) SSM(2); - if(keyonly(3)) SSM(3); - if(keyonly(4)) SSM(4); - if(keyonly(5)) SSM(5); - if(keyonly(6)) SSM(6); - if(keyonly(7)) SSM(7); - if(keyonly(8)) SSM(8); - if(keyonly(9)) SSM(9); - #undef SSM - } + // f4 controls rendering + if(keyonly(F4)) { + if(is_shift) { + FCEUI_SetRenderDisable(-1, 2); + } else { + FCEUI_SetRenderDisable(2, -1); + } + } + + // Alt-Enter to toggle full-screen + if(keyonly(ENTER) && is_alt) { + ToggleFS(); + } + + // Toggle throttling + NoWaiting &= ~1; + if(KEY(GRAVE)) { + NoWaiting |= 1; + } + + // Famicom disk-system games + if(gametype==GIT_FDS) { + if(keyonly(F6)) { + FCEUI_FDSSelect(); + } + if(keyonly(F8)) { + FCEUI_FDSInsert(); + } + } + + // f9 is save snapshot key + if(keyonly(F9)) { + FCEUI_SaveSnapshot(); + } + + // if not NES Sound Format + if(gametype != GIT_NSF) { + // f2 to enable cheats + if(keyonly(F2)) { + DoCheatSeq(); + } + + // f5 to save state, Shift-f5 to save movie + if(keyonly(F5)) { + if(is_shift) { + FCEUI_SaveMovie(NULL,0,NULL); + } else { + FCEUI_SaveState(NULL); + } + } + + // f7 to load state, Shift-f7 to load movie + if(keyonly(F7)) { + if(is_shift) { + //mbg merge 7/23/06 loadmovie takes another arg now + FCEUI_LoadMovie(NULL,0,0); + } else { + FCEUI_LoadState(NULL); + } + } + } + + // f1 to toggle tile view + if(keyonly(F1)) { + FCEUI_ToggleTileView(); + } + + // - to decrease speed, = to increase speed + if(keyonly(MINUS)) { + DecreaseEmulationSpeed(); + } + if(keyonly(EQUAL)) { + IncreaseEmulationSpeed(); + } + + if(keyonly(BACKSPACE)) { + FCEUI_MovieToggleFrameDisplay(); + } + if(keyonly(BACKSLASH)) { + FCEUI_ToggleEmulationPause(); + } + if(keyonly(RIGHTCONTROL)) { + FCEUI_FrameAdvance(); + } + + // f10 reset, f11 power + if(keyonly(F10)) { + FCEUI_ResetNES(); + } + if(keyonly(F11)) { + FCEUI_PowerNES(); + } + + // F12 or Esc close game + if(KEY(F12) || KEY(ESCAPE)) { + CloseGame(); + } + + // VS Unisystem games + if(gametype == GIT_VSUNI) { + // insert coin + if(keyonly(F8)) FCEUI_VSUniCoin(); + + // toggle dipswitch display + if(keyonly(F6)) { + DIPS^=1; + FCEUI_VSUniToggleDIPView(); + } + if(!(DIPS&1)) goto DIPSless; + + // toggle the various dipswitches + if(keyonly(1)) FCEUI_VSUniToggleDIP(0); + if(keyonly(2)) FCEUI_VSUniToggleDIP(1); + if(keyonly(3)) FCEUI_VSUniToggleDIP(2); + if(keyonly(4)) FCEUI_VSUniToggleDIP(3); + if(keyonly(5)) FCEUI_VSUniToggleDIP(4); + if(keyonly(6)) FCEUI_VSUniToggleDIP(5); + if(keyonly(7)) FCEUI_VSUniToggleDIP(6); + if(keyonly(8)) FCEUI_VSUniToggleDIP(7); + } else { + static uint8 bbuf[32]; + static int bbuft; + static int barcoder = 0; + + if(keyonly(H)) FCEUI_NTSCSELHUE(); + if(keyonly(T)) FCEUI_NTSCSELTINT(); + if(KEY(KP_MINUS) || KEY(MINUS)) FCEUI_NTSCDEC(); + if(KEY(KP_PLUS) || KEY(EQUAL)) FCEUI_NTSCINC(); + + if((InputType[2] == SIFC_BWORLD) || (cspec == SIS_DATACH)) { + if(keyonly(F8)) { + barcoder ^= 1; + if(!barcoder) { + if(InputType[2] == SIFC_BWORLD) { + strcpy((char *)&BWorldData[1], (char *)bbuf); + BWorldData[0] = 1; + } else { + FCEUI_DatachSet(bbuf); + } + FCEUI_DispMessage("Barcode Entered"); + } else { + bbuft = 0; + FCEUI_DispMessage("Enter Barcode"); + } + } + } else { + barcoder = 0; + } + +#define SSM(x) \ +do { \ + if(barcoder) { \ + if(bbuft < 13) { \ + bbuf[bbuft++] = '0' + x; \ + bbuf[bbuft] = 0; \ + } \ + FCEUI_DispMessage("Barcode: %s", bbuf); \ + } else { \ + if(is_shift) { \ + FCEUI_SelectMovie(x,1); \ + } else { \ + FCEUI_SelectState(x,1); \ + } \ + } \ +} while(0) + + DIPSless: + if(keyonly(0)) SSM(0); + if(keyonly(1)) SSM(1); + if(keyonly(2)) SSM(2); + if(keyonly(3)) SSM(3); + if(keyonly(4)) SSM(4); + if(keyonly(5)) SSM(5); + if(keyonly(6)) SSM(6); + if(keyonly(7)) SSM(7); + if(keyonly(8)) SSM(8); + if(keyonly(9)) SSM(9); +#undef SSM + } } #define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1} @@ -287,38 +366,51 @@ ButtConfig GamePadConfig[4][10]={ }; -static void UpdateGamepad(void) +/** + * Update the gamepad button configurations. + */ +static void +UpdateGamepad(void) { - if(FCEUI_IsMovieActive()<0) - return; + // don't update during movie playback + if(FCEUI_IsMovieActive() < 0) { + return; + } - static int rapid=0; - uint32 JS=0; - int x; - int wg; + static int rapid=0; + uint32 JS=0; + int x; + int wg; - rapid^=1; + rapid ^= 1; - for(wg=0;wg<4;wg++) - { - for(x=0;x<8;x++) - if(DTestButton(&GamePadConfig[wg][x])) - JS|=(1<ButtType[wc]==bc->ButtType[wc-1] && bc->DeviceNum[wc]==bc->DeviceNum[wc-1] && - bc->ButtonNum[wc]==bc->ButtonNum[wc-1]) - break; - } - bc->NumC=wc; + if(wc && + bc->ButtType[wc] == bc->ButtType[wc - 1] && + bc->DeviceNum[wc] == bc->DeviceNum[wc - 1] && + bc->ButtonNum[wc]==bc->ButtonNum[wc-1]) { + break; + } + } + bc->NumC = wc; } -void ConfigDevice(int which, int arg) +/** + * Update the button configuration for a specified device. + */ +void +ConfigDevice(int which, + int arg) { - uint8 buf[256]; - int x; + uint8 buf[256]; + int x; + char *str[10]={"A","B","SELECT","START","UP","DOWN","LEFT","RIGHT","Rapid A","Rapid B"}; - ButtonConfigBegin(); - switch(which) - { - case FCFGD_QUIZKING: - for(x=0;x<6;x++) - { - sprintf((char *)buf,"Quiz King Buzzer #%d", x+1); - subcon((char *)buf,&QuizKingButtons[x]); - } - break; - case FCFGD_HYPERSHOT: - for(x=0;x<4;x++) - { - sprintf((char *)buf,"Hyper Shot %d: %s",((x&2)>>1)+1,(x&1)?"JUMP":"RUN"); - subcon((char *)buf,&HyperShotButtons[x]); - } - break; - case FCFGD_POWERPAD: - for(x=0;x<12;x++) - { - sprintf((char *)buf,"PowerPad %d: %d", (arg&1)+1,x+11); - subcon((char *)buf,&powerpadsc[arg&1][x]); - } - break; + ButtonConfigBegin(); + switch(which) { + case FCFGD_QUIZKING: + for(x = 0; x < 6; x++) { + sprintf((char *)buf, "Quiz King Buzzer #%d", x+1); + subcon((char *)buf, &QuizKingButtons[x]); + } + break; + case FCFGD_HYPERSHOT: + for(x = 0; x < 4; x++) { + sprintf((char *)buf, "Hyper Shot %d: %s", + ((x & 2) >> 1) + 1, (x & 1) ? "JUMP" : "RUN"); + subcon((char *)buf, &HyperShotButtons[x]); + } + break; + case FCFGD_POWERPAD: + for(x = 0; x < 12; x++) { + sprintf((char *)buf, "PowerPad %d: %d", (arg & 1) + 1, x + 11); + subcon((char *)buf, &powerpadsc[arg&1][x]); + } + break; - case FCFGD_GAMEPAD: - { - char *str[10]={"A","B","SELECT","START","UP","DOWN","LEFT","RIGHT","Rapid A","Rapid B"}; - for(x=0;x<10;x++) - { - sprintf((char *)buf,"GamePad #%d: %s",arg+1,str[x]); - subcon((char *)buf,&GamePadConfig[arg][x]); - } - } - break; - } + case FCFGD_GAMEPAD: + for(x = 0; x < 10; x++) { + sprintf((char *)buf, "GamePad #%d: %s", arg + 1, str[x]); + subcon((char *)buf, &GamePadConfig[arg][x]); + } + break; + } - ButtonConfigEnd(); + ButtonConfigEnd(); } @@ -641,56 +843,79 @@ CFGSTRUCT InputConfig[]={ }; -static void InputCfg(char *text) +/** + * Update the button configuration for a device, specified by a text string. + */ +static void +InputCfg(char *text) { - if(!strncasecmp(text,"gamepad",strlen("gamepad"))) - { - ConfigDevice(FCFGD_GAMEPAD,(text[strlen("gamepad")]-'1')&3); - } - else if(!strncasecmp(text,"powerpad",strlen("powerpad"))) - { - ConfigDevice(FCFGD_POWERPAD,(text[strlen("powerpad")]-'1')&1); - } - else if(!strcasecmp(text,"hypershot")) - ConfigDevice(FCFGD_HYPERSHOT,0); - else if(!strcasecmp(text,"quizking")) - ConfigDevice(FCFGD_QUIZKING,0); + if(!strncasecmp(text, "gamepad", strlen("gamepad"))) { + ConfigDevice(FCFGD_GAMEPAD, (text[strlen("gamepad")] - '1') & 3); + } else if(!strncasecmp(text, "powerpad", strlen("powerpad"))) { + ConfigDevice(FCFGD_POWERPAD, (text[strlen("powerpad")] - '1') & 1); + } else if(!strcasecmp(text,"hypershot")) { + ConfigDevice(FCFGD_HYPERSHOT, 0); + } else if(!strcasecmp(text,"quizking")) { + ConfigDevice(FCFGD_QUIZKING, 0); + } } -static void FCExp(char *text) +/** + * Specify a FamiCom Expansion device as the 3rd input device. Takes + * a text string describing the device. + */ +static void +FCExp(char *text) { - static char *fccortab[11]={"none","arkanoid","shadow","4player","fkb","hypershot", - "mahjong","quizking","ftrainera","ftrainerb","oekakids"}; + static char *fccortab[11]={"none","arkanoid","shadow","4player","fkb","hypershot", + "mahjong","quizking","ftrainera","ftrainerb","oekakids"}; - static int fccortabi[11]={SIFC_NONE,SIFC_ARKANOID,SIFC_SHADOW, - SIFC_4PLAYER,SIFC_FKB,SIFC_HYPERSHOT,SIFC_MAHJONG,SIFC_QUIZKING, - SIFC_FTRAINERA,SIFC_FTRAINERB,SIFC_OEKAKIDS}; - int y; - for(y=0;y<11;y++) - if(!strcmp(fccortab[y],text)) - UsrInputType[2]=fccortabi[y]; + static int fccortabi[11]={SIFC_NONE,SIFC_ARKANOID,SIFC_SHADOW, + SIFC_4PLAYER,SIFC_FKB,SIFC_HYPERSHOT,SIFC_MAHJONG,SIFC_QUIZKING, + SIFC_FTRAINERA,SIFC_FTRAINERB,SIFC_OEKAKIDS}; + + int y; + for(y = 0; y < 11; y++) { + if(!strcmp(fccortab[y], text)) { + UsrInputType[2] = fccortabi[y]; + } + } } static char *cortab[6]={"none","gamepad","zapper","powerpada","powerpadb","arkanoid"}; static int cortabi[6]={SI_NONE,SI_GAMEPAD, SI_ZAPPER,SI_POWERPADA,SI_POWERPADB,SI_ARKANOID}; -static void Input1(char *text) +/** + * Set the 1st user-specified input device. Specified as a text + * string. + */ +static void +Input1(char *text) { - int y; + int y; - for(y=0;y<6;y++) - if(!strcmp(cortab[y],text)) - UsrInputType[0]=cortabi[y]; + for(y = 0; y < 6; y++) { + if(!strcmp(cortab[y], text)) { + UsrInputType[0] = cortabi[y]; + } + } } -static void Input2(char *text) +/** + * Set the 2nd user-specified input device. Specified as a text + * string. + */ +static void +Input2(char *text) { - int y; + int y; - for(y=0;y<6;y++) - if(!strcmp(cortab[y],text)) - UsrInputType[1]=cortabi[y]; + for(y = 0; y < 6; y++) { + if(!strcmp(cortab[y], text)) { + UsrInputType[1] = cortabi[y]; + } + } } ARGPSTRUCT InputArgs[]={ diff --git a/src/drivers/sdl/main.cpp b/src/drivers/sdl/main.cpp index b4f6ee04..7292d124 100644 --- a/src/drivers/sdl/main.cpp +++ b/src/drivers/sdl/main.cpp @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/// \file +/// \brief A set of functions for dealing with the main execution loop. Much of this code will likely be dispersed to sdl.cpp and other files since we no longer support non-SDL and non-Windows builds. + #include #include #include diff --git a/src/drivers/sdl/sdl-joystick.cpp b/src/drivers/sdl/sdl-joystick.cpp index 55e82015..669a8243 100644 --- a/src/drivers/sdl/sdl-joystick.cpp +++ b/src/drivers/sdl/sdl-joystick.cpp @@ -33,8 +33,7 @@ static SDL_Joystick *Joysticks[MAX_JOYSTICKS] = {NULL}; /** - * Updates a single input button configuration on the joystick. Note: - * I'm not fully sure that this is what the function does - soules. + * Updates a single input button configuration on the joystick? */ int DTestButtonJoy(ButtConfig *bc)