[Balder-cvs] balder2d/src/menu menu.cpp,1.20,1.21

[Reuben <col...@us...>]

Update of /cvsroot/balder/balder2d/src/menu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23026/src/menu

Modified Files:
	menu.cpp 
Log Message:
22-Mar-2006
    - Reuben made the main menu save all options to file as soon as one is
    changed except for values in number fields.  You must either change a
    option, start a new game, or exit the program for number fields to save
    their value.
    - Reuben made the music check box in the main menu toggle the music on
    and off in the menu imediatly.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/balder/balder2d/src/menu/menu.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** menu.cpp	23 Mar 2006 01:36:53 -0000	1.20
--- menu.cpp	23 Mar 2006 02:52:34 -0000	1.21
***************
*** 129,133 ****
  		SDL_UpdateRect(screen,0,0,0,0);
  	}
!         Menu::action("saveSettings");
  	if (startgame) {
  		return true;
--- 129,133 ----
  		SDL_UpdateRect(screen,0,0,0,0);
  	}
!     Menu::action("saveSettings");
  	if (startgame) {
  		return true;
***************
*** 255,258 ****
--- 255,259 ----
  	else if (action == "toggleMusic") {
  		ConfigManager::SetIntValue("Sound", "music", musicCheckbox->isMarked());
+         sound->PlayMusic("menu");
  	}
  	else if (action == "volumeChange") {
***************
*** 287,290 ****
--- 288,295 ----
  		lifeLimitValue->setVisible(life > 0);
  	}
+ 
+     if (action != "saveSettings"){
+         Menu::action("saveSettings");
+     }
  }