[Stella-commits] CVS: stella/src/common mainSDL.cxx,1.8,1.9

[Steve A. <ste...@us...>]

Update of /cvsroot/stella/stella/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1121

Modified Files:
	mainSDL.cxx 
Log Message:
Renamed the Switches structure to KeyList, since Visual C++ was
complaining that there's also a class named Switches (which there is).



Index: mainSDL.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/common/mainSDL.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mainSDL.cxx	23 Jun 2004 03:59:59 -0000	1.8
--- mainSDL.cxx	28 Jun 2004 23:16:24 -0000	1.9
***************
*** 131,135 ****
  static bool theShowInfoFlag;
  
! struct Switches
  {
    SDLKey scanCode;
--- 131,135 ----
  static bool theShowInfoFlag;
  
! struct KeyList
  {
    SDLKey scanCode;
***************
*** 140,144 ****
  // Todo - initialize this array in the same order as the SDLK
  // keys are defined, so it can be a constant-time LUT
! static Switches keyList[] = {
      { SDLK_F1,          StellaEvent::KCODE_F1         },
      { SDLK_F2,          StellaEvent::KCODE_F2         },
--- 140,144 ----
  // Todo - initialize this array in the same order as the SDLK
  // keys are defined, so it can be a constant-time LUT
! static KeyList keyList[] = {
      { SDLK_F1,          StellaEvent::KCODE_F1         },
      { SDLK_F2,          StellaEvent::KCODE_F2         },
***************
*** 480,484 ****
        else // check all the other keys
        {
!         for(unsigned int i = 0; i < sizeof(keyList) / sizeof(Switches); ++i)
          {
            if(keyList[i].scanCode == key)
--- 480,484 ----
        else // check all the other keys
        {
!         for(unsigned int i = 0; i < sizeof(keyList) / sizeof(KeyList); ++i)
          {
            if(keyList[i].scanCode == key)
***************
*** 492,496 ****
        type = event.type;
  
!       for(unsigned int i = 0; i < sizeof(keyList) / sizeof(Switches); ++i)
        { 
          if(keyList[i].scanCode == key)
--- 492,496 ----
        type = event.type;
  
!       for(unsigned int i = 0; i < sizeof(keyList) / sizeof(KeyList); ++i)
        { 
          if(keyList[i].scanCode == key)