[Gemrb-commits] gemrb: branch master updated. v0.6.2-362-g9b30a0b

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  9b30a0b42ff1cdd4cf26f804303ba7d3d8f4ab3d (commit)
       via  183eeafb0a50dda19d414580bd38e1720f06aa7f (commit)

Summary of changes:
 gemrb/core/Spellbook.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
      from  feb9cc9d35d05eac4e81a5868dab159692017f54 (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=9b30a0b42ff1cdd4cf26f804303ba7d3d8f4ab3d

commit 9b30a0b42ff1cdd4cf26f804303ba7d3d8f4ab3d
Merge: 183eeaf feb9cc9
Author: Avenger <ave...@so...>
Date:   Thu Nov 4 19:23:13 2010 +0100

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=183eeafb0a50dda19d414580bd38e1720f06aa7f

commit 183eeafb0a50dda19d414580bd38e1720f06aa7f
Author: Avenger <ave...@so...>
Date:   Thu Nov 4 19:22:11 2010 +0100

    fixed compilation with msvc6

diff --git a/gemrb/core/Spellbook.cpp b/gemrb/core/Spellbook.cpp
index f473ffc..8939a26 100644
--- a/gemrb/core/Spellbook.cpp
+++ b/gemrb/core/Spellbook.cpp
@@ -75,7 +75,7 @@ Spellbook::~Spellbook()
 			}
 		}
 	}
-	ClearSpellInfo(); 
+	ClearSpellInfo();
 	delete [] spells;
 }
 
@@ -103,6 +103,7 @@ void Spellbook::CopyFrom(const Actor *source)
 
 	for (int t = 0; t < NUM_BOOK_TYPES; t++) {
 		for (size_t i = 0; i < wikipedia.spells[t].size(); i++) {
+			unsigned int k;
 			CRESpellMemorization *wm = wikipedia.spells[t][i];
 			CRESpellMemorization *sm = new CRESpellMemorization();
 			spells[t].push_back(sm);
@@ -110,12 +111,12 @@ void Spellbook::CopyFrom(const Actor *source)
 			sm->Number = wm->Number;
 			sm->Number2 = wm->Number2;
 			sm->Type = wm->Type;
-			for (unsigned int k = 0; k < wm->known_spells.size(); k++) {
+			for (k = 0; k < wm->known_spells.size(); k++) {
 				CREKnownSpell *tmp_known = new CREKnownSpell();
 				sm->known_spells.push_back(tmp_known);
 				memcpy(tmp_known, wm->known_spells[k], sizeof(CREKnownSpell));
 			}
-			for (unsigned int k = 0; k < wm->memorized_spells.size(); k++) {
+			for (k = 0; k < wm->memorized_spells.size(); k++) {
 				CREMemorizedSpell *tmp_mem = new CREMemorizedSpell();
 				sm->memorized_spells.push_back(tmp_mem);
 				memcpy(tmp_mem, wm->memorized_spells[k], sizeof(CREMemorizedSpell));
@@ -699,11 +700,11 @@ void Spellbook::CreateSorcererMemory(int type)
 			delete sm->memorized_spells[cnt];
 		}
 		sm->memorized_spells.clear();
-		for (unsigned int k = 0;  k < sm->known_spells.size(); k++) {
+		for (unsigned int k = 0; k < sm->known_spells.size(); k++) {
 			CREKnownSpell *ck = sm->known_spells[k];
 			cnt = sm->Number2;
 			while(cnt--) {
-			  MemorizeSpell(ck, true);
+				MemorizeSpell(ck, true);
 			}
 		}
 	}

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator