Skip to content

Commit b891bbb

Browse files
author
Alex Cole
committed
Defines and enums together.
1 parent 535fa5f commit b891bbb

11 files changed

Lines changed: 677 additions & 23 deletions

‎omp_checkpoint.inc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@
3030
* <library>omp_checkpoint</library>
3131
*/
3232
#define CP_TYPE: __TAG(CP_TYPE):
33+
enum CP_TYPE:__CP_TYPE
34+
{
35+
UNKNOWN_CP_TYPE = -1,
36+
CP_TYPE_GROUND_NORMAL = 0,
37+
CP_TYPE_GROUND_FINISH = 1,
38+
CP_TYPE_GROUND_EMPTY = 2,
39+
CP_TYPE_AIR_NORMAL = 3,
40+
CP_TYPE_AIR_FINISH = 4,
41+
CP_TYPE_AIR_ROTATING = 5,
42+
CP_TYPE_AIR_STROBING = 6,
43+
CP_TYPE_AIR_SWINGING = 7,
44+
CP_TYPE_AIR_BOBBING = 8
45+
}
46+
static stock CP_TYPE:_@CP_TYPE() { return __CP_TYPE; }
3347

3448
#define UNKNOWN_CP_TYPE (CP_TYPE:-1)
3549
#define CP_TYPE_GROUND_NORMAL (CP_TYPE:0)

‎omp_core.inc‎

Lines changed: 97 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,75 @@ const INVALID_TIMER = 0;
3737
* <summary>Weapons</summary>
3838
*/
3939
#define WEAPON: __TAG(WEAPON):
40+
enum WEAPON:MAX_WEAPONS
41+
{
42+
UNKNOWN_WEAPON = -1,
43+
// Special `OnPlayerDeath` `reason` values. NOT included in `MAX_WEAPONS`.
44+
REASON_VEHICLE = 49,
45+
REASON_HELICOPTER_BLADES = 50,
46+
REASON_EXPLOSION = 51,
47+
REASON_DROWN = 53,
48+
REASON_COLLISION = 54,
49+
REASON_SPLAT = 54,
50+
REASON_CONNECT = 200,
51+
REASON_DISCONNECT = 201,
52+
REASON_SUICIDE = 255,
53+
54+
WEAPON_UNKNOWN = UNKNOWN_WEAPON
55+
WEAPON_VEHICLE = REASON_VEHICLE
56+
WEAPON_DROWN = REASON_DROWN
57+
WEAPON_COLLISION = REASON_COLLISION
58+
WEAPON_SPLAT = REASON_SPLAT
59+
60+
// The main weapon types. Done after the reasons so sizes are correct.
61+
WEAPON_FIST = 0,
62+
WEAPON_BRASSKNUCKLE = 1,
63+
WEAPON_GOLFCLUB = 2,
64+
WEAPON_NITESTICK = 3,
65+
WEAPON_NIGHTSTICK = WEAPON_NITESTICK,
66+
WEAPON_KNIFE = 4,
67+
WEAPON_BAT = 5,
68+
WEAPON_SHOVEL = 6,
69+
WEAPON_POOLSTICK = 7,
70+
WEAPON_KATANA = 8,
71+
WEAPON_CHAINSAW = 9,
72+
WEAPON_DILDO = 10,
73+
WEAPON_DILDO2 = 11,
74+
WEAPON_VIBRATOR = 12,
75+
WEAPON_VIBRATOR2 = 13,
76+
WEAPON_FLOWER = 14,
77+
WEAPON_CANE = 15,
78+
WEAPON_GRENADE = 16,
79+
WEAPON_TEARGAS = 17,
80+
WEAPON_MOLTOV = 18,
81+
WEAPON_MOLOTOV = WEAPON_MOLTOV,
82+
WEAPON_COLT45 = 22,
83+
WEAPON_SILENCED = 23,
84+
WEAPON_DEAGLE = 24,
85+
WEAPON_SHOTGUN = 25,
86+
WEAPON_SAWEDOFF = 26,
87+
WEAPON_SHOTGSPA = 27,
88+
WEAPON_UZI = 28,
89+
WEAPON_MP5 = 29,
90+
WEAPON_AK47 = 30,
91+
WEAPON_M4 = 31,
92+
WEAPON_TEC9 = 32,
93+
WEAPON_RIFLE = 33,
94+
WEAPON_SNIPER = 34,
95+
WEAPON_ROCKETLAUNCHER = 35,
96+
WEAPON_HEATSEEKER = 36,
97+
WEAPON_FLAMETHROWER = 37,
98+
WEAPON_MINIGUN = 38,
99+
WEAPON_SATCHEL = 39,
100+
WEAPON_BOMB = 40,
101+
WEAPON_SPRAYCAN = 41,
102+
WEAPON_FIREEXTINGUISHER = 42,
103+
WEAPON_CAMERA = 43,
104+
WEAPON_NIGHT_VISION_GOGGLES = 44,
105+
WEAPON_THERMAL_GOGGLES = 45,
106+
WEAPON_PARACHUTE = 46
107+
}
108+
static stock WEAPON:_@WEAPON() { return MAX_WEAPONS; }
40109

