From 2bbf980a8115af8dfce7ba2810f70152ce23544a Mon Sep 17 00:00:00 2001 From: Dank074 Date: Sat, 8 May 2021 18:54:33 -0500 Subject: [PATCH] cleanup NumberBank --- src/nitro/room/RoomEngine.ts | 12 ++++++------ src/room/utils/NumberBank.ts | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 0433a9e2..9b27a9bd 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -2750,7 +2750,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { if(!this._roomContentLoader || (id === -1)) return; - this._thumbnailObjectIdBank._Str_15187((id - 1)); + this._thumbnailObjectIdBank.freeNumber((id - 1)); const listeners = this._thumbnailCallbacks.get(assetName); @@ -3013,7 +3013,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato if(!roomInstance) return imageResult; } - let objectId = this._imageObjectIdBank._Str_19709(); + let objectId = this._imageObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); if(objectId < 0) return imageResult; @@ -3124,7 +3124,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { roomInstance.removeRoomObject(objectId, objectCategory); - this._imageObjectIdBank._Str_15187((objectId - 1)); + this._imageObjectIdBank.freeNumber((objectId - 1)); imageResult.id = 0; } @@ -3153,7 +3153,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato if(!roomInstance) return imageResult; } - let objectId = this._thumbnailObjectIdBank._Str_19709(); + let objectId = this._thumbnailObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); if(objectId < 0) return imageResult; @@ -3190,7 +3190,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato imageResult.image = asset; } - this._thumbnailObjectIdBank._Str_15187((objectId - 1)); + this._thumbnailObjectIdBank.freeNumber((objectId - 1)); imageResult.id = 0; } @@ -3246,7 +3246,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato roomInstance.removeRoomObject(objectId, objectCategory); - this._imageObjectIdBank._Str_15187((objectId - 1)); + this._imageObjectIdBank.freeNumber((objectId - 1)); const imageListeners = this._imageCallbacks.get(objectId.toString()); diff --git a/src/room/utils/NumberBank.ts b/src/room/utils/NumberBank.ts index a9cca763..631f5374 100644 --- a/src/room/utils/NumberBank.ts +++ b/src/room/utils/NumberBank.ts @@ -26,7 +26,7 @@ this._freeNumbers = null; } - public _Str_19709(): number + public reserveNumber(): number { if(this._freeNumbers.length > 0) { @@ -40,7 +40,7 @@ return -1; } - public _Str_15187(k: number): void + public freeNumber(k: number): void { const i = this._reservedNumbers.indexOf(k); @@ -51,4 +51,4 @@ this._freeNumbers.push(k); } } -} \ No newline at end of file +}