loot/loot-condition-interpreter
0
0
Fork 0
mirror of https://github.com/loot/loot-condition-interpreter.git synced 2026-07-27 14:16:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename GameType variants to use fewer acronyms

Browse Source 
A minor quality of life improvement since the nom 5 update is a
breaking change.
This commit is contained in:
Oliver Hamlet
2019-06-30 11:25:23 +01:00
parent 4db34be2c9
commit 6cfefc6c31
5 changed files with 122 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ffi/src/constants.rs
+9 -9
View File
@@ -40,39 +40,39 @@ pub static LCI_ERROR_TEXT_ENCODE_FAIL: c_int = -7;
/// Game code for The Elder Scrolls III: Morrowind.
#[no_mangle]
pub static LCI_GAME_TES3: c_int = GameType::Tes3 as c_int;
pub static LCI_GAME_TES3: c_int = GameType::Morrowind as c_int;
/// Game code for The Elder Scrolls IV: Oblivion.
#[no_mangle]
pub static LCI_GAME_TES4: c_int = GameType::Tes4 as c_int;
pub static LCI_GAME_TES4: c_int = GameType::Oblivion as c_int;
/// Game code for The Elder Scrolls V: Skyrim.
#[no_mangle]
pub static LCI_GAME_TES5: c_int = GameType::Tes5 as c_int;
pub static LCI_GAME_TES5: c_int = GameType::Skyrim as c_int;
/// Game code for Fallout 3.
#[no_mangle]
pub static LCI_GAME_FO3: c_int = GameType::Fo3 as c_int;
pub static LCI_GAME_FO3: c_int = GameType::Fallout3 as c_int;
/// Game code for Fallout: New Vegas.
#[no_mangle]
pub static LCI_GAME_FNV: c_int = GameType::Fonv as c_int;
pub static LCI_GAME_FNV: c_int = GameType::FalloutNV as c_int;
/// Game code for Fallout 4.
#[no_mangle]
pub static LCI_GAME_FO4: c_int = GameType::Fo4 as c_int;
pub static LCI_GAME_FO4: c_int = GameType::Fallout4 as c_int;
/// Game code for The Elder Scrolls V: Skyrim Special Edition.
#[no_mangle]
pub static LCI_GAME_TES5SE: c_int = GameType::Tes5se as c_int;
pub static LCI_GAME_TES5SE: c_int = GameType::SkyrimSE as c_int;
/// Game code for The Elder Scrolls V: Skyrim VR.
#[no_mangle]
pub static LCI_GAME_TES5VR: c_int = GameType::Tes5vr as c_int;
pub static LCI_GAME_TES5VR: c_int = GameType::SkyrimVR as c_int;
/// Game code for Fallout 4 VR.
#[no_mangle]
pub static LCI_GAME_FO4VR: c_int = GameType::Fo4vr as c_int;
pub static LCI_GAME_FO4VR: c_int = GameType::Fallout4VR as c_int;
#[cfg(test)]
mod tests {
ffi/src/helpers.rs
+9 -9
View File
@@ -32,15 +32,15 @@ fn map_error(err: &Error) -> c_int {
pub fn map_game_type(game_type: c_int) -> Result<GameType, c_int> {
match game_type {
x if x == LCI_GAME_TES3 => Ok(GameType::Tes3),
x if x == LCI_GAME_TES4 => Ok(GameType::Tes4),
x if x == LCI_GAME_TES5 => Ok(GameType::Tes5),
x if x == LCI_GAME_TES5SE => Ok(GameType::Tes5se),
x if x == LCI_GAME_TES5VR => Ok(GameType::Tes5vr),
x if x == LCI_GAME_FO3 => Ok(GameType::Fo3),
x if x == LCI_GAME_FNV => Ok(GameType::Fonv),
x if x == LCI_GAME_FO4 => Ok(GameType::Fo4),
x if x == LCI_GAME_FO4VR => Ok(GameType::Fo4vr),
x if x == LCI_GAME_TES3 => Ok(GameType::Morrowind),
x if x == LCI_GAME_TES4 => Ok(GameType::Oblivion),
x if x == LCI_GAME_TES5 => Ok(GameType::Skyrim),
x if x == LCI_GAME_TES5SE => Ok(GameType::SkyrimSE),
x if x == LCI_GAME_TES5VR => Ok(GameType::SkyrimVR),
x if x == LCI_GAME_FO3 => Ok(GameType::Fallout3),
x if x == LCI_GAME_FNV => Ok(GameType::FalloutNV),
x if x == LCI_GAME_FO4 => Ok(GameType::Fallout4),
x if x == LCI_GAME_FO4VR => Ok(GameType::Fallout4VR),
_ => Err(LCI_ERROR_INVALID_ARGS),
}
}