-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3d86e8d
commit a2754de
Showing
4 changed files
with
194 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
newmodels_reborn/optional/compatibility/shared/funcs.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| -- Backwards compatibility with newmodels 3.3.0 | ||
|
|
||
| local OLD_DATA_NAMES = { | ||
| ped = "skinID", | ||
| vehicle = "vehicleID", | ||
| object = "objectID", | ||
| } | ||
| OLD_DATA_NAMES.pickup = OLD_DATA_NAMES.object | ||
| OLD_DATA_NAMES.player = OLD_DATA_NAMES.ped | ||
|
|
||
| local OLD_BASE_DATA_NAME = "baseID" | ||
|
|
||
| local function convertCustomModelInfoToOldFormat(customModelInfo) | ||
| local baseModel = customModelInfo.baseModel | ||
| local customModel = customModelInfo.id | ||
| local colPath, txdPath, dffPath = customModelInfo.col, customModelInfo.txd, customModelInfo.dff | ||
| local mod = { | ||
| id = customModel, | ||
| base_id = baseModel, | ||
| name = "", | ||
| path = { col = colPath, txd = txdPath, dff = dffPath }, | ||
| } | ||
| mod.paths = mod.path | ||
| return mod | ||
| end | ||
|
|
||
| -- Exported | ||
| function getDataNameFromType(elementType) | ||
| if type(elementType) == "string" then | ||
| return OLD_DATA_NAMES[elementType] | ||
| end | ||
| end | ||
|
|
||
| -- Rewrite this function | ||
| function getCustomModelDataKey(elementType) | ||
| if type(elementType) == "string" then | ||
| return OLD_DATA_NAMES[elementType] | ||
| end | ||
| end | ||
|
|
||
| -- Exported | ||
| function getBaseModelDataName() | ||
| return OLD_BASE_DATA_NAME | ||
| end | ||
|
|
||
| -- Exported | ||
| function getModDataFromID(id) | ||
| id = tonumber(id) | ||
| if not id then return end | ||
| local customInfo = customModels[id] | ||
| if not customInfo then return end | ||
| local mod = convertCustomModelInfoToOldFormat(customInfo) | ||
| return mod, customInfo.type | ||
| end | ||
|
|
||
| -- Exported | ||
| function getModList() | ||
| local modList = {} | ||
| for customModel, customInfo in pairs(customModels) do | ||
| modList[customModel] = convertCustomModelInfoToOldFormat(customInfo) | ||
| end | ||
| return modList | ||
| end | ||
|
|
||
| -- Exported | ||
| function getBaseModel(element) | ||
| if not isElement(localPlayer) then | ||
| return getElementModel(element) | ||
| else | ||
| local customModel = tonumber(getElementData(element, getCustomModelDataKey(element))) | ||
| if customModel then | ||
| return customModels[customModel] and customModels[customModel].baseModel or nil | ||
| else | ||
| return getElementModel(element) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| -- Exported | ||
| function isCustomModID(id) | ||
| local mod, modType = getModDataFromID(id) | ||
| if not mod then return false end | ||
| return true, mod, modType | ||
| end | ||
|
|
||
| -- Exported | ||
| function isRightModType(et, modEt) | ||
| if et == modEt then | ||
| return true | ||
| end | ||
| if (et == "player" or et == "ped") and (modEt == "player" or modEt == "ped") then | ||
| return true | ||
| end | ||
| if (et == "pickup" or et == "object") and (modEt == "pickup" or modEt == "object") then | ||
| return true | ||
| end | ||
| return false | ||
| end | ||
|
|
||
| -- Exported | ||
| function checkModelID(id, elementType) | ||
| assert(tonumber(id), "Non-number ID passed") | ||
| assert( | ||
| (elementType == "ped" or elementType == "player" or elementType == "object" or elementType == "vehicle" or elementType == "pickup"), | ||
| "Invalid element type passed: " .. tostring(elementType)) | ||
| local dataName = OLD_DATA_NAMES[elementType] | ||
| assert(dataName, "No data name for element type: " .. tostring(elementType)) | ||
| if elementType == "pickup" then | ||
| elementType = "object" | ||
| end | ||
| local baseModel | ||
| local isCustom, mod, modType = isCustomModID(id) | ||
| if isCustom then | ||
| if not isRightModType(elementType, modType) then | ||
| return "WRONG_MOD" | ||
| end | ||
| if mod then baseModel = mod.base_id end | ||
| elseif isDefaultID(elementType, id) then | ||
| baseModel = id | ||
| else | ||
| return "INVALID_MODEL" | ||
| end | ||
|
|
||
| return baseModel, isCustom, dataName, OLD_BASE_DATA_NAME | ||
| end | ||
|
|
||
| if isElement(localPlayer) then | ||
| -- Exported | ||
| function isClientReady() return true end -- Now the client is always ready :-) | ||
|
|
||
| -- Exported | ||
| function isModAllocated(id) | ||
| id = tonumber(id) | ||
| if not id then return end | ||
| return loadedModels[id] ~= nil | ||
| end | ||
| end |