X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmapvoting.qc;h=acac831d76a181940782c1b074d7b5e0ef0b3d61;hp=5c564d56db45fc7baeabeb9c6fd22240cc4263df;hb=840a3cad2a75d127e89dcaf3b2fa9146090240d3;hpb=070ebb9d95214bf817392d9286608c812a2a7bd9 diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index 5c564d56db..acac831d76 100644 --- a/qcsrc/server/mapvoting.qc +++ b/qcsrc/server/mapvoting.qc @@ -525,7 +525,7 @@ bool MapVote_CheckRules_2() } } firstPlaceVotes = RandomSelection_best_priority; - if ( autocvar_sv_vote_gametype_default_current && currentVotes == firstPlaceVotes ) + if ( autocvar_sv_vote_gametype_default_current && firstPlaceVotes == 0 ) firstPlace = currentPlace; else firstPlace = RandomSelection_chosen_float; @@ -591,9 +591,9 @@ void MapVote_Tick() int totalvotes = 0; FOREACH_CLIENT(IS_REAL_CLIENT(it), { // hide scoreboard again - if(GetResourceAmount(it, RESOURCE_HEALTH) != 2342) + if(GetResource(it, RES_HEALTH) != 2342) { - SetResourceAmountExplicit(it, RESOURCE_HEALTH, 2342); + SetResourceExplicit(it, RES_HEALTH, 2342); CS(it).impulse = 0; msg_entity = it;