Skip to content

Commit 334f56a

Browse files
committed
build(heightmap): Fix include paths in Zero Hour Height Map files (#1991)
1 parent c110a0e commit 334f56a

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "vertmaterial.h"
3535
#include "Lib/BaseType.h"
3636
#include "Common/GameType.h"
37-
#include "WorldHeightMap.h"
37+
#include "W3DDevice/GameClient/WorldHeightMap.h"
3838

3939
#define MAX_ENABLED_DYNAMIC_LIGHTS 20
4040
typedef UnsignedByte HeightSampleType; //type of data to store in heightmap

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "vertmaterial.h"
3535
#include "Lib/BaseType.h"
3636
#include "Common/GameType.h"
37-
#include "WorldHeightMap.h"
38-
#include "BaseHeightMap.h"
37+
#include "W3DDevice/GameClient/WorldHeightMap.h"
38+
#include "W3DDevice/GameClient/BaseHeightMap.h"
3939

4040
class W3DTerrainBackground;
4141
/// Custom render object that draws the heightmap and handles intersection tests.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "vertmaterial.h"
3535
#include "Lib/BaseType.h"
3636
#include "Common/GameType.h"
37-
#include "WorldHeightMap.h"
38-
#include "BaseHeightMap.h"
37+
#include "W3DDevice/GameClient/WorldHeightMap.h"
38+
#include "W3DDevice/GameClient/BaseHeightMap.h"
3939

4040
#define VERTEX_BUFFER_TILE_LENGTH 32 //tiles of side length 32 (grid of 33x33 vertices).
4141

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "WWLib/refcount.h"
3434
#include "WWMath/vector3.h"
3535
#include "W3DDevice/GameClient/TileData.h"
36-
#include "../../GameEngine/Include/Common/MapObject.h"
36+
#include "Common/MapObject.h"
3737

3838
#include "Common/STLTypedefs.h"
3939
typedef std::vector<ICoord2D> VecICoord2D;

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#include <d3dx8core.h>
5858
#include "Common/GlobalData.h"
5959
#include "Common/PerfTimer.h"
60+
#include "Common/Xfer.h"
6061

6162
#include "GameClient/TerrainVisual.h"
6263
#include "GameClient/View.h"

0 commit comments

Comments
 (0)