Skip to content

Commit 91adcaa

Browse files
committed
SERVER: Remove 'location', update Lockdown description, make collect perks using ent_classname, remove voice line initialization & don't randomize perks on game start
1 parent 5bc1f62 commit 91adcaa

3 files changed

Lines changed: 5 additions & 15 deletions

File tree

source/client/main.qc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ noref void() CSQC_Parse_Event =
13971397
break;
13981398
case GAMEMODE_LOCKDOWN:
13991399
chaptertitle = "LOCKDOWN";
1400-
location = "Don't open the damn door!";
1400+
location = "";
14011401
date = "";
14021402
person = "";
14031403
break;

source/menu/menu_gset.qc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void() Menu_GameSettings =
115115
case 4: gamemode_description = "Ole Fashioned stand-off between you and the Dead."; gamemode_string = "WILD WEST"; break;
116116
case 5: gamemode_description = "Knives-and-Nades only. Grenades Explode on Contact."; gamemode_string = "STICKS & STONES"; break;
117117
case 6: gamemode_description = "The cycle continues. Old meets new in this Cold War inspired mode!"; gamemode_string = "FEVER"; break;
118-
case 7: gamemode_description = "No Escape. Survive as Long as Possible."; gamemode_string = "LOCKDOWN"; break;
118+
case 7: gamemode_description = "No Escape. Survive as long as possible in the Starting Area."; gamemode_string = "LOCKDOWN"; break;
119119
default: gamemode_description = "???"; break;
120120
}
121121
Menu_Button(1, "ge_mode", "GAME MODE", gamemode_description) ? Menu_GameSettings_ApplyGameMode() : 0;

source/server/gamemodes/lockdown.qc

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ entity lock_perks[32];
3232
vector lock_positions[32];
3333
vector lock_angs[32];
3434

35-
float(float count, string cvar) Gamemode_Lockdown_CollectPerks =
35+
float(float count, string ent_classname) Gamemode_Lockdown_CollectPerks =
3636
{
3737
entity e;
3838

39-
e = find(world, classname, cvar);
39+
e = find(world, classname, ent_classname);
4040
while (e != world) {
4141
lock_perks[count] = e;
4242
lock_positions[count] = e.origin;
4343
lock_angs[count] = e.angles;
4444
count = count + 1;
4545

46-
e = find(e, classname, cvar);
46+
e = find(e, classname, ent_classname);
4747
}
4848

4949
return count;
@@ -151,14 +151,6 @@ void() Gamemode_Lockdown_Init =
151151

152152
// precache audio
153153
precache_sound("sounds/modes/lockdown/intro.wav");
154-
precache_sound("sounds/modes/lockdown/carpenter.wav");
155-
precache_sound("sounds/modes/lockdown/double_points.wav");
156-
precache_sound("sounds/modes/lockdown/free_perk.wav");
157-
precache_sound("sounds/modes/lockdown/insta_kill.wav");
158-
precache_sound("sounds/modes/lockdown/kaboom.wav");
159-
precache_sound("sounds/modes/lockdown/maxammo.wav");
160-
precache_sound("sounds/modes/lockdown/random_weapon.wav");
161-
precache_sound("sounds/modes/lockdown/upgrade.wav");
162154
precache_sound("sounds/modes/lockdown/lose.wav");
163155
};
164156

@@ -168,8 +160,6 @@ void() Gamemode_Lockdown_Frame =
168160
if (lock_ran_post_init_logic == false) {
169161
// Play intro voiceline
170162
Sound_PlaySound(world, "sounds/modes/lockdown/intro.wav", SOUND_TYPE_ENV_VOICE, SOUND_PRIORITY_PLAYALWAYS);
171-
// Randomize perk locations
172-
Gamemode_Lockdown_RandomizePerkLocations();
173163

174164
lock_ran_post_init_logic = true;
175165
}

0 commit comments

Comments
 (0)