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

tweak(mono-rt2): swap back to using Prop instead of Object #2731

Merged
merged 1 commit into from
Aug 20, 2024
Merged

tweak(mono-rt2): swap back to using Prop instead of Object #2731

Show file tree
Hide file tree
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
25 changes: 0 additions & 25 deletions code/client/clrcore-v2/Client/FiveM/Object.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion code/client/clrcore/External/Entity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using CitizenFX.FiveM.Native;
using API = CitizenFX.FiveM.Native.Natives;
using Function = CitizenFX.FiveM.Native.Natives;
using Prop = CitizenFX.FiveM.Object;

namespace CitizenFX.FiveM
#else
Expand Down
12 changes: 9 additions & 3 deletions code/client/clrcore/External/Prop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
#if !MONO_V2
#if MONO_V2
using API = CitizenFX.FiveM.Native.Natives;
namespace CitizenFX.FiveM
#else
using CitizenFX.Core.Native;

namespace CitizenFX.Core
#endif
{
public sealed class Prop : Entity
#if MONO_V2
, Shared.IObject
#endif

{
public Prop(int handle) : base(handle)
{
Expand All @@ -28,4 +35,3 @@ public static bool Exists(Prop prop)
}
}
}
#endif
1 change: 0 additions & 1 deletion code/client/clrcore/External/WeaponCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#if MONO_V2
using API = CitizenFX.FiveM.Native.Natives;
using Prop = CitizenFX.FiveM.Object;

namespace CitizenFX.FiveM
#else
Expand Down
3 changes: 1 addition & 2 deletions code/client/clrcore/External/World.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
#if MONO_V2
using CitizenFX.Core;
using API = CitizenFX.FiveM.Native.Natives;
using Prop = CitizenFX.FiveM.Object;
using TaskPed = CitizenFX.Core.Coroutine<CitizenFX.FiveM.Ped>;
using TaskPickup = CitizenFX.Core.Coroutine<CitizenFX.FiveM.Pickup>;
using TaskProp = CitizenFX.Core.Coroutine<CitizenFX.FiveM.Object>;
using TaskProp = CitizenFX.Core.Coroutine<CitizenFX.FiveM.Prop>;
using TaskVehicle = CitizenFX.Core.Coroutine<CitizenFX.FiveM.Vehicle>;
using compat_i32_u32 = System.UInt32;
using compat_i32_i64 = System.Int64;
Expand Down
Loading