41110
#define UNKNOWN_WEAPON (WEAPON:-1)
42111

@@ -99,8 +168,6 @@ const INVALID_TIMER = 0;
99168
#define WEAPON_THERMAL_GOGGLES (WEAPON:45)
100169
#define WEAPON_PARACHUTE (WEAPON:46)
101170

102-
#define MAX_WEAPONS (WEAPON:47)
103-
104171
#define WEAPON_UNKNOWN UNKNOWN_WEAPON
105172
#define WEAPON_VEHICLE REASON_VEHICLE
106173
#define WEAPON_DROWN REASON_DROWN
@@ -113,6 +180,25 @@ const INVALID_TIMER = 0;
113180
* <summary>Weapon Slots</summary>
114181
*/
115182
#define WEAPON_SLOT: __TAG(WEAPON_SLOT):
183+
enum WEAPON_SLOT:MAX_WEAPON_SLOTS
184+
{
185+
UNKNOWN_WEAPON_SLOT = -1,
186+
WEAPON_SLOT_UNKNOWN = UNKNOWN_WEAPON_SLOT,
187+
WEAPON_SLOT_UNARMED = 0,
188+
WEAPON_SLOT_MELEE = 1,
189+
WEAPON_SLOT_PISTOL = 2,
190+
WEAPON_SLOT_SHOTGUN = 3,
191+
WEAPON_SLOT_MACHINE_GUN = 4,
192+
WEAPON_SLOT_ASSAULT_RIFLE = 5,
193+
WEAPON_SLOT_LONG_RIFLE = 6,
194+
WEAPON_SLOT_ARTILLERY = 7,
195+
WEAPON_SLOT_EXPLOSIVES = 8,
196+
WEAPON_SLOT_EQUIPMENT = 9,
197+
WEAPON_SLOT_GIFT = 10,
198+
WEAPON_SLOT_GADGET = 11,
199+
WEAPON_SLOT_DETONATOR = 12
200+
}
201+
static stock WEAPON_SLOT:_@WEAPON_SLOT() { return MAX_WEAPON_SLOTS; }
116202

117203
#define UNKNOWN_WEAPON_SLOT (WEAPON_SLOT:-1)
118204
#define WEAPON_SLOT_UNARMED (WEAPON_SLOT:0)
@@ -129,8 +215,6 @@ const INVALID_TIMER = 0;
129215
#define WEAPON_SLOT_GADGET (WEAPON_SLOT:11)
130216
#define WEAPON_SLOT_DETONATOR (WEAPON_SLOT:12)
131217

132-
#define MAX_WEAPON_SLOTS (WEAPON_SLOT:13)
133-
134218
#define WEAPON_SLOT_UNKNOWN UNKNOWN_WEAPON_SLOT
135219

136220
/// <p/>
@@ -139,6 +223,15 @@ const INVALID_TIMER = 0;
139223
* <summary>Marker modes used by <c>ShowPlayerMarkers()</c></summary>
140224
*/
141225
#define PLAYER_MARKERS_MODE: __TAG(PLAYER_MARKERS_MODE):
226+
enum PLAYER_MARKERS_MODE:__PLAYER_MARKERS_MODE
227+
{
228+
UNKNOWN_PLAYER_MARKERS_MODE = -1,
229+
PLAYER_MARKERS_MODE_UNKNOWN = UNKNOWN_PLAYER_MARKERS_MODE,
230+
PLAYER_MARKERS_MODE_OFF = 0,
231+
PLAYER_MARKERS_MODE_GLOBAL = 1,
232+
PLAYER_MARKERS_MODE_STREAMED = 2
233+
}
234+
static stock PLAYER_MARKERS_MODE:_@PLAYER_MARKERS_MODE() { return __PLAYER_MARKERS_MODE; }
142235

143236
#define UNKNOWN_PLAYER_MARKERS_MODE (PLAYER_MARKERS_MODE:-1)
144237
#define PLAYER_MARKERS_MODE_OFF (PLAYER_MARKERS_MODE:0)

