From bce480aad540444e564a52e8825a5a7a601c2bcc Mon Sep 17 00:00:00 2001 From: kookroach <62265045+kookroach@users.noreply.github.com> Date: Sun, 4 Apr 2021 21:29:34 +0200 Subject: [PATCH] test --- ReallifeGamemode.Client/core/rage-mp/entities.ts | 3 +-- ReallifeGamemode.Client/game.ts | 2 +- .../node_modules/@types/ragemp-c/index.d.ts | 7 +++++-- ReallifeGamemode.Client/util/attachmentMngr.ts | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts index 69cd3e1a..8b3b91fc 100644 --- a/ReallifeGamemode.Client/core/rage-mp/entities.ts +++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts @@ -194,13 +194,12 @@ class RageObject extends RageEntity implements IObject { public object: ObjectMp; public __attachmentData: object; - constructor(object: ObjectMp, attachmentData: object) { + constructor(object: ObjectMp) { if (!object) { throw "Object is undefined" } super(object); this.object = object; - this.__attachmentData = attachmentData; } } diff --git a/ReallifeGamemode.Client/game.ts b/ReallifeGamemode.Client/game.ts index 8b1f6883..44e0609b 100644 --- a/ReallifeGamemode.Client/game.ts +++ b/ReallifeGamemode.Client/game.ts @@ -81,7 +81,7 @@ interface IEntityPool { } interface IObjectPool extends IEntityPool { - setData(entity: ObjectMp, attachmentData: object): void; + setData(entity: ObjectMp): void; } interface IPlayerPool extends IEntityPool { diff --git a/ReallifeGamemode.Client/node_modules/@types/ragemp-c/index.d.ts b/ReallifeGamemode.Client/node_modules/@types/ragemp-c/index.d.ts index ddef2c97..22a41556 100644 --- a/ReallifeGamemode.Client/node_modules/@types/ragemp-c/index.d.ts +++ b/ReallifeGamemode.Client/node_modules/@types/ragemp-c/index.d.ts @@ -339,7 +339,9 @@ interface EntityMp { setVelocity(x: number, y: number, z: number): void; setVisible(toggle: boolean, p1: boolean): void; stopAnim(animation: string, animGroup: string, p2: number): void; - stopSynchronizedAnim(p0: number, p1: boolean): boolean; + stopSynchronizedAnim(p0: number, p1: boolean): boolean; + __attachments: any; + __attachmentObjects: any; } interface CheckpointMp extends EntityMp { @@ -385,7 +387,8 @@ interface ObjectMp extends EntityMp { setPhysicsParams(weight: number, p1: number, p2: number, p3: number, p4: number, gravity: number, p6: number, p7: number, p8: number, p9: number, buoyancy: number): void; setTargettable(targettable: boolean): void; - slide(toX: number, toY: number, toZ: number, speedX: number, speedY: number, speedZ: number, collision: boolean): boolean; + slide(toX: number, toY: number, toZ: number, speedX: number, speedY: number, speedZ: number, collision: boolean): boolean; + __attMgrData: any; } interface PedBaseMp extends EntityMp { diff --git a/ReallifeGamemode.Client/util/attachmentMngr.ts b/ReallifeGamemode.Client/util/attachmentMngr.ts index 2da23324..41c07536 100644 --- a/ReallifeGamemode.Client/util/attachmentMngr.ts +++ b/ReallifeGamemode.Client/util/attachmentMngr.ts @@ -1,6 +1,5 @@ import { IGame, IEntity } from "../game"; -var attachId = 0; export default function attachmentManager(game: IGame) { mp.events.add("SERVER:LoadAttachments", () => { @@ -12,6 +11,8 @@ export default function attachmentManager(game: IGame) { attachmentMngr.register("weapondeal2", "w_sg_pumpshotgun", "weapondeal2w_sg_pumpshotgun", new mp.Vector3(0.4, 1.6, 0.62), new mp.Vector3(90, 0, 180)); }); + + const attachmentMngr = { attachments: {},