zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more IW5 command and struct mistakes

Browse Source
This commit is contained in:
Jan 2021-07-24 10:54:13 +02:00
parent 29f72cde7a
commit 7afc5d42b0
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/Game/IW5/IW5_Assets.h
View File

@ -660,10 +660,16 @@ namespace IW5
float floatTime; float floatTime;
}; };
struct complex_s
{
float real;
float imag;
};
struct water_t struct water_t
{ {
WaterWritable writable; WaterWritable writable;
float* H0; complex_s* H0;
float* wTerm; float* wTerm;
int M; int M;
int N; int N;
@ -3370,6 +3376,8 @@ namespace IW5
SndAliasCustom projIgnitionSound; SndAliasCustom projIgnitionSound;
}; };
typedef tdef_align(4) AttSight AttSight4;
struct WeaponAttachment struct WeaponAttachment
{ {
const char* szInternalName; const char* szInternalName;
@ -3381,7 +3389,7 @@ namespace IW5
XModel** viewModels; XModel** viewModels;
XModel** reticleViewModels; XModel** reticleViewModels;
AttAmmoGeneral* ammogeneral; AttAmmoGeneral* ammogeneral;
AttSight* sight; AttSight4* sight;
AttReload* reload; AttReload* reload;
AttAddOns* addOns; AttAddOns* addOns;
AttGeneral* general; AttGeneral* general;

6
src/ZoneCode/Game/IW5/XAssets/AddonMapEnts.txt
View File

@ -6,6 +6,9 @@ set block XFILE_BLOCK_TEMP;
set string name; set string name;
set name name; set name name;
set count entityString numEntityChars; set count entityString numEntityChars;
set reusable info;
set count cmodels numSubModels;
set count models numSubModels;
// MapTriggers // MapTriggers
// see MapEnts // see MapEnts
@ -14,5 +17,4 @@ set count entityString numEntityChars;
// see clipMap_t // see clipMap_t
// cmodel2_t // cmodel2_t
use cmodel2_t; set reusable cmodel2_t::info;
set reusable info;

1
src/ZoneCode/Game/IW5/XAssets/GfxWorld.txt
View File

@ -70,6 +70,7 @@ set count reflectionProbes reflectionProbeCount;
set count reflectionProbeOrigins reflectionProbeCount; set count reflectionProbeOrigins reflectionProbeCount;
set block reflectionProbeTextures XFILE_BLOCK_RUNTIME; set block reflectionProbeTextures XFILE_BLOCK_RUNTIME;
set count reflectionProbeTextures reflectionProbeCount; set count reflectionProbeTextures reflectionProbeCount;
set count reflectionProbeReferenceOrigins reflectionProbeReferenceCount;
set count reflectionProbeReferences reflectionProbeReferenceCount; set count reflectionProbeReferences reflectionProbeReferenceCount;
set count lightmaps lightmapCount; set count lightmaps lightmapCount;
set block lightmapPrimaryTextures XFILE_BLOCK_RUNTIME; set block lightmapPrimaryTextures XFILE_BLOCK_RUNTIME;

4
src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
View File

@ -9,12 +9,16 @@ set count entityString numEntityChars;
// MapTriggers // MapTriggers
use MapTriggers; use MapTriggers;
set reusable models;
set count models count; set count models count;
set reusable hulls;
set count hulls hullCount; set count hulls hullCount;
set reusable slabs;
set count slabs slabCount; set count slabs slabCount;
// ClientTriggers // ClientTriggers
use ClientTriggers; use ClientTriggers;
set count clientTriggerAabbTree numClientTriggerNodes;
set count triggerString triggerStringLength; set count triggerString triggerStringLength;
set count triggerStringOffsets trigger::count; set count triggerStringOffsets trigger::count;
set count triggerType trigger::count; set count triggerType trigger::count;

1
src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt
View File

@ -88,6 +88,7 @@ set reusable visibleExp;
set reusable disabledExp; set reusable disabledExp;
set reusable textExp; set reusable textExp;
set reusable materialExp; set reusable materialExp;
set reusable textAlignYExp;
// itemDefData_t // itemDefData_t
use itemDefData_t; use itemDefData_t;

2
src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
View File

@ -161,7 +161,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart)
void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count) void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count)
{ {
assert(varXAsset != nullptr); assert(count == 0 || varXAsset != nullptr);
if (atStreamStart) if (atStreamStart)
m_stream->Load<XAsset>(varXAsset, count); m_stream->Load<XAsset>(varXAsset, count);