‎omp_database.inc‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,33 @@
2929
/**
3030
* <library>omp_database</library>
3131
*/
32+
enum SQLITE_OPEN:__SQLITE_OPEN
33+
{
34+
UNKNOWN_SQLITE_OPEN = -1,
35+
SQLITE_OPEN_READONLY = 0x00000001,
36+
SQLITE_OPEN_READWRITE = 0x00000002,
37+
SQLITE_OPEN_CREATE = 0x00000004,
38+
SQLITE_OPEN_DELETEONCLOSE = 0x00000008, // Requires VFS.
39+
SQLITE_OPEN_EXCLUSIVE = 0x00000010, // Requires VFS.
40+
SQLITE_OPEN_AUTOPROXY = 0x00000020, // Requires VFS.
41+
SQLITE_OPEN_URI = 0x00000040,
42+
SQLITE_OPEN_MEMORY = 0x00000080,
43+
SQLITE_OPEN_MAIN_DB = 0x00000100, // Requires VFS.
44+
SQLITE_OPEN_TEMP_DB = 0x00000200, // Requires VFS.
45+
SQLITE_OPEN_TRANSIENT_DB = 0x00000400, // Requires VFS.
46+
SQLITE_OPEN_MAIN_JOURNAL = 0x00000800, // Requires VFS.
47+
SQLITE_OPEN_TEMP_JOURNAL = 0x00001000, // Requires VFS.
48+
SQLITE_OPEN_SUBJOURNAL = 0x00002000, // Requires VFS.
49+
SQLITE_OPEN_SUPER_JOURNAL = 0x00004000, // Requires VFS.
50+
SQLITE_OPEN_NOMUTEX = 0x00008000,
51+
SQLITE_OPEN_FULLMUTEX = 0x00010000,
52+
SQLITE_OPEN_SHAREDCACHE = 0x00020000,
53+
SQLITE_OPEN_PRIVATECACHE = 0x00040000,
54+
SQLITE_OPEN_WAL = 0x00080000, // Requires VFS.
55+
SQLITE_OPEN_NOFOLLOW = 0x01000000,
56+
SQLITE_OPEN_EXRESCODE = 0x02000000
57+
}
58+
static stock SQLITE_OPEN:_@SQLITE_OPEN() { return __SQLITE_OPEN; }
3259

3360
#define UNKNOWN_SQLITE_OPEN (SQLITE_OPEN:-1)
3461
#define SQLITE_OPEN_READONLY (SQLITE_OPEN:0x00000001)

‎omp_dialog.inc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ const MAX_DIALOG = 32768;
4444
* <summary>Player GUI dialog</summary>
4545
*/
4646
#define DIALOG_STYLE: __TAG(DIALOG_STYLE):
47+
enum DIALOG_STYLE:__DIALOG_STYLE
48+
{
49+
UNKNOWN_DIALOG_STYLE = -1,
50+
DIALOG_STYLE_MSGBOX,
51+
DIALOG_STYLE_INPUT,
52+
DIALOG_STYLE_LIST,
53+
DIALOG_STYLE_PASSWORD,
54+
DIALOG_STYLE_TABLIST,
55+
DIALOG_STYLE_TABLIST_HEADERS
56+
}
57+
static stock DIALOG_STYLE:_@DIALOG_STYLE() { return __DIALOG_STYLE; }
4758

4859
#define UNKNOWN_DIALOG_STYLE (DIALOG_STYLE:-1)
4960
#define DIALOG_STYLE_MSGBOX (DIALOG_STYLE:0)

‎omp_http.inc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
* <summary>HTTP request types</summary>
3232
*/
3333
#define HTTP_METHOD: __TAG(HTTP_METHOD):
34+
enum HTTP_METHOD:__HTTP_METHOD
35+
{
36+
UNKNOWN_HTTP_METHOD = -1,
37+
HTTP_GET = 1,
38+
HTTP_POST,
39+
HTTP_HEAD
40+
}
41+
static stock HTTP_METHOD:_@HTTP_METHOD() { return __HTTP_METHOD; }
3442

