From: Anders R. <ma...@us...> - 2003-09-28 19:20:40
|
Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects In directory sc8-pr-cvs1:/tmp/cvs-serv8878/src/server/bulkobjects Modified Files: psspell.cpp psspell.h Log Message: - Added message from server telling when you try to use not purified glyphs to cast a spell. Index: psspell.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psspell.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** psspell.cpp 1 Sep 2003 04:23:06 -0000 1.15 --- psspell.cpp 28 Sep 2003 19:20:06 -0000 1.16 *************** *** 95,100 **** } ! bool psSpell::HaveGlyphsToCast(psGlyphList * glyphs) { for (int i = 0; i < glyphList.Length(); i++) { --- 95,101 ---- } ! bool psSpell::HaveGlyphsToCast(psGlyphList * glyphs, bool& notPurified) { + notPurified = false; for (int i = 0; i < glyphList.Length(); i++) { *************** *** 106,112 **** if (glyph) { ! if (glyph->GetBaseStats() == glyphList[i] && glyph->Purified()) { ! found = true; } } --- 107,120 ---- if (glyph) { ! if (glyph->GetBaseStats() == glyphList[i]) { ! if (glyph->Purified()) ! { ! found = true; ! notPurified = false; ! } else ! { ! notPurified = true; ! } } } *************** *** 114,118 **** } while (!found && j < GLYPH_LIST_MAX_SLOTS); - // No glyph found return false if (!found) return false; --- 122,125 ---- *************** *** 125,131 **** { // Check if needed glyphs are available ! if (!HaveGlyphsToCast(caster->GetCharacterData()->GetGlyphList())) { ! castingText->Format("You don't have the glyphs to cast %s.",name.GetData()); return false; } --- 132,142 ---- { // Check if needed glyphs are available ! bool notPurified; ! if (!HaveGlyphsToCast(caster->GetCharacterData()->GetGlyphList(),notPurified)) { ! if (notPurified) ! castingText->Format("Some glyphs are not purified to cast %s.",name.GetData()); ! else ! castingText->Format("You don't have the glyphs to cast %s.",name.GetData()); return false; } Index: psspell.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psspell.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** psspell.h 1 Sep 2003 04:23:06 -0000 1.10 --- psspell.h 28 Sep 2003 19:20:06 -0000 1.11 *************** *** 55,59 **** bool MatchGlyphs(csArray<psGlyph*> & glyphs); ! bool HaveGlyphsToCast(psGlyphList * glyphs); bool Cast(gemActor * caster, gemObject * target, csString * castingEffect, csString * castingText); --- 55,59 ---- bool MatchGlyphs(csArray<psGlyph*> & glyphs); ! bool HaveGlyphsToCast(psGlyphList * glyphs, bool& notPurified); bool Cast(gemActor * caster, gemObject * target, csString * castingEffect, csString * castingText); |