[Gemrb-commits] gemrb/gemrb/plugins/TLKImporter TLKImp.cpp,1.46,1.47

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

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

Modified Files:
	TLKImp.cpp 
Log Message:
fixed some dialog tokens


Index: TLKImp.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/TLKImporter/TLKImp.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** TLKImp.cpp	9 Apr 2005 10:57:25 -0000	1.46
--- TLKImp.cpp	2 May 2005 17:26:25 -0000	1.47
***************
*** 162,166 ****
  
  	act = GetActorFromSlot(slot);
! 	if(act && act->GetStat(IE_SEX)==2) {
  		return femalestrref;
  	}
--- 162,166 ----
  
  	act = GetActorFromSlot(slot);
! 	if(act && (act->GetStat(IE_SEX)==2) ) {
  		return femalestrref;
  	}
***************
*** 242,262 ****
  	}
  	if (!strcmp( Token, "MALEFEMALE" )) {
! 		Decoded = GetString( GenderStrRef(-1,27483,27482), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HESHE" )) {
! 		Decoded = GetString( GenderStrRef(-1,27485,27484), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HISHER" )) {
! 		Decoded = GetString( GenderStrRef(-1,27487,27486), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HIMHER" )) {
! 		Decoded = GetString( GenderStrRef(-1,27487,27488), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "MANWOMAN" )) {
! 		Decoded = GetString( GenderStrRef(-1,27490,27489), 0);
  		goto exit_function;
  	}
--- 242,262 ----
  	}
  	if (!strcmp( Token, "MALEFEMALE" )) {
! 		Decoded = GetString( GenderStrRef(-1,27482,27483), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HESHE" )) {
! 		Decoded = GetString( GenderStrRef(-1,27484,27485), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HISHER" )) {
! 		Decoded = GetString( GenderStrRef(-1,27486,27487), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "HIMHER" )) {
! 		Decoded = GetString( GenderStrRef(-1,27488,27487), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "MANWOMAN" )) {
! 		Decoded = GetString( GenderStrRef(-1,27489,27490), 0);
  		goto exit_function;
  	}
***************
*** 293,313 ****
  	}
  	if (!strcmp( Token, "PRO_MALEFEMALE" )) {
! 		Decoded = GetString( GenderStrRef(0,27483,27482), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HESHE" )) {
! 		Decoded = GetString( GenderStrRef(0,27485,27484), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HISHER" )) {
! 		Decoded = GetString( GenderStrRef(0,27487,27486), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HIMHER" )) {
! 		Decoded = GetString( GenderStrRef(0,27487,27488), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_MANWOMAN" )) {
! 		Decoded = GetString( GenderStrRef(0,27490,27489), 0);
  		goto exit_function;
  	}
--- 293,313 ----
  	}
  	if (!strcmp( Token, "PRO_MALEFEMALE" )) {
! 		Decoded = GetString( GenderStrRef(0,27482,27483), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HESHE" )) {
! 		Decoded = GetString( GenderStrRef(0,27484,27485), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HISHER" )) {
! 		Decoded = GetString( GenderStrRef(0,27486,27487), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_HIMHER" )) {
! 		Decoded = GetString( GenderStrRef(0,27488,27487), 0);
  		goto exit_function;
  	}
  	if (!strcmp( Token, "PRO_MANWOMAN" )) {
! 		Decoded = GetString( GenderStrRef(0,27489,27490), 0);
  		goto exit_function;
  	}