Skip to content

Commit 3ce3ea0

Browse files
committed
effects: fix freeze after second vote
1 parent 1c98ac0 commit 3ce3ea0

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

map_manager_effects.sma

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,7 @@ public mapm_prepare_votelist(type)
115115
// increase freezetime
116116
set_float(FREEZETIME, get_float(FREEZETIME) + get_float(PREPARE_TIME) + get_float(VOTE_TIME) + 1);
117117
} else {
118-
new players[32], pnum; get_players(players, pnum, "a");
119-
for(new id, i; i < pnum; i++) {
120-
id = players[i];
121-
set_pev(id, pev_flags, pev(id, pev_flags) | FL_FROZEN);
122-
}
118+
freeze_unfreeze(0);
123119
}
124120
}
125121
EnableHamForward(g_hHamSpawn);
@@ -144,12 +140,12 @@ public mapm_vote_finished(map[], type, total_votes)
144140
if((type == VOTE_BY_SCHEDULER || type == VOTE_BY_SCHEDULER_SECOND || type == VOTE_BY_RTV) && get_num(VOTE_IN_NEW_ROUND)) {
145141
// decrease freezetime
146142
set_float(FREEZETIME, get_float(FREEZETIME) - get_float(PREPARE_TIME) - get_float(VOTE_TIME) - 1);
147-
} else {
148-
new players[32], pnum; get_players(players, pnum, "a");
149-
for(new id, i; i < pnum; i++) {
150-
id = players[i];
151-
set_pev(id, pev_flags, pev(id, pev_flags) & ~FL_FROZEN);
143+
// TODO: make this better
144+
if(type == VOTE_BY_SCHEDULER_SECOND) {
145+
freeze_unfreeze(1);
152146
}
147+
} else {
148+
freeze_unfreeze(1);
153149
}
154150
}
155151
DisableHamForward(g_hHamSpawn);
@@ -158,6 +154,14 @@ public set_full_black(taskid)
158154
{
159155
set_black_screenfade(1);
160156
}
157+
stock freeze_unfreeze(type)
158+
{
159+
new players[32], pnum; get_players(players, pnum, "a");
160+
for(new id, i; i < pnum; i++) {
161+
id = players[i];
162+
set_pev(id, pev_flags, type ? (pev(id, pev_flags) & ~FL_FROZEN) : pev(id, pev_flags) | FL_FROZEN);
163+
}
164+
}
161165
stock set_black_screenfade(fade)
162166
{
163167
new time, hold, flags;

0 commit comments

Comments
 (0)