[Balder-cvs] balder2d/src/menu menu.cpp,1.6,1.7

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

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

Modified Files:
	menu.cpp 
Log Message:
Reuben added support for setting player colors.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/balder/balder2d/src/menu/menu.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** menu.cpp	24 Feb 2006 01:17:47 -0000	1.6
--- menu.cpp	24 Feb 2006 18:35:38 -0000	1.7
***************
*** 228,231 ****
--- 228,240 ----
  		bindNextKey = true;
  	}
+ 	else if (action == "colorChange") {
+                 Uint32 rgbColor = Uint8(redSlider->getValue());
+                 rgbColor = rgbColor << 8;
+                 rgbColor += Uint8(greenSlider->getValue());
+                 rgbColor = rgbColor << 8;
+                 rgbColor += Uint8(blueSlider->getValue());
+ 
+ 		ConfigManager::SetPlayerColor(currentPlayer, rgbColor);
+ 	}
  	else if (action == "volumeChange") {
  		Mix_Volume(-1, (int)(MIX_MAX_VOLUME * volumeSlider->getValue()));
***************
*** 584,588 ****
          redSlider->setHeight(15);
  	redSlider->setValue(double(cRed));
! 	redSlider->setEventId("redChange");
  	redSlider->addActionListener(this);
  
--- 593,597 ----
          redSlider->setHeight(15);
  	redSlider->setValue(double(cRed));
! 	redSlider->setEventId("colorChange");
  	redSlider->addActionListener(this);
  
***************
*** 593,597 ****
          greenSlider->setHeight(15);
  	greenSlider->setValue(double(cGreen));
! 	greenSlider->setEventId("greenChange");
  	greenSlider->addActionListener(this);
  
--- 602,606 ----
          greenSlider->setHeight(15);
  	greenSlider->setValue(double(cGreen));
! 	greenSlider->setEventId("colorChange");
  	greenSlider->addActionListener(this);
  
***************
*** 602,606 ****
          blueSlider->setHeight(15);
  	blueSlider->setValue(double(cBlue));
! 	blueSlider->setEventId("blueChange");
  	blueSlider->addActionListener(this);
  
--- 611,615 ----
          blueSlider->setHeight(15);
  	blueSlider->setValue(double(cBlue));
! 	blueSlider->setEventId("colorChange");
  	blueSlider->addActionListener(this);
  
***************
*** 620,628 ****
  
          // Color selection controls for the selected player.
!        	playersMenu->add(redIcon, 400, 60);
!        	playersMenu->add(redSlider, 400, 60 + redIcon->getHeight());
!        	playersMenu->add(greenIcon, 400, 60 + redIcon->getHeight() + redSlider->getHeight() + 10);
!        	playersMenu->add(greenSlider, 400, 60 + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight());
!        	playersMenu->add(blueIcon, 400, 60 + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight() + greenSlider->getHeight() + 10);
!        	playersMenu->add(blueSlider, 400, 60 + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight() + greenSlider->getHeight() + 10 + blueIcon->getHeight());
  }
--- 629,639 ----
  
          // Color selection controls for the selected player.
!         int colorTop = 60; // This sets the top most position for the color selection interface.
!         int colorLeft = 400; // This sets the left most position for the color selection interface.
!        	playersMenu->add(redIcon, colorLeft, colorTop);
!        	playersMenu->add(redSlider, colorLeft, colorTop + redIcon->getHeight());
!        	playersMenu->add(greenIcon, colorLeft, colorTop + redIcon->getHeight() + redSlider->getHeight() + 10);
!        	playersMenu->add(greenSlider, colorLeft, colorTop + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight());
!        	playersMenu->add(blueIcon, colorLeft, colorTop + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight() + greenSlider->getHeight() + 10);
!        	playersMenu->add(blueSlider, colorLeft, colorTop + redIcon->getHeight() + redSlider->getHeight() + 10 + greenIcon->getHeight() + greenSlider->getHeight() + 10 + blueIcon->getHeight());
  }