3543
#define UNKNOWN_HTTP_METHOD (HTTP_METHOD:-1)
3644
#define HTTP_GET (HTTP_METHOD:1)
@@ -47,6 +55,17 @@
4755
* </remarks>
4856
*/
4957
#define HTTP_ERROR: __TAG(HTTP_ERROR):
58+
enum HTTP_ERROR:__HTTP_ERROR
59+
{
60+
UNKNOWN_HTTP_ERROR = -1,
61+
HTTP_ERROR_BAD_HOST = 1,
62+
HTTP_ERROR_NO_SOCKET,
63+
HTTP_ERROR_CANT_CONNECT,
64+
HTTP_ERROR_CANT_WRITE,
65+
HTTP_ERROR_CONTENT_TOO_BIG,
66+
HTTP_ERROR_MALFORMED_RESPONSE
67+
}
68+
static stock HTTP_ERROR:_@HTTP_ERROR() { return __HTTP_ERROR; }
5069

5170
#define UNKNOWN_HTTP_ERROR (HTTP_ERROR:-1)
5271
#define HTTP_ERROR_BAD_HOST (HTTP_ERROR:1)

‎omp_network.inc‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,31 @@
3131
* <summary>Connection statuses</summary>
3232
*/
3333
#define CONNECTION_STATUS: __TAG(CONNECTION_STATUS):
34+
enum CONNECTION_STATUS:__CONNSTAT
35+
{
36+
UNKNOWN_CONNECTION_STATUS = -1,
37+
CONNECTION_STATUS_NO_ACTION = 0,
38+
#if __namemax > 31
39+
CONNECTION_STATUS_DISCONNECT_ASAP,
40+
CONNECTION_STATUS_DISCONNECT_ASAP_SILENTLY,
41+
CONNECTION_STATUS_DISCONNECT_ON_NO_ACK,
42+
CONNECTION_STATUS_REQUESTED_CONNECTION,
43+
CONNECTION_STATUS_HANDLING_CONNECTION_REQUEST,
44+
CONNECTION_STATUS_UNVERIFIED_SENDER,
45+
CONNECTION_STATUS_SET_ENCRYPTION_ON_MULTIPLE_16_BYTE_PACKET,
46+
#endif
47+
CONNECTION_STATUS_CONNECTED = 8,
48+
CONNSTAT_NO_ACTION = 0,
49+
CONNSTAT_DISCONNECT_ASAP,
50+
CONNSTAT_DISCONNECT_ASAP_SILNT,
51+
CONNSTAT_DISCONNECT_ON_NO_ACK,
52+
CONNSTAT_REQUESTED_CONNECTION,
53+
CONNSTAT_HANDLING_CONN_REQ,
54+
CONNSTAT_UNVERIFIED_SENDER,
55+
CONNSTAT_SET_ENCRYPTION,
56+
CONNSTAT_CONNECTED
57+
}
58+
static stock CONNECTION_STATUS:_@CONNECTION_STATUS() { return __CONNSTAT; }
3459

3560
#define UNKNOWN_CONNECTION_STATUS (CONNECTION_STATUS:-1)
3661
#define CONNECTION_STATUS_NO_ACTION (CONNECTION_STATUS:0)
@@ -60,6 +85,14 @@
6085
* <summary>Artwork/NetModels</summary>
6186
*/
6287
#define DOWNLOAD_REQUEST: __TAG(DOWNLOAD_REQUEST):
88+
enum DOWNLOAD_REQUEST:__DOWNLOAD_REQUEST
89+
{
90+
UNKNOWN_DOWNLOAD_REQUEST = -1,
91+
DOWNLOAD_REQUEST_EMPTY,
92+
DOWNLOAD_REQUEST_MODEL_FILE,
93+
DOWNLOAD_REQUEST_TEXTURE_FILE
94+
}
95+
static stock DOWNLOAD_REQUEST:_@DOWNLOAD_REQUEST() { return __DOWNLOAD_REQUEST; }
6396

6497
#define UNKNOWN_DOWNLOAD_REQUEST (DOWNLOAD_REQUEST:-1)
6598
#define DOWNLOAD_REQUEST_EMPTY (DOWNLOAD_REQUEST:0)

‎omp_object.inc‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ const INVALID_OBJECT_ID = 0xFFFF;
5151
* <library>omp_object</library>
5252
*/
5353
#define SELECT_OBJECT: __TAG(SELECT_OBJECT):
54+
enum SELECT_OBJECT:__SELECT_OBJECT
55+
{
56+
UNKNOWN_SELECT_OBJECT = -1,
57+
SELECT_OBJECT_GLOBAL_OBJECT = 1,
58+
SELECT_OBJECT_PLAYER_OBJECT
59+
}
60+
static stock SELECT_OBJECT:_@SELECT_OBJECT() { return __SELECT_OBJECT; }
5461

