From: Jaka K. <lyn...@us...> - 2010-07-27 09:57:27
|
gemrb: Infinity Engine emulator The branch master has been updated via 9ae1254b3b876685de124b362487a1da82d323e4 (commit) via ab931772916420364810287cb46cc2eea5d7ec95 (commit) Summary of changes: gemrb/core/SaveGameIterator.cpp | 1 - gemrb/plugins/TLKImporter/TLKImporter.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) from 249cabd67f418ee0382e412523e9971aedc8a716 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=9ae1254b3b876685de124b362487a1da82d323e4 commit 9ae1254b3b876685de124b362487a1da82d323e4 Author: Jaka Kranjc <lyn...@us...> Date: Tue Jul 27 12:02:16 2010 +0200 removed a doubled snprintf call in CreateSavePath diff --git a/gemrb/core/SaveGameIterator.cpp b/gemrb/core/SaveGameIterator.cpp index a069879..da8f673 100644 --- a/gemrb/core/SaveGameIterator.cpp +++ b/gemrb/core/SaveGameIterator.cpp @@ -456,7 +456,6 @@ static void CreateSavePath(char *Path, int index, const char *slotname) char dir[_MAX_PATH]; snprintf( dir, _MAX_PATH, "%09d-%s", index, slotname ); - snprintf( dir, _MAX_PATH, "%09d-%s", (int)index, slotname ); PathJoin(Path, Path, dir, NULL); //this is required in case the old slot wasn't recognised but still there core->DelTree(Path, false); http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=ab931772916420364810287cb46cc2eea5d7ec95 commit ab931772916420364810287cb46cc2eea5d7ec95 Author: Jaka Kranjc <lyn...@us...> Date: Tue Jul 27 11:53:09 2010 +0200 fixed a compilation and crashing problem from the last commit diff --git a/gemrb/plugins/TLKImporter/TLKImporter.cpp b/gemrb/plugins/TLKImporter/TLKImporter.cpp index 09a3df8..2e5d53e 100644 --- a/gemrb/plugins/TLKImporter/TLKImporter.cpp +++ b/gemrb/plugins/TLKImporter/TLKImporter.cpp @@ -30,7 +30,7 @@ //set this to -1 if charname is gabber (iwd2) static int charname=0; -typedef struct gt_type +struct gt_type { int type; ieStrRef male; @@ -63,7 +63,7 @@ TLKImporter::TLKImporter(void) for(int i=0;i<gtcount;i++) { ieVariable key; - strnuprcpy(key, tm->GetRowName(i), sizeof(ieVariable) ); + strnuprcpy(key, tm->GetRowName(i), sizeof(ieVariable)-1 ); gt_type *entry = (gt_type *) malloc(sizeof(gt_type) ); entry->type = atoi(tm->QueryField(i,0)); entry->male = atoi(tm->QueryField(i,1)); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |