From: <ave...@us...> - 2008-10-13 21:36:21
|
Revision: 5438 http://gemrb.svn.sourceforge.net/gemrb/?rev=5438&view=rev Author: avenger_teambg Date: 2008-10-13 21:36:15 +0000 (Mon, 13 Oct 2008) Log Message: ----------- fixed returning of default value in case of a * Modified Paths: -------------- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h Modified: gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h =================================================================== --- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-10-13 21:01:54 UTC (rev 5437) +++ gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-10-13 21:36:15 UTC (rev 5438) @@ -70,6 +70,9 @@ if (rows[row].size() <= column) { return ( char * ) defVal; } + if (rows[row][column][0]=='*' && !rows[row][column][1]) { + return defVal; + } return rows[row][column]; }; /** Returns a pointer to a zero terminated 2da element, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-13 21:39:00
|
Revision: 5439 http://gemrb.svn.sourceforge.net/gemrb/?rev=5439&view=rev Author: avenger_teambg Date: 2008-10-13 21:38:55 +0000 (Mon, 13 Oct 2008) Log Message: ----------- now it is better Modified Paths: -------------- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h Modified: gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h =================================================================== --- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-10-13 21:36:15 UTC (rev 5438) +++ gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-10-13 21:38:55 UTC (rev 5439) @@ -71,7 +71,7 @@ return ( char * ) defVal; } if (rows[row][column][0]=='*' && !rows[row][column][1]) { - return defVal; + return ( char * ) defVal; } return rows[row][column]; }; @@ -103,6 +103,9 @@ if (rows[rowi].size() <= ( unsigned int ) coli) { return ( char * ) defVal; } + if (rows[rowi][coli][0]=='*' && !rows[rowi][coli][1]) { + return ( char *) defVal; + } return rows[rowi][coli]; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-12-10 13:22:14
|
Revision: 7443 http://gemrb.svn.sourceforge.net/gemrb/?rev=7443&view=rev Author: avenger_teambg Date: 2009-12-10 13:22:05 +0000 (Thu, 10 Dec 2009) Log Message: ----------- simplified 2da code Modified Paths: -------------- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h Modified: gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h =================================================================== --- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2009-12-10 12:40:14 UTC (rev 7442) +++ gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2009-12-10 13:22:05 UTC (rev 7443) @@ -79,41 +79,28 @@ uses column name and row name to search the field */ inline const char* QueryField(const char* row, const char* column) const { - unsigned int i; + int rowi, coli; - int rowi = -1, coli = -1; - for (i = 0; i < rowNames.size(); i++) { - if (stricmp( rowNames[i], row ) == 0) { - rowi = i; - break; - } - } - if (rowi == -1) { + rowi = GetRowIndex(row); + + if (rowi < 0) { return ( char * ) defVal; } - for (i = 0; i < colNames.size(); i++) { - if (stricmp( colNames[i], column ) == 0) { - coli = i; - break; - } - } - if (coli == -1) { + + coli = GetColumnIndex(column); + + if (coli < 0) { return ( char * ) defVal; } - if (rows[rowi].size() <= ( unsigned int ) coli) { - return ( char * ) defVal; - } - if (rows[rowi][coli][0]=='*' && !rows[rowi][coli][1]) { - return ( char *) defVal; - } - return rows[rowi][coli]; + + return QueryField((unsigned int) rowi, (unsigned int) coli); }; inline int GetRowIndex(const char* string) const { for (unsigned int index = 0; index < rowNames.size(); index++) { if (stricmp( rowNames[index], string ) == 0) { - return index; + return (int) index; } } return -1; @@ -123,7 +110,7 @@ { for (unsigned int index = 0; index < colNames.size(); index++) { if (stricmp( colNames[index], string ) == 0) { - return index; + return (int) index; } } return -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |