[Gemrb-commits] gemrb/gemrb/plugins/2DAImporter 2DAImp.h,1.6,1.7

[<bal...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/2DAImporter
In directory sc8-pr-cvs1:/tmp/cvs-serv13324/gemrb/plugins/2DAImporter

Modified Files:
	2DAImp.h 
Log Message:
Bug Fixed: The 2DA Importer never returned the Default Value in QueryField

Index: 2DAImp.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/2DAImporter/2DAImp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 2DAImp.h	29 Oct 2003 23:50:30 -0000	1.6
--- 2DAImp.h	3 Nov 2003 11:35:31 -0000	1.7
***************
*** 33,38 ****
      inline char *QueryField(int row = 0, int column = 0) const
  	{
! 		if(rows.size()<=row) return NULL;
! 		if(rows[row].size()<=column) return NULL;
  		return rows[row][column];
  	};
--- 33,38 ----
      inline char *QueryField(int row = 0, int column = 0) const
  	{
! 		if(rows.size()<=row) return (char*)defVal;
! 		if(rows[row].size()<=column) return (char*)defVal;
  		return rows[row][column];
  	};
***************
*** 50,54 ****
  		}
  		if(rowi == -1)
! 			return NULL;
  		for(int i = 0; i < colNames.size(); i++) {
  			if(stricmp(colNames[i], column) == 0) {
--- 50,54 ----
  		}
  		if(rowi == -1)
! 			return (char*)defVal;
  		for(int i = 0; i < colNames.size(); i++) {
  			if(stricmp(colNames[i], column) == 0) {
***************
*** 58,62 ****
  		}
  		if(coli == -1)
! 			return NULL;
  		return rows[rowi][coli];
  	};
--- 58,62 ----
  		}
  		if(coli == -1)
! 			return (char*)defVal;
  		return rows[rowi][coli];
  	};