Skip to content
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

Jump to bottom

fix bad map id momentarily being sent when hitting panic button in tclient #150

Merged
merged 5 commits into from
Jun 8, 2024
Merged

fix bad map id momentarily being sent when hitting panic button in tclient #150

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6165528
attempt at fixing bad map id when hitting panic button in tclient
ILW8 May 26, 2024
358c912
delay committing map data update when map changes
ILW8 Jun 8, 2024
6d53cd5
revert extraneous logging
ILW8 Jun 8, 2024
9e77cb6
fix bad copy-paste
ILW8 Jun 8, 2024
fa46c08
move stuff back to where they were previously
ILW8 Jun 8, 2024
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
35 changes: 29 additions & 6 deletions packages/tosu/src/entities/MenuData/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { wLogger } from '@tosu/common';

import { AbstractEntity } from '@/entities/AbstractEntity';

// delay in milliseconds. 500ms has been enough to eliminate spurious map ID changes in the tournament client
// over two weeks of testing at 4WC
const NEW_MAP_COMMIT_DELAY = 500;

export class MenuData extends AbstractEntity {
Status: number;
MenuGameMode: number;
Expand Down Expand Up @@ -29,6 +33,8 @@ export class MenuData extends AbstractEntity {
MP3Length: number;

previousMD5: string = '';
pendingMD5: string = '';
mapChangeTime: number = 0;

updateState() {
try {
Expand All @@ -44,21 +50,39 @@ export class MenuData extends AbstractEntity {
wLogger.debug('MD(updateState) beatmapAddr is 0');
return;
}

// [[Beatmap] + 0x6C]
this.MD5 = process.readSharpString(
const newMD5 = process.readSharpString(
process.readInt(beatmapAddr + 0x6c)
);

// [[Beatmap] + 0x90]
this.Path = process.readSharpString(
const newPath = process.readSharpString(
process.readInt(beatmapAddr + 0x90)
);
// [Base - 0x33]
this.MenuGameMode = process.readPointer(baseAddr - 0x33);

if (this.MD5 === this.previousMD5 || !this.Path.endsWith('.osu')) {
if (newMD5 === this.previousMD5 || !newPath.endsWith('.osu')) {
return;
}

if (this.pendingMD5 !== newMD5) {
this.mapChangeTime = performance.now();
this.pendingMD5 = newMD5;

return;
}

if (performance.now() - this.mapChangeTime < NEW_MAP_COMMIT_DELAY) {
return;
}

// MD5 hasn't changed in over NEW_MAP_COMMIT_DELAY, commit to new map
this.MD5 = newMD5;
this.Path = newPath;

// [Base - 0x33]
this.MenuGameMode = process.readPointer(baseAddr - 0x33);

// [Base - 0x33] + 0xC
this.Plays = process.readInt(
process.readInt(baseAddr - 0x33) + 0xc
Expand Down Expand Up @@ -96,7 +120,6 @@ export class MenuData extends AbstractEntity {
this.BackgroundFilename = process.readSharpString(
process.readInt(beatmapAddr + 0x68)
);
// this.BackgroundFilename = "";
// [[Beatmap] + 0x78]
this.Folder = process.readSharpString(
process.readInt(beatmapAddr + 0x78)
Expand Down
Loading