summaryrefslogtreecommitdiff
path: root/src/win95/chnktype.hpp
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2008-05-03 22:18:51 -0700
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:37 +0200
commite3070e708816c3a6ab61816c9cd0e242763b6aa2 (patch)
treeb01a3a27f42f1c91af3bd726112632c77324cb72 /src/win95/chnktype.hpp
parentd5c94a666b1e6049b6364863aa8c68d62a1310dd (diff)
Removed UseOldChunkLoader.
Diffstat (limited to 'src/win95/chnktype.hpp')
-rw-r--r--src/win95/chnktype.hpp25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/win95/chnktype.hpp b/src/win95/chnktype.hpp
index c35e8d4..b53a507 100644
--- a/src/win95/chnktype.hpp
+++ b/src/win95/chnktype.hpp
@@ -177,10 +177,6 @@ struct ChunkShape
int num_verts;
ChunkVectorInt * v_list;
- #if UseOldChunkLoader
- ChunkVector * float_v_list;
- #endif
-
//int num_vert_normals; //I don't think num_vert_normals is ever used
ChunkVectorFloat * v_normal_list;
@@ -195,7 +191,6 @@ struct ChunkShape
char ** texture_fns;
void rescale (double);
-
};
struct ChunkQuat
@@ -217,13 +212,8 @@ struct ObjectID
struct ChunkObject
{
-
ChunkVectorInt location;
- #if UseOldChunkLoader
- ChunkVector float_location;
- #endif
-
ChunkQuat orientation;
BOOL is_base_object;
@@ -233,7 +223,6 @@ struct ChunkObject
int index_num; //this won't get changed by update_my_chunkobject
ObjectID ID;
-
};
@@ -250,13 +239,8 @@ struct VMod_Arr_Item
int spare;
int object_index;
- #if UseOldChunkLoader
- char * o_name; //replaced by object_index
- #endif
-
friend BOOL operator==(const VMod_Arr_Item &, const VMod_Arr_Item &);
- friend BOOL operator!=(const VMod_Arr_Item &, const VMod_Arr_Item &);
-
+ friend BOOL operator!=(const VMod_Arr_Item &, const VMod_Arr_Item &);
};
struct Adjacent_Module
@@ -271,13 +255,8 @@ struct Adjacent_Module
ChunkVectorInt entry_point;
int object_index;
- #if UseOldChunkLoader
- char * o_name;
- #endif
-
friend BOOL operator==(const Adjacent_Module & am1, const Adjacent_Module & am2);
- friend BOOL operator!=(const Adjacent_Module & am1, const Adjacent_Module & am2);
-
+ friend BOOL operator!=(const Adjacent_Module & am1, const Adjacent_Module & am2);
};
class Shape_Chunk;