5562
#define UNKNOWN_SELECT_OBJECT (SELECT_OBJECT:-1)
5663
#define SELECT_OBJECT_GLOBAL_OBJECT (SELECT_OBJECT:1)
@@ -61,6 +68,25 @@ const INVALID_OBJECT_ID = 0xFFFF;
6168
* <library>omp_object</library>
6269
*/
6370
#define OBJECT_MATERIAL_SIZE: __TAG(OBJECT_MATERIAL_SIZE):
71+
enum OBJECT_MATERIAL_SIZE:__OBJECT_MATERIAL_SIZE (+= 10)
72+
{
73+
UNKNOWN_OBJECT_MATERIAL_SIZE = -1,
74+
OBJECT_MATERIAL_SIZE_32x32 = 10,
75+
OBJECT_MATERIAL_SIZE_64x32,
76+
OBJECT_MATERIAL_SIZE_64x64,
77+
OBJECT_MATERIAL_SIZE_128x32,
78+
OBJECT_MATERIAL_SIZE_128x64,
79+
OBJECT_MATERIAL_SIZE_128x128,
80+
OBJECT_MATERIAL_SIZE_256x32,
81+
OBJECT_MATERIAL_SIZE_256x64,
82+
OBJECT_MATERIAL_SIZE_256x128,
83+
OBJECT_MATERIAL_SIZE_256x256,
84+
OBJECT_MATERIAL_SIZE_512x64,
85+
OBJECT_MATERIAL_SIZE_512x128,
86+
OBJECT_MATERIAL_SIZE_512x256,
87+
OBJECT_MATERIAL_SIZE_512x512
88+
}
89+
static stock OBJECT_MATERIAL_SIZE:_@OBJECT_MATERIAL_SIZE() { return __OBJECT_MATERIAL_SIZE; }
6490

6591
#define UNKNOWN_OBJECT_MATERIAL_SIZE (OBJECT_MATERIAL_SIZE:-1)
6692
#define OBJECT_MATERIAL_SIZE_32x32 (OBJECT_MATERIAL_SIZE:10)
@@ -83,6 +109,20 @@ const INVALID_OBJECT_ID = 0xFFFF;
83109
* <library>omp_object</library>
84110
*/
85111
#define OBJECT_MATERIAL_TEXT_ALIGN: __TAG(OBJECT_MATERIAL_TEXT_ALIGN):
112+
enum OBJECT_MATERIAL_TEXT_ALIGN:__OBJECT_MATERIAL_TEXT_ALIGN
113+
{
114+
// First so we don't have trailing commas.
115+
#if __namemax > 31
116+
UNKNOWN_OBJECT_MATERIAL_TEXT_ALIGN = -1,
117+
OBJECT_MATERIAL_TEXT_ALIGN_CENTRE = 1,
118+
OBJECT_MATERIAL_TEXT_ALIGN_CENTER = 1,
119+
OBJECT_MATERIAL_TEXT_ALIGN_RIGHT = 2,
120+
#endif
121+
OBJECT_MATERIAL_TEXT_ALIGN_LEFT = 0,
122+
OBJECT_MATERIAL_TEXT_ALIGN_CENT = 1,
123+
OBJECT_MATERIAL_TEXT_ALIGN_RIGT = 2
124+
}
125+
static stock OBJECT_MATERIAL_TEXT_ALIGN:_@OBJECT_MATERIAL_TEXT_ALIGN() { return __OBJECT_MATERIAL_TEXT_ALIGN; }
86126

87127
#if __namemax > 31
88128
#define UNKNOWN_OBJECT_MATERIAL_TEXT_ALIGN (OBJECT_MATERIAL_TEXT_ALIGN:-1)
@@ -99,6 +139,14 @@ const INVALID_OBJECT_ID = 0xFFFF;
99139
* <library>omp_object</library>
100140
*/
101141
#define EDIT_RESPONSE: __TAG(EDIT_RESPONSE):
142+
enum EDIT_RESPONSE:__EDIT_RESPONSE
143+
{
144+
UNKNOWN_EDIT_RESPONSE = -1,
145+
EDIT_RESPONSE_CANCEL,
146+
EDIT_RESPONSE_FINAL,
147+
EDIT_RESPONSE_UPDATE
148+
}
149+
static stock EDIT_RESPONSE:_@EDIT_RESPONSE() { return __EDIT_RESPONSE; }
102150

103151
#define UNKNOWN_EDIT_RESPONSE (EDIT_RESPONSE:-1)
104152
#define EDIT_RESPONSE_CANCEL (EDIT_RESPONSE:0)

0 commit comments

Comments
 (0)