Skip to content

Updates for Backpack Rework #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
UndeadZeratul wants to merge 1 commit into from
Closed

Updates for Backpack Rework #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions zscript/HDBulletLib/SpawnHandler.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1;
// const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1;

class HDBulletLibHandler : EventHandler {
// [Ace] Order here must match bitshifting order in menudef and zscript files. - [Ted, UZ]
Expand Down Expand Up @@ -58,22 +58,23 @@ class HDBulletLibHandler : EventHandler {
}
}

override void OnRegister() {
SetOrder(HDCONST_HDBLEVENT);
}
// override void OnRegister() {
// SetOrder(HDCONST_HDBLEVENT);
// }

override void WorldLoaded(worldevent e) {

// Populates the main arrays if they haven't been already.
if (!cvarsAvailable || !AmmoSpawns[0]) init();

for (let i = 0; i < RemovedClasses.size(); i++) {
if (!(AmmoSpawns[i / 32].GetInt() & (1 << (i % 32)))) {
if (hd_debug) console.printf("Removing "..RemovedClasses[i].getClassName().." from Backpack Spawn Pool");
// TODO: Reimplement new Wild Backpack Spawn Pool
// for (let i = 0; i < RemovedClasses.size(); i++) {
// if (!(AmmoSpawns[i / 32].GetInt() & (1 << (i % 32)))) {
// if (hd_debug) console.printf("Removing "..RemovedClasses[i].getClassName().." from Backpack Spawn Pool");

BPSpawnPool.removeItem(RemovedClasses[i]);
}
}
// BPSpawnPool.removeItem(RemovedClasses[i]);
// }
// }
}

override void WorldThingSpawned(WorldEvent e) {
Expand Down