[Planeshift-cvs] CVS: planeshift/src/client/gui pawsconfigcamera.cpp,1.7,1.8 pawsconfigchat.cpp,1.3,1.4 pawsconfigchat.h,1.3,1.4

[Christian S. <blu...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8693/src/client/gui

Modified Files:
	pawsconfigcamera.cpp pawsconfigchat.cpp pawsconfigchat.h 
Log Message:
Patch: 'Camera Distance' field cluttered with decimals in config window
Patch: advisor mode, no option for the colour

Index: pawsconfigcamera.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigcamera.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawsconfigcamera.cpp	18 Oct 2004 03:43:01 -0000	1.7
--- pawsconfigcamera.cpp	20 Nov 2004 22:21:56 -0000	1.8
***************
*** 241,245 ****
          return psengine->GetPSCamera()->GetDefaultYaw(mode);
      else if (settingName == "Camera Distance")
!         return psengine->GetPSCamera()->GetDistance(mode);
      else if (settingName == "Min Camera Distance")
          return psengine->GetPSCamera()->GetMinDistance(mode);
--- 241,245 ----
          return psengine->GetPSCamera()->GetDefaultYaw(mode);
      else if (settingName == "Camera Distance")
!         return 0.1*(int)(10.0*psengine->GetPSCamera()->GetDistance(mode));
      else if (settingName == "Min Camera Distance")
          return psengine->GetPSCamera()->GetMinDistance(mode);
***************
*** 284,288 ****
          psengine->GetPSCamera()->SetDefaultYaw(value, mode);
      else if (settingName == "Camera Distance")
!         psengine->GetPSCamera()->SetDistance(value, mode);
      else if (settingName == "Min Camera Distance")
          psengine->GetPSCamera()->SetMinDistance(value, mode);
--- 284,288 ----
          psengine->GetPSCamera()->SetDefaultYaw(value, mode);
      else if (settingName == "Camera Distance")
!         psengine->GetPSCamera()->SetDistance(0.1*(int)(10.0*value), mode);
      else if (settingName == "Min Camera Distance")
          psengine->GetPSCamera()->SetMinDistance(value, mode);

Index: pawsconfigchat.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigchat.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawsconfigchat.cpp	18 Oct 2004 11:50:55 -0000	1.3
--- pawsconfigchat.cpp	20 Nov 2004 22:21:56 -0000	1.4
***************
*** 85,88 ****
--- 85,91 ----
  	auctionG = NULL;
  	auctionB = NULL;
+ 	helpR = NULL;
+ 	helpG = NULL;
+ 	helpB = NULL;
      loose = NULL;
      for (int i = 0; i < CHAT_NLOG; i++)
***************
*** 145,148 ****
--- 148,154 ----
  	auctionG = (pawsEditTextBox*)FindWidget("auctiontextg");
  	auctionB = (pawsEditTextBox*)FindWidget("auctiontextb");
+     helpR = (pawsEditTextBox*)FindWidget("helptextr");
+ 	helpG = (pawsEditTextBox*)FindWidget("helptextg");
+ 	helpB = (pawsEditTextBox*)FindWidget("helptextb");
      loose = (pawsCheckBox*)FindWidget("loosefocus");
      for (int i = 0; i < CHAT_NLOG; i++)
***************
*** 263,266 ****
--- 269,276 ----
                  SET_WIDGET_VALUE(auction);
  			}
+             if ( nodeName == "helptext") 
+ 			{
+                 SET_WIDGET_VALUE(help);
+ 			}
          }
      }
***************
*** 293,296 ****
--- 303,307 ----
      SET_CHAT_VALUE(player);
      SET_CHAT_VALUE(auction);
+     SET_CHAT_VALUE(help);
      SET_CHAT_VALUE(group);
      SET_CHAT_VALUE(your);
***************
*** 356,359 ****
--- 367,371 ----
      SET_XML_VALUE(player,"playernametext");
      SET_XML_VALUE(auction,"auctiontext");
+     SET_XML_VALUE(auction,"helptext");
      SET_XML_VALUE(group,"grouptext");
      SET_XML_VALUE(your,"yourtext");

Index: pawsconfigchat.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigchat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawsconfigchat.h	18 Oct 2004 11:50:55 -0000	1.3
--- pawsconfigchat.h	20 Nov 2004 22:21:56 -0000	1.4
***************
*** 85,88 ****
--- 85,91 ----
  	pawsEditTextBox* auctionG;
  	pawsEditTextBox* auctionB;
+     pawsEditTextBox* helpR;
+ 	pawsEditTextBox* helpG;
+ 	pawsEditTextBox* helpB;
      
      pawsCheckBox* loose;