forked from Classic-Fortress/server-qwprogs
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1322 from FortressOne/staging
Staging
- Loading branch information
Showing
11 changed files
with
203 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,7 @@ events.qc | |
| roles.qc | ||
| q3defs.qc | ||
| status.qc | ||
| teamplay.qc | ||
| functions.qc | ||
| menu.qc | ||
| csmenu.qc | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| static void Apply(entity* targets, int tcount, int(entity) filter_fn, | ||
| void(entity) apply_fn) { | ||
| for (int i = 0; i < tcount; i++) | ||
| if (filter_fn(targets[i])) | ||
| apply_fn(targets[i]); | ||
| } | ||
|
|
||
| static entity EntityOwner(entity e) { | ||
| if (e.real_owner != world) | ||
| return e.real_owner; | ||
| else | ||
| return e.owner; | ||
| } | ||
|
|
||
| static void ApplyList(entity* targets, int count, | ||
| int(entity) player_filter_fn, void(entity) player_apply_fn, | ||
| int(entity) other_filter_fn, void(entity) other_apply_fn) { | ||
| for (int i = 0; i < count; i++) { | ||
| entity e = targets[i]; | ||
|
|
||
| if (e.classname == "player") { | ||
| if (player_filter_fn(e)) | ||
| player_apply_fn(e); | ||
| } else if (EntityOwner(e).classname == "player") { | ||
| if (other_filter_fn(e)) | ||
| other_apply_fn(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| static void ApplyRadius(vector org, float rad, | ||
| int(entity) player_filter_fn, void(entity) player_apply_fn, | ||
| int(entity) other_filter_fn, void(entity) other_apply_fn) { | ||
| int count; | ||
| entity* ents = findradius_list(org, rad, count); | ||
| ApplyList(ents, count, | ||
| player_filter_fn, player_apply_fn, other_filter_fn, other_apply_fn); | ||
| } | ||
|
|
||
| void RemovePrimedGrenades(entity player); | ||
|
|
||
| /* Disabled new-balance remove chaser ammo mechanic | ||
| static void EffStrip(entity player) { | ||
| player.ammo_cells = 0; | ||
| player.ammo_rockets = 0; | ||
| player.ammo_shells = 0; | ||
| player.ammo_nails = 0; | ||
|
|
||
| player.no_grenades_1 = player.no_grenades_2 = 0; | ||
| player.current_slot = player.queue_slot = MakeSlot(4); | ||
|
|
||
| RemovePrimedGrenades(player); | ||
|
|
||
| string msg = "The enemy captured! You are afflicted by the Curse of Isma!"; | ||
| stuffcmd(player, "bf\n"); | ||
| sprint(player, PRINT_HIGH, msg, "\n"); | ||
| centerprint(player, msg); | ||
| }*/ | ||
|
|
||
| float IsEngEnt(entity ent); | ||
| void RemoveEngEnt(entity bld, float explode); | ||
|
|
||
| static void EffRemove(entity non_player) { | ||
| if (non_player.classname == "player") { | ||
| printf("ERROR! Tried to remove player [%s]\n", non_player.netname); | ||
| return; | ||
| } | ||
|
|
||
| pointparticles(particleeffectnum("fo_airblast"), non_player.origin); | ||
| if (IsEngEnt(non_player)) | ||
| RemoveEngEnt(non_player, FALSE); | ||
| else | ||
| dremove(non_player); | ||
| } | ||
|
|
||
| static int(entity p) FilTeamEQ[] = { | ||
| { return p.team_no == 1; }, | ||
| { return p.team_no == 2; }, | ||
| { return p.team_no == 3; }, | ||
| { return p.team_no == 4; }, | ||
| }; | ||
|
|
||
| static int(entity p) FilTeamNEQ[] = { | ||
| { return p.team_no != 1; }, | ||
| { return p.team_no != 2; }, | ||
| { return p.team_no != 3; }, | ||
| { return p.team_no != 4; }, | ||
| }; | ||
|
|
||
| static int(entity p) FilOwnerTeamNEQ[] = { | ||
| { return EntityOwner(p).team_no != 1; }, | ||
| { return EntityOwner(p).team_no != 2; }, | ||
| { return EntityOwner(p).team_no != 3; }, | ||
| { return EntityOwner(p).team_no != 4; }, | ||
| }; | ||
|
|
||
| void TeamPlay_Cap(vector origin, entity player) { | ||
| if (!org_game || !new_balance) | ||
| return; | ||
|
|
||
| //ApplyRadius(origin, 1500, | ||
| // FilTeamNEQ[player.team_no - 1], EffStrip, | ||
| // FilOwnerTeamNEQ[player.team_no - 1], EffRemove); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters