[Gemrb-commits] gemrb/gemrb/plugins/CHUImporter CHUImp.cpp,1.9,1.10

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

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/CHUImporter
In directory sc8-pr-cvs1:/tmp/cvs-serv28946/CHUImporter

Modified Files:
	CHUImp.cpp 
Log Message:
Button justification flags are read from the .chu file


Index: CHUImp.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/CHUImporter/CHUImp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CHUImp.cpp	22 Oct 2003 13:43:12 -0000	1.9
--- CHUImp.cpp	27 Oct 2003 21:52:32 -0000	1.10
***************
*** 48,52 ****
  	str->Read(Signature, 8);
  	if(strncmp(Signature, "CHUIV1  ", 8) != 0) {
! 		printf("[CHUImporter]: Not a Vaild CHU File\n");
  		return false;
  	}
--- 48,52 ----
  	str->Read(Signature, 8);
  	if(strncmp(Signature, "CHUIV1  ", 8) != 0) {
! 		printf("[CHUImporter]: Not a Valid CHU File\n");
  		return false;
  	}
***************
*** 133,136 ****
--- 133,138 ----
  				str->Read(&SelectedIndex, 2);
  				str->Read(&DisabledIndex, 2);
+ /** Justification comes from the .chu, other bits are set by script */
+ 				btn->SetFlags(Cycle&0xff00,OP_OR);
  				if(strncmp(BAMFile, "GUICTRL\0", 8) == 0) {
  					if(UnpressedIndex == 0) {
***************
*** 146,150 ****
  					continue;
  					}
! 				Animation * ani = bam->GetCycle(Cycle);
  				Sprite2D * tspr = ani->GetFrame(UnpressedIndex);
  				btn->SetImage(IE_GUI_BUTTON_UNPRESSED, tspr);
--- 148,153 ----
  					continue;
  					}
! /** Cycle is only a byte for buttons */
! 				Animation * ani = bam->GetCycle(Cycle&0xff);
  				Sprite2D * tspr = ani->GetFrame(UnpressedIndex);
  				btn->SetImage(IE_GUI_BUTTON_UNPRESSED, tspr);