mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9585] Restore lost return in prev. commit.

Browse source
This commit is contained in:
VladimirMangos 2010-03-15 14:52:50 +03:00
parent 6bfa8d81c6
commit 703f9dd72a
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/Group.cpp
View file

@ -760,11 +760,10 @@ bool Group::CountRollVote(ObjectGuid const& playerGUID, Rolls::iterator& rollI,
//called when roll timer expires //called when roll timer expires
void Group::EndRoll() void Group::EndRoll()
{ {
Rolls::iterator itr;
while(!RollId.empty()) while(!RollId.empty())
{ {
//need more testing here, if rolls disappear //need more testing here, if rolls disappear
itr = RollId.begin(); Rolls::iterator itr = RollId.begin();
CountTheRoll(itr); //i don't have to edit player votes, who didn't vote ... he will pass CountTheRoll(itr); //i don't have to edit player votes, who didn't vote ... he will pass
} }
} }
@ -776,7 +775,9 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
{ {
rollI = RollId.erase(rollI); rollI = RollId.erase(rollI);
delete roll; delete roll;
return;
} }
//end of the roll //end of the roll
if (roll->totalNeed > 0) if (roll->totalNeed > 0)
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9584" #define REVISION_NR "9585"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__