From: Alyssa M. <fu...@us...> - 2010-08-30 08:21:18
|
gemrb: Infinity Engine emulator The branch master has been updated via 1549a0cbc545ed36dfd9985be483be6cd9bf7bf8 (commit) Summary of changes: gemrb/core/Spellbook.cpp | 15 ++++++++------- gemrb/plugins/CREImporter/CREImporter.cpp | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) from ba7eed2fda285b69e5c4ada25292596fddd603eb (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=1549a0cbc545ed36dfd9985be483be6cd9bf7bf8 commit 1549a0cbc545ed36dfd9985be483be6cd9bf7bf8 Author: Alyssa Milburn <fu...@fu...> Date: Mon Aug 30 10:20:52 2010 +0200 add/fix more random asserts/checks diff --git a/gemrb/core/Spellbook.cpp b/gemrb/core/Spellbook.cpp index 2a4e6b2..45d6c75 100644 --- a/gemrb/core/Spellbook.cpp +++ b/gemrb/core/Spellbook.cpp @@ -472,11 +472,9 @@ bool Spellbook::AddSpellMemorization(CRESpellMemorization* sm) } // only add this one if necessary - if (s->size() == level) { - s->push_back(sm); - return true; - } - return false; + assert (s->size() == level); + s->push_back(sm); + return true; } //apply the wisdom bonus on all spell levels for type @@ -509,7 +507,7 @@ void Spellbook::ClearBonus() CRESpellMemorization *Spellbook::GetSpellMemorization(unsigned int type, unsigned int level) { CRESpellMemorization *sm; - if (level>= GetSpellLevelCount(type) || !(sm = spells[type][level]) ) { + if (level >= GetSpellLevelCount(type)) { sm = new CRESpellMemorization(); sm->Type = (ieWord) type; sm->Level = (ieWord) level; @@ -518,6 +516,9 @@ CRESpellMemorization *Spellbook::GetSpellMemorization(unsigned int type, unsigne delete sm; return NULL; } + assert(sm == spells[type][level]); + } else { + sm = spells[type][level]; } return sm; } @@ -877,7 +878,7 @@ void Spellbook::dump() for (unsigned int j = 0; j < spells[i].size(); j++) { CRESpellMemorization* sm = spells[i][j]; //if (!sm || !sm->Number) continue; - if (!sm) continue; + //if (!sm) continue; //Never ever use field length qualifiers it is not portable, if you need to convert, convert to compatible values, anyway we don't need this! //printf ( "type: %d: L: %d; N1: %d; N2: %d; T: %d; KC: %d; MC: %d\n", i, diff --git a/gemrb/plugins/CREImporter/CREImporter.cpp b/gemrb/plugins/CREImporter/CREImporter.cpp index dceb67f..84ad587 100644 --- a/gemrb/plugins/CREImporter/CREImporter.cpp +++ b/gemrb/plugins/CREImporter/CREImporter.cpp @@ -2895,14 +2895,14 @@ int CREImporter::PutActor(DataStream *stream, Actor *actor, bool chr) return -1; } - CREOffset = stream->GetPos(); // for asserts - IsCharacter = chr; if (chr) { WriteChrHeader( stream, actor ); } assert(TotSCEFF==0 || TotSCEFF==1); + CREOffset = stream->GetPos(); // for asserts + ret = PutHeader( stream, actor); if (ret) { return ret; ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |