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

+ Keeping it all in #32

Merged
merged 1 commit into from
May 7, 2022
Merged

+ Keeping it all in #32

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
32 changes: 16 additions & 16 deletions OmsiHook/OmsiStructs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public struct OmsiPassCabinTicketSale
public string changePos_parent_str; // ANSIString
public bool valid;
}
public struct OmsiPassCabinTicketSaleInternal
internal struct OmsiPassCabinTicketSaleInternal
{
public OmsiPathPoint point;
public D3DVector ticketPos;
Expand Down Expand Up @@ -841,7 +841,7 @@ public struct OmsiAmpelGroup
public float ampelTime;
}

public struct OmsiAmpelInternal
internal struct OmsiAmpelInternal
{
[OmsiStrPtr] public int name;
[OmsiStructArrayPtr(typeof(OmsiAmpelPhase))]
Expand Down Expand Up @@ -931,7 +931,7 @@ public struct OmsiObjectPathInfo
public OmsiThirdRail[] third_rails;
}

public struct OmsiObjectPathInfoInternal
internal struct OmsiObjectPathInfoInternal
{
public D3DVector position;
public float hdg;
Expand Down Expand Up @@ -1033,7 +1033,7 @@ public struct OmsiCoupling
public D3DVector position;
public OmsiCoupleCC[] cc;
}
public struct OmsiCouplingInternal
internal struct OmsiCouplingInternal
{
public D3DVector position;
[OmsiStructArrayPtr(typeof(OmsiCoupleCC))] public int cc;
Expand All @@ -1045,7 +1045,7 @@ public struct OmsiCoupleCC
public int write_var;
public int couple_var;
}
public struct OmsiVehicleCoupleInternal
internal struct OmsiVehicleCoupleInternal
{
[OmsiStrPtr] public int filename;
public bool reverse;
Expand Down Expand Up @@ -1089,7 +1089,7 @@ public struct OmsiHOFTarget
public string[] strings;
public bool allExit;
}
public struct OmsiHOFTargetInternal
internal struct OmsiHOFTargetInternal
{
public int nummer;
[OmsiStrPtr] public int name; // ANSI String
Expand All @@ -1104,7 +1104,7 @@ public struct OmsiHofFISBusstop
public string ident; // ANSI String
public string[] strings;
}
public struct OmsiHofFISBusstopInternal
internal struct OmsiHofFISBusstopInternal
{
[OmsiStrPtr] public int ident; // ANSI String
[OmsiStrArrayPtr] public int strings;
Expand All @@ -1118,7 +1118,7 @@ public struct OmsiHofFISTrip
public string line; // ANSI String
public string[] busstops;
}
public struct OmsiHofFISTripInternal
internal struct OmsiHofFISTripInternal
{
public int code;
[OmsiStrPtr] public int name; // ANSI String
Expand All @@ -1143,7 +1143,7 @@ public struct OmsiPathLink
public OmsiPathID nextPath;
public bool nextRev;
}
public struct OmsiPathLinkInternal
internal struct OmsiPathLinkInternal
{
[OmsiStructPtr(typeof(OmsiPathID))] public int nextPath;
public bool nextRev;
Expand All @@ -1165,7 +1165,7 @@ public struct OmsiPathReservation
public OmsiPathInfo pathInfo;
public byte typ;
}
public struct OmsiPathReservationInternal
internal struct OmsiPathReservationInternal
{
[OmsiStructPtr(typeof(OmsiPathInfo))] public int pathInfo;
public byte typ;
Expand All @@ -1175,8 +1175,8 @@ public struct OmsiWeightData
{
public float[] influences;
}
public struct OmsiWeightDataInternal

internal struct OmsiWeightDataInternal
{
[OmsiStructArrayPtrAttribute(typeof(float))] public int influences;
}
Expand All @@ -1185,7 +1185,7 @@ public struct OmsiFileObjectPathInfo
{
public OmsiPathRule[] rules;
}
public struct OmsiFileObjectPathInfoInternal
internal struct OmsiFileObjectPathInfoInternal
{
[OmsiStructArrayPtr(typeof(OmsiPathRule), typeof(OmsiPathRuleInternal))] public int rules;
}
Expand All @@ -1198,7 +1198,7 @@ public struct OmsiPathRule
public byte priority;
}

public struct OmsiPathRuleInternal
internal struct OmsiPathRuleInternal
{
[OmsiObjArrayPtr(typeof(short))] public int trafficDensity_act;
[OmsiObjArrayPtr(typeof(float))] public int trafficDensity;
Expand All @@ -1218,7 +1218,7 @@ public struct OmsiStringItem
public OmsiObject fobject;
}

public struct OmsiStringItemInternal
internal struct OmsiStringItemInternal
{
[OmsiStrPtr] public int fstring;
[OmsiObjPtr(typeof(OmsiObject))] public int fobject;
Expand All @@ -1231,7 +1231,7 @@ public struct OmsiScriptTexture
public uint color;
}

public struct OmsiScriptTextureInternal
internal struct OmsiScriptTextureInternal
{
[OmsiPtr] public int tex; // IDirect3DTexture9 - No Marshaling implemented
[OmsiStructArrayPtr(typeof(uint))] public int TexPn;
Expand Down