Upd Headers

FAForever · Dec 18, 2022 · 20f64d6 · 20f64d6
1 parent fd41dce
commit 20f64d6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/section/include/global.h b/section/include/global.h
@@ -43,6 +43,7 @@ Get debugging info about a Lua call:
 #define g_EngineStats			GDecl(0x10A67B8, EngineStats*)
 #define g_WRenViewport			GDecl(0x10C7C28, WRenViewport*)
 #define g_ConsoleLuaState		GDecl(0x10A6478, LuaState*)
+#define g_Device			GDecl(0x0F8E284, Device*)
 
 #define ui_ProgressBarColor		GDecl(0x0F57BB8, int)
 #define ui_SelectTolerance		GDecl(0x0F57A90, float)
@@ -202,13 +203,19 @@ LuaObjectFinalize
 008F4260 D3DXEffect::EndPass ?
 00941D70 D3DXEffect::SetMatrix ?
 00941F60 D3DXEffect::SetTechnique
+00943A90 EffectVariableD3D9::SetMem(int len, float *ptr)
+00943E10 EffectVariableD3D9::SetMatrix4x4(float *ptr)
+00943550 EffectVariableD3D9::SetFloat(float *ptr)
+00452AF0 Vec3NormInPlace(float* ecx)
 008F5950 LockVertexBuffer
 008F5B40 UnlockVertexBuffer
 0081F7B0 GetLeftMouseButtonAction
 0081EC00 GetRightMouseButtonAction
 008B43F0 GetEntitiesUnderCursor ?
 00858D80 DisplayEconomyOverlay
 00430590 D3DGetDevice
+008E6730 GetDeviceD3D9
+00430590 GetCD3DDeviceVTbl**
 008D82F0 CreateBitArray2D
 008D8210 BitArray2DReset
 008D8200 DestroyBitArray2D
@@ -252,6 +259,7 @@ LuaObjectFinalize
 007AA9C0 CreateCamera
 007A7950 InitCamera
 007A7DC0 DestroyCamera
+0086E060 InitCameraDragger
 00749F40 SimBeat
 0073DAD0 SimSync
 00894530 UserSync
@@ -282,13 +290,18 @@ LuaObjectFinalize
 005289D0 RegisterBlueprint(RRuleGameRules*, char* Category)
 007FA230 CreateWRenViewport
 007F66A0 InitWRenViewport
+007F90D0 TerrainRender
+008015C0 SetTerrainVariables
+007D2EA0 SetCartographicVariables
+007E19D0 SetMeshVariables
 007EDFE0 GenerateRingCylinders
 007EF5A0 RenderRings
 005779C0 CreateMapData
 004783D0 CreateTerrainHeights
 00577890 InitSTIMap
 005790E0 CreateCHeightField
-0044FB90 GetTerrainHeight(float x, float z):int ecx
+0044FB90 GetTerrainHeight(MapData*, float x, float z):int ecx
+00758E10 GetTerrainType(STIMap* eax, int esi X, int edi Z):LuaObject ebx
 0074B120 FlattenTerrain(STIMap*, int Rect*, float Height)
 00476BB0 UpdateMinimap(MapData*, int x1, int y1, int x2, int y2)
 00890DA0 MapLoad

diff --git a/section/include/moho.h b/section/include/moho.h
@@ -864,6 +864,7 @@ struct ReconBlip : Entity
 	void *armyesData[]; //size 0x34
 };
 
+struct STIMap;
 struct Sim // : ICommandSink
 {	// 0xAF8 bytes
 	void *vtable;
@@ -877,11 +878,11 @@ struct Sim // : ICommandSink
 	void *CEffectManager;	// 0x18 bytes
 	void *CSimSoundManager; // 0x720 bytes
 	RRuleGameRules *rules;	// From CSimDriver.LaunchInfoNew
-	void *STIMap;		// From CSimDriver.LaunchInfoNew
+	STIMap *STIMap;		// From CSimDriver.LaunchInfoNew
 	CSimResources *res;
 	uint8_t pad3[4];
 	// at 0x8D8
-	LuaState *state;
+	LuaState *LState;
 	uint8_t pad4[0xA];
 	// at 0x8E6
 	bool cheatsEnabled;
@@ -1020,31 +1021,39 @@ struct CHeightField // : class detail::boost::sp_counted_base
 
 struct MapData
 {	// 0x1C bytes
-	uint32_t* TerrainHeights; // Word(TerrainHeights+(Y*SizeX+X)*2)
+	uint32_t *TerrainHeights; // Word(TerrainHeights+(Y*SizeX+X)*2)
 	int SizeX; // +1
 	int SizeY; // +1
 };
 
 struct STIMap
 {	// 0x1548 bytes
-	MapData* MapData;
-	CHeightField* HeightField;
+	MapData *MapData;
+	CHeightField *HeightField;
+	uint32_t unk1[4];
 	// at 0x18
-	//list Data; -> Data
+	void *beginData;
+	void *endData;
+	void *endData2;
+	void *beginData2;
 	// at 0x28
-	char Data[0x1400];
-	char* TerrainTypes; // TerrainTypes+(Y*SizeX+X)
+	LuaObject Data[0x100]; // Type desc tables
+	uint8_t *TerrainTypes; // TerrainTypes+(Y*SizeX+X)
 	int SizeX;
 	int SizeY;
+	uint8_t unk2[0x100];
 	// at 0x1534
-	bool Water;
-	// at 0x1538
+	BOOL Water;
 	float WaterLevel;
+	float DepthLevel;
+	float AbyssLevel;
+	uint32_t unk3;
 };
+VALIDATE_SIZE(STIMap, 0x1548);
 
 struct CPushTask
 {
-	char datas[0x24];
+	char data[0x24];
 };
 
 typedef CPushTask CPullTask;