Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[General] Correct assettype enum

Browse Source
This commit is contained in:
momo5502
2016-12-28 21:35:30 +01:00
parent c4690bf49f
commit 03345e8d21
22 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Game/Functions.cpp
View File

@ -419,9 +419,9 @@ namespace Game
if (!_stricmp(DB_GetXAssetTypeName(type), name))
{
// Col map workaround!
if (type == Game::XAssetType::ASSET_TYPE_COL_MAP_SP)
if (type == Game::XAssetType::ASSET_TYPE_CLIPMAP)
{
return Game::XAssetType::ASSET_TYPE_COL_MAP_MP;
return Game::XAssetType::ASSET_TYPE_CLIPMAP_PVS;
}
return type;

28
src/Game/Structs.hpp
View File

@ -15,36 +15,36 @@ namespace Game
{
ASSET_TYPE_PHYSPRESET = 0,
ASSET_TYPE_PHYS_COLLMAP = 1,
ASSET_TYPE_XANIM = 2,
ASSET_TYPE_XANIMPARTS = 2,
ASSET_TYPE_XMODELSURFS = 3,
ASSET_TYPE_XMODEL = 4,
ASSET_TYPE_MATERIAL = 5,
ASSET_TYPE_PIXELSHADER = 6,
ASSET_TYPE_VERTEXSHADER = 7,
ASSET_TYPE_VERTEXDECL = 8,
ASSET_TYPE_TECHSET = 9,
ASSET_TYPE_TECHNIQUE_SET = 9,
ASSET_TYPE_IMAGE = 10,
ASSET_TYPE_SOUND = 11,
ASSET_TYPE_SNDCURVE = 12,
ASSET_TYPE_SOUND_CURVE = 12,
ASSET_TYPE_LOADED_SOUND = 13,
ASSET_TYPE_COL_MAP_SP = 14,
ASSET_TYPE_COL_MAP_MP = 15,
ASSET_TYPE_COM_MAP = 16,
ASSET_TYPE_GAME_MAP_SP = 17,
ASSET_TYPE_GAME_MAP_MP = 18,
ASSET_TYPE_CLIPMAP = 14,
ASSET_TYPE_CLIPMAP_PVS = 15,
ASSET_TYPE_COMWORLD = 16,
ASSET_TYPE_GAMEWORLD_SP = 17,
ASSET_TYPE_GAMEWORLD_MP = 18,
ASSET_TYPE_MAP_ENTS = 19,
ASSET_TYPE_FX_MAP = 20,
ASSET_TYPE_GFX_MAP = 21,
ASSET_TYPE_LIGHTDEF = 22,
ASSET_TYPE_GFXWORLD = 21,
ASSET_TYPE_LIGHT_DEF = 22,
ASSET_TYPE_UI_MAP = 23,
ASSET_TYPE_FONT = 24,
ASSET_TYPE_MENUFILE = 25,
ASSET_TYPE_MENULIST = 25,
ASSET_TYPE_MENU = 26,
ASSET_TYPE_LOCALIZE = 27,
ASSET_TYPE_LOCALIZE_ENTRY = 27,
ASSET_TYPE_WEAPON = 28,
ASSET_TYPE_SNDDRIVERGLOBALS = 29,
ASSET_TYPE_SNDDRIVER_GLOBALS = 29,
ASSET_TYPE_FX = 30,
ASSET_TYPE_IMPACTFX = 31,
ASSET_TYPE_IMPACT_FX = 31,
ASSET_TYPE_AITYPE = 32,
ASSET_TYPE_MPTYPE = 33,
ASSET_TYPE_CHARACTER = 34,