[Gemrb-commits] gemrb/gemrb/plugins/Core Interface.cpp,1.272,1.273 Interface.h,1.141,1.142

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31207/Core

Modified Files:
	Interface.cpp Interface.h 
Log Message:
New guiscript function: GetSlots, GameGetReputation, GameSetReputation


Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** Interface.cpp	5 Mar 2005 10:31:20 -0000	1.272
--- Interface.cpp	7 Mar 2005 06:31:44 -0000	1.273
***************
*** 1720,1732 ****
  	}
  	switch ((Status >> 24) & 0xff) {
! 		case 0:
  		//Button
  		 {
- 			if (ctrl->ControlType != 0)
- 				return -1;
  			Button* btn = ( Button* ) ctrl;
  			btn->SetState( ( unsigned char ) ( Status & 0x7f ) );
  		}
  		break;
  	}
  	return 0;
--- 1720,1733 ----
  	}
  	switch ((Status >> 24) & 0xff) {
! 		case IE_GUI_BUTTON:
  		//Button
  		 {
  			Button* btn = ( Button* ) ctrl;
  			btn->SetState( ( unsigned char ) ( Status & 0x7f ) );
  		}
  		break;
+ 		default:
+ 			ctrl->Value = Status & 0x7f;
+ 			break;
  	}
  	return 0;

Index: Interface.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** Interface.h	5 Mar 2005 01:07:56 -0000	1.141
--- Interface.h	7 Mar 2005 06:31:44 -0000	1.142
***************
*** 152,156 ****
  	SlotType* slottypes;
  	int ItemTypes;
- 	int SlotTypes; //this is the same as the inventory size
  	int tooltip_x;
  	int tooltip_y;
--- 152,155 ----
***************
*** 162,165 ****
--- 161,165 ----
  	Store* CurrentStore;
  public:
+ 	int SlotTypes; //this is the same as the inventory size
  	ieResRef GlobalScript;
  	ieResRef WorldMapName;