From: Laszlo T. <ave...@us...> - 2004-08-30 21:35:56
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32526 Modified Files: Spellbook.h Spellbook.cpp Log Message: fixed warnings in spellbook Index: Spellbook.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Spellbook.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Spellbook.h 29 Aug 2004 21:25:36 -0000 1.6 --- Spellbook.h 30 Aug 2004 21:35:45 -0000 1.7 *************** *** 97,104 **** //int AddMemorizedSpell(CREMemorizedSpell* spell); ! unsigned int GetKnownSpellsCount(int type, int level); ! CREKnownSpell* GetKnownSpell(int type, int level, int index); ! unsigned int GetMemorizedSpellsCount(int type, int level); ! CREMemorizedSpell* GetMemorizedSpell(int type, int level, int index); --- 97,104 ---- //int AddMemorizedSpell(CREMemorizedSpell* spell); ! unsigned int GetKnownSpellsCount(int type, unsigned int level); ! CREKnownSpell* GetKnownSpell(int type, unsigned int level, unsigned int index); ! unsigned int GetMemorizedSpellsCount(int type, unsigned int level); ! CREMemorizedSpell* GetMemorizedSpell(int type, unsigned int level, unsigned int index); Index: Spellbook.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Spellbook.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Spellbook.cpp 29 Aug 2004 21:25:36 -0000 1.13 --- Spellbook.cpp 30 Aug 2004 21:35:45 -0000 1.14 *************** *** 96,100 **** } ! unsigned int Spellbook::GetKnownSpellsCount(int type, int level) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size()) --- 96,100 ---- } ! unsigned int Spellbook::GetKnownSpellsCount(int type, unsigned int level) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size()) *************** *** 103,107 **** } ! CREKnownSpell* Spellbook::GetKnownSpell(int type, int level, int index) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size() || index >= spells[type][level]->known_spells.size()) --- 103,107 ---- } ! CREKnownSpell* Spellbook::GetKnownSpell(int type, unsigned int level, unsigned int index) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size() || index >= spells[type][level]->known_spells.size()) *************** *** 110,114 **** } ! unsigned int Spellbook::GetMemorizedSpellsCount(int type, int level) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size()) --- 110,114 ---- } ! unsigned int Spellbook::GetMemorizedSpellsCount(int type, unsigned int level) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size()) *************** *** 117,121 **** } ! CREMemorizedSpell* Spellbook::GetMemorizedSpell(int type, int level, int index) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size() || index >= spells[type][level]->memorized_spells.size()) --- 117,121 ---- } ! CREMemorizedSpell* Spellbook::GetMemorizedSpell(int type, unsigned int level, unsigned int index) { if (type >= NUM_SPELL_TYPES || level >= spells[type].size() || index >= spells[type][level]->memorized_spells.size()) |