aboutsummaryrefslogtreecommitdiff
path: root/project/dclib/lib-mkw.h
diff options
context:
space:
mode:
authorWiimm <wiimm@wiimm.de>2022-10-27 12:06:47 +0200
committerWiimm <wiimm@wiimm.de>2022-10-27 12:06:47 +0200
commit6d27524f61a141dfa7c1c66b36bcb1f6b5728f3d (patch)
treeda113ccbfd746abea569d564999bc0038f59fe9f /project/dclib/lib-mkw.h
parent159e76837a2582682d81943b3fa963d72141337f (diff)
SZS v2.29a
Diffstat (limited to 'project/dclib/lib-mkw.h')
-rw-r--r--project/dclib/lib-mkw.h26
1 files changed, 23 insertions, 3 deletions
diff --git a/project/dclib/lib-mkw.h b/project/dclib/lib-mkw.h
index 8a19dbb..5233506 100644
--- a/project/dclib/lib-mkw.h
+++ b/project/dclib/lib-mkw.h
@@ -91,9 +91,14 @@ enum mkw_consts_t // some constants
//--- LE-CODE random tracks
- MKW_N_LE_RANDOM = 0x04,
- MKW_LE_RANDOM_BEG = 0x3e,
- MKW_LE_RANDOM_END = MKW_LE_RANDOM_BEG + MKW_N_LE_RANDOM,
+ MKW_LE_RANDOM_BEG = 0x3d,
+ MKW_LE_RANDOM_TEXTURE = MKW_LE_RANDOM_BEG,
+ MKW_LE_RANDOM_BY_CUP,
+ MKW_LE_RANDOM_ORIG,
+ MKW_LE_RANDOM_CUSTOM,
+ MKW_LE_RANDOM_NEW,
+ MKW_LE_RANDOM_END,
+ MKW_N_LE_RANDOM = MKW_LE_RANDOM_END - MKW_LE_RANDOM_BEG,
//--- LE-CODE extended slots
@@ -110,12 +115,24 @@ enum mkw_consts_t // some constants
//-----------------------------------------------------------------------------
+ccp GetLecodeRandomName ( uint slot, ccp return_on_err );
+ccp GetLecodeRandomInfo ( uint slot, ccp return_on_err );
+
+//-----------------------------------------------------------------------------
+
static inline bool IsMkwTrack ( uint tid )
{ return tid < MKW_TRACK_END; }
+static inline bool IsLecodeTrack ( uint tid )
+ { return tid < MKW_TRACK_END || tid >= MKW_LE_SLOT_BEG; }
+
static inline bool IsMkwArena ( uint tid )
{ return tid >= MKW_ARENA_BEG && tid < MKW_ARENA_END; }
+static inline bool IsMkwArenaOrRandom ( uint tid )
+ { return tid >= MKW_ARENA_BEG && tid < MKW_ARENA_END
+ || tid >= MKW_LE_RANDOM_BEG && tid < MKW_LE_RANDOM_END; }
+
static inline bool IsMkwOriginal ( uint tid )
{ return tid < MKW_ARENA_END; }
@@ -130,6 +147,9 @@ static inline bool IsValidLecodeSlot ( uint tid )
|| tid >= MKW_LE_SLOT_BEG && tid < MKW_LE_SLOT_END
|| tid >= MKW_LE_RANDOM_BEG && tid < MKW_LE_RANDOM_END; }
+static inline bool IsMkwSpecial ( uint tid )
+ { return tid >= MKW_ARENA_END && tid < MKW_LE_SLOT_BEG; }
+
//
///////////////////////////////////////////////////////////////////////////////
/////////////// 24p support ///////////////