Skip to content

Commit 8321c7e

Browse files
viciiousviciious
committed
Follow up to the recent renaming of quick menu to overlay menu in the engine
1 parent d7bd7e5 commit 8321c7e

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎gametypes/bomb/main.as‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void setTeamProgress( int teamNum, int progress )
141141
}
142142
}
143143

144-
void BOMB_SetVoicecommQuickMenu( Client @client )
144+
void BOMB_SetVoicecommOverlayMenu( Client @client )
145145
{
146146
String menuStr = '';
147147

@@ -168,7 +168,7 @@ void BOMB_SetVoicecommQuickMenu( Client @client )
168168
'"Affirmative" "vsay_team affirmative" ' +
169169
'"Negative" "vsay_team negative" ';
170170

171-
GENERIC_SetQuickMenu( @client, menuStr );
171+
GENERIC_SetOverlayMenu( @client, menuStr );
172172
}
173173

174174
bool GT_Command( Client @client, const String &cmdString, const String &argsString, int argc )
@@ -633,11 +633,11 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
633633
if ( ent.isGhosting() )
634634
{
635635
ent.svflags &= ~SVF_FORCETEAM;
636-
GENERIC_ClearQuickMenu( @client );
636+
GENERIC_ClearOverlayMenu( @client );
637637
return;
638638
}
639639

640-
BOMB_SetVoicecommQuickMenu( @client );
640+
BOMB_SetVoicecommOverlayMenu( @client );
641641

642642
player.giveInventory();
643643

‎gametypes/ctf/ctf_main.as‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void CTF_playerKilled( Entity @target, Entity @attacker, Entity @inflictor )
135135
award_playerKilled( @target, @attacker, @inflictor );
136136
}
137137

138-
void CTF_SetVoicecommQuickMenu( Client @client )
138+
void CTF_SetVoicecommOverlayMenu( Client @client )
139139
{
140140
String menuStr = '';
141141

@@ -150,7 +150,7 @@ void CTF_SetVoicecommQuickMenu( Client @client )
150150
'"On offense" "vsay_team onoffense" ' +
151151
'"On defense" "vsay_team ondefense" ';
152152

153-
GENERIC_SetQuickMenu( @client, menuStr );
153+
GENERIC_SetOverlayMenu( @client, menuStr );
154154
}
155155

156156
///*****************************************************************
@@ -494,7 +494,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
494494

495495
if ( ent.isGhosting() )
496496
{
497-
GENERIC_ClearQuickMenu( @client );
497+
GENERIC_ClearOverlayMenu( @client );
498498
ent.svflags &= ~SVF_FORCETEAM;
499499
return;
500500
}
@@ -546,7 +546,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
546546

547547
ent.svflags |= SVF_FORCETEAM;
548548

549-
CTF_SetVoicecommQuickMenu( @client );
549+
CTF_SetVoicecommOverlayMenu( @client );
550550

551551
// add a teleportation effect
552552
ent.respawnEffect();

‎gametypes/ctftactics/ctf_main.as‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void CTF_playerKilled( Entity @target, Entity @attacker, Entity @inflictor )
129129
award_playerKilled( @target, @attacker, @inflictor );
130130
}
131131

132-
void CTF_SetVoicecommQuickMenu( Client @client, int playerClass )
132+
void CTF_SetVoicecommOverlayMenu( Client @client, int playerClass )
133133
{
134134
String menuStr = '';
135135

@@ -163,7 +163,7 @@ void CTF_SetVoicecommQuickMenu( Client @client, int playerClass )
163163
'"On offense" "vsay_team onoffense" ' +
164164
'"On defense" "vsay_team ondefense" ';
165165

166-
GENERIC_SetQuickMenu( @client, menuStr );
166+
GENERIC_SetOverlayMenu( @client, menuStr );
167167
}
168168

169169
///*****************************************************************
@@ -1213,7 +1213,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
12131213

12141214
ent.svflags |= SVF_FORCETEAM;
12151215

1216-
CTF_SetVoicecommQuickMenu( @client, player.playerClass.tag );
1216+
CTF_SetVoicecommOverlayMenu( @client, player.playerClass.tag );
12171217

12181218
// add a teleportation effect
12191219
ent.respawnEffect();

‎gametypes/generic/matchstates.as‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void GENERIC_SetUpWarmup()
3838
team.clearInvites();
3939

4040
for ( j = 0; @team.ent( j ) != null; j++ )
41-
GENERIC_ClearQuickMenu( @team.ent( j ).client );
41+
GENERIC_ClearOverlayMenu( @team.ent( j ).client );
4242

4343
if ( team.unlock() )
4444
anyone = true;
@@ -53,7 +53,7 @@ void GENERIC_SetUpWarmup()
5353
team.clearInvites();
5454

5555
for ( j = 0; @team.ent( j ) != null; j++ )
56-
GENERIC_ClearQuickMenu( @team.ent( j ).client );
56+
GENERIC_ClearOverlayMenu( @team.ent( j ).client );
5757

5858
if ( team.unlock() )
5959
G_PrintMsg( null, "Teams unlocked.\n" );
@@ -158,7 +158,7 @@ void GENERIC_SetUpEndMatch()
158158

159159
if ( client.state() >= CS_SPAWNED ) {
160160
client.respawn( true ); // ghost them all
161-
GENERIC_SetPostmatchQuickMenu( @client );
161+
GENERIC_SetPostmatchOverlayMenu( @client );
162162
}
163163
}
164164

‎gametypes/generic/quickmenu.as‎ renamed to ‎gametypes/generic/overlaymenu.as‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ along with this program; if not, write to the Free Software
1717
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*/
1919

20-
void GENERIC_ClearQuickMenu( Client @client )
20+
void GENERIC_ClearOverlayMenu( Client @client )
2121
{
22-
client.setQuickMenuItems( "" );
22+
client.setOverlayMenuItems( "" );
2323
}
2424

25-
void GENERIC_SetQuickMenu( Client @client, const String &menuStr )
25+
void GENERIC_SetOverlayMenu( Client @client, const String &menuStr )
2626
{
27-
client.setQuickMenuItems( menuStr );
27+
client.setOverlayMenuItems( menuStr );
2828
}
2929

30-
void GENERIC_SetPostmatchQuickMenu( Client @client )
30+
void GENERIC_SetPostmatchOverlayMenu( Client @client )
3131
{
32-
GENERIC_SetQuickMenu( @client, '"Good game" "vsay goodgame" "Thanks" "vsay thanks" "Yeehaa" "vsay yeehaa" "Oops" "vsay oops" "Sorry" "vsay sorry"' );
32+
GENERIC_SetOverlayMenu( @client, '"Good game" "vsay goodgame" "Thanks" "vsay thanks" "Yeehaa" "vsay yeehaa" "Oops" "vsay oops" "Sorry" "vsay sorry"' );
3333
}
3434

‎gametypes/race.as‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class Player
319319
return !this.inRace && !this.practicing && !this.postRace && this.client.team != TEAM_SPECTATOR;
320320
}
321321

322-
void setQuickMenu()
322+
void setOverlayMenu()
323323
{
324324
String s = '';
325325
Position @position = this.savedPosition();
@@ -354,7 +354,7 @@ class Player
354354
menuItems[MI_CLEAR_POSITION];
355355
}
356356

357-
GENERIC_SetQuickMenu( this.client, s );
357+
GENERIC_SetOverlayMenu( this.client, s );
358358
}
359359

360360
bool toggleNoclip()
@@ -387,7 +387,7 @@ class Player
387387

388388
G_PrintMsg( ent, msg + "\n" );
389389

390-
this.setQuickMenu();
390+
this.setOverlayMenu();
391391

392392
return true;
393393
}
@@ -493,7 +493,7 @@ class Player
493493
}
494494
position.weapon = ent.moveType == MOVETYPE_NOCLIP ? this.noclipWeapon : ref.weapon;
495495
}
496-
this.setQuickMenu();
496+
this.setOverlayMenu();
497497

498498
return true;
499499
}
@@ -507,7 +507,7 @@ class Player
507507
}
508508

509509
this.savedPosition().clear();
510-
this.setQuickMenu();
510+
this.setOverlayMenu();
511511

512512
return true;
513513
}
@@ -533,7 +533,7 @@ class Player
533533

534534
this.client.newRaceRun( numCheckpoints );
535535

536-
this.setQuickMenu();
536+
this.setOverlayMenu();
537537

538538
return true;
539539
}
@@ -745,7 +745,7 @@ class Player
745745
this.practicing = true;
746746
G_CenterPrintMsg( this.client.getEnt(), S_COLOR_CYAN + "Entered practice mode" );
747747
this.cancelRace();
748-
this.setQuickMenu();
748+
this.setOverlayMenu();
749749
}
750750

751751
void leavePracticeMode()
@@ -757,7 +757,7 @@ class Player
757757
G_CenterPrintMsg( this.client.getEnt(), S_COLOR_CYAN + "Left practice mode" );
758758
if ( this.client.team != TEAM_SPECTATOR )
759759
this.client.respawn( false );
760-
this.setQuickMenu();
760+
this.setOverlayMenu();
761761
}
762762

763763
void togglePracticeMode()
@@ -1502,7 +1502,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
15021502
Player @player = RACE_GetPlayer( ent.client );
15031503
player.cancelRace();
15041504

1505-
player.setQuickMenu();
1505+
player.setOverlayMenu();
15061506

15071507
if ( ent.isGhosting() )
15081508
return;

‎gametypes/tdm.as‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void TDM_playerKilled( Entity @target, Entity @attacker, Entity @inflictor )
9292
award_playerKilled( @target, @attacker, @inflictor );
9393
}
9494

95-
void TDM_SetVoicecommQuickMenu( Client @client )
95+
void TDM_SetVoicecommOverlayMenu( Client @client )
9696
{
9797
String menuStr = '';
9898

@@ -108,7 +108,7 @@ void TDM_SetVoicecommQuickMenu( Client @client )
108108
'"On offense" "vsay_team onoffense" ' +
109109
'"On defense" "vsay_team ondefense" ';
110110

111-
GENERIC_SetQuickMenu( @client, menuStr );
111+
GENERIC_SetOverlayMenu( @client, menuStr );
112112
}
113113

114114
///*****************************************************************
@@ -314,7 +314,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
314314

315315
if ( ent.isGhosting() )
316316
{
317-
GENERIC_ClearQuickMenu( @client );
317+
GENERIC_ClearOverlayMenu( @client );
318318
ent.svflags &= ~SVF_FORCETEAM;
319319
return;
320320
}
@@ -367,7 +367,7 @@ void GT_PlayerRespawn( Entity @ent, int old_team, int new_team )
367367

368368
ent.svflags |= SVF_FORCETEAM;
369369

370-
TDM_SetVoicecommQuickMenu( @client );
370+
TDM_SetVoicecommOverlayMenu( @client );
371371

372372
// add a teleportation effect
373373
ent.respawnEffect();

0 commit comments

Comments
 (0)