Skip to content
This repository was archived by the owner on Oct 30, 2019. It is now read-only.

Commit 2dbbb5c

Browse files
CleversonCleverson
authored andcommitted
fixed a small issue with votemap list
Remove ready list when votemap/team start to avoid a hudmessage bug
1 parent 78b05d9 commit 2dbbb5c

File tree

1 file changed

+39
-42
lines changed

1 file changed

+39
-42
lines changed

addons/amxmodx/scripting/PugReady.sma

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
#define TASK_AUTO 1901
1414

1515
new bool:g_bReadySystem;
16-
new g_bReady[MAX_PLAYERS+1];
16+
new bool:g_bReady[MAX_PLAYERS+1];
1717

1818
new g_pAutoReadyTime;
1919
new g_pAutoReadyKick;
20-
2120
new g_pAutoStartHalf;
2221

2322
new g_pPlayersMin;
@@ -148,6 +147,7 @@ fnReadySystem(bool:bActive)
148147
}
149148
else
150149
{
150+
fnDisplay(0.0);
151151
arrayset(g_bReady,0,sizeof(g_bReady));
152152
client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_ALL_READY");
153153
}
@@ -163,51 +163,48 @@ public fnKeepMenu()
163163

164164
fnDisplay(Float:fHoldTime)
165165
{
166-
if(g_bReadySystem)
166+
new iPlayers[MAX_PLAYERS],iNum,iPlayer;
167+
get_players(iPlayers,iNum,"ch");
168+
169+
new iPlayersNum,iReadys;
170+
new sList[2][512],sName[MAX_NAME_LENGTH];
171+
172+
for(new i;i < iNum;i++)
167173
{
168-
new iPlayers[MAX_PLAYERS],iNum,iPlayer;
169-
get_players(iPlayers,iNum,"ch");
174+
iPlayer = iPlayers[i];
170175

171-
new iPlayersNum,iReadys;
172-
new sList[2][512],sName[MAX_NAME_LENGTH];
173-
174-
for(new i;i < iNum;i++)
176+
if(!PugIsTeam(iPlayer))
175177
{
176-
iPlayer = iPlayers[i];
177-
178-
if(!PugIsTeam(iPlayer))
179-
{
180-
continue;
181-
}
182-
183-
iPlayersNum++;
184-
get_user_name(iPlayer,sName,charsmax(sName));
185-
186-
if(g_bReady[iPlayer])
187-
{
188-
iReadys++;
189-
formatex(sList[0],charsmax(sList[]),"%s%s^n",sList[0],sName);
190-
}
191-
else
192-
{
193-
formatex(sList[1],charsmax(sList[]),"%s%s^n",sList[1],sName);
194-
}
178+
continue;
195179
}
196-
197-
new iMinPlayers = get_pcvar_num(g_pPlayersMin);
198-
199-
set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);
200-
show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);
201-
202-
set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);
203-
show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);
204-
205-
set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);
206-
show_hudmessage(0,"^n%s",sList[0]);
207180

208-
set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);
209-
show_hudmessage(0,"^n%s",sList[1]);
181+
iPlayersNum++;
182+
get_user_name(iPlayer,sName,charsmax(sName));
183+
184+
if(g_bReady[iPlayer])
185+
{
186+
iReadys++;
187+
formatex(sList[0],charsmax(sList[]),"%s%s^n",sList[0],sName);
188+
}
189+
else
190+
{
191+
formatex(sList[1],charsmax(sList[]),"%s%s^n",sList[1],sName);
192+
}
210193
}
194+
195+
new iMinPlayers = get_pcvar_num(g_pPlayersMin);
196+
197+
set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);
198+
show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);
199+
200+
set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);
201+
show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);
202+
203+
set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);
204+
show_hudmessage(0,"^n%s",sList[0]);
205+
206+
set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);
207+
show_hudmessage(0,"^n%s",sList[1]);
211208
}
212209

213210
public fnReadyUp(id)
@@ -371,7 +368,7 @@ public fnReadyTimeOut(id)
371368
{
372369
new iReadyTime = get_pcvar_num(g_pAutoReadyTime);
373370

374-
new sTime[MAX_STRING_LENGTH];
371+
new sTime[64];
375372
get_time_length
376373
(
377374
id,

0 commit comments

Comments
 (0)