From 2721da03b794c1a6af754ad40ce619a88926b413 Mon Sep 17 00:00:00 2001 From: Dank074 Date: Sun, 9 May 2021 02:17:20 -0500 Subject: [PATCH] _Str_1577 -> objectId --- src/nitro/session/IRoomSession.ts | 2 +- src/nitro/session/RoomSession.ts | 4 ++-- src/nitro/session/events/RoomSessionPetPackageEvent.ts | 2 +- src/room/renderer/RoomSpriteCanvas.ts | 2 +- src/room/renderer/cache/RoomObjectCache.ts | 4 ++-- src/room/renderer/cache/RoomObjectCacheItem.ts | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/nitro/session/IRoomSession.ts b/src/nitro/session/IRoomSession.ts index 6a8116a6..20341709 100644 --- a/src/nitro/session/IRoomSession.ts +++ b/src/nitro/session/IRoomSession.ts @@ -5,7 +5,7 @@ import { UserDataManager } from './UserDataManager'; export interface IRoomSession extends IDisposable { - openGift(_Str_1577: number): void; + openGift(objectId: number): void; setConnection(connection: IConnection): void; setControllerLevel(level: number): void; setOwnRoomIndex(roomIndex: number): void; diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 61d43077..87239c33 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -257,9 +257,9 @@ export class RoomSession extends Disposable implements IRoomSession this._connection.send(new MoodlightSettingsComposer()); } - public openGift(_Str_1577: number): void + public openGift(objectId: number): void { - this._connection.send(new OpenPresentComposer(_Str_1577)); + this._connection.send(new OpenPresentComposer(objectId)); } public get connection(): IConnection diff --git a/src/nitro/session/events/RoomSessionPetPackageEvent.ts b/src/nitro/session/events/RoomSessionPetPackageEvent.ts index 845f19d6..72f06e43 100644 --- a/src/nitro/session/events/RoomSessionPetPackageEvent.ts +++ b/src/nitro/session/events/RoomSessionPetPackageEvent.ts @@ -21,7 +21,7 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent this._nameValidationInfo = _arg_6; } - public get _Str_1577(): number + public get objectId(): number { return this._objectId; } diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index 1cce93c6..28021979 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -429,7 +429,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas } const cache = this.getCacheItem(identifier); - cache._Str_1577 = object.instanceId; + cache.objectId = object.instanceId; const locationCache = cache.location; const sortableCache = cache.sprites; diff --git a/src/room/renderer/cache/RoomObjectCache.ts b/src/room/renderer/cache/RoomObjectCache.ts index 66af0995..c080769c 100644 --- a/src/room/renderer/cache/RoomObjectCache.ts +++ b/src/room/renderer/cache/RoomObjectCache.ts @@ -79,7 +79,7 @@ export class RoomObjectCache { const data = new RoomObjectSpriteData(); - data.objectId = item._Str_1577; + data.objectId = item.objectId; data.x = sprite.x; data.y = sprite.y; data.z = sprite.z; @@ -145,4 +145,4 @@ export class RoomObjectCache return sprites; } -} \ No newline at end of file +} diff --git a/src/room/renderer/cache/RoomObjectCacheItem.ts b/src/room/renderer/cache/RoomObjectCacheItem.ts index 8bcc0afe..9b2dfffe 100644 --- a/src/room/renderer/cache/RoomObjectCacheItem.ts +++ b/src/room/renderer/cache/RoomObjectCacheItem.ts @@ -40,13 +40,13 @@ export class RoomObjectCacheItem } } - public get _Str_1577(): number + public get objectId(): number { return this._objectId; } - public set _Str_1577(k:number) + public set objectId(k:number) { this._objectId = k; } -} \ No newline at end of file +}