libzoom: Added gates to level loader;

zoom: Added gate to level; some Makefile.am changes

2 files changed, 21 insertions, 17 deletions

diff --git a/zoom/level.h b/zoom/level.h
index 49de407..a389f71 100644
--- a/zoom/level.h
+++ b/zoom/level.h
@@ -5,21 +5,32 @@
 #include <zoom/types.h>

 #include <zoom/render.h>

 

-typedef struct _GATEINFO {

+/*typedef struct _GATEINFO {

 	unsigned short state;

 	unsigned short timer;

-} GATEINFO;

+} GATEINFO;*/

 

 typedef struct _ROOM {

+  char *id;

   int nWalls;

-  int nThings;

-  int nGates;

+  //int nThings;

+  //int nGates;

   WALL *walls;

-  THING *things;

-  GATE *gates;

-  GATEINFO *gateinfo;

+  //THING *things;

+  //GATE *gates;

+  //GATEINFO *gateinfo;

 } ROOM;

 

+typedef struct _GATE {

+  //unsigned char type;

+  //unsigned char open;

+  int nWalls;

+  WALL *walls;

+  //VERTEX point;

+  ROOM *room1, *room2;

+  int gate;

+} GATE;

+

 typedef struct _LEVELINFO {

   char *name;

   char *desc;

@@ -35,6 +46,8 @@ typedef struct _LEVEL {
   LEVELINFO *info;

   int nRooms;

   ROOM *rooms;

+  int nGates;

+  GATE *gates;

   int nTextures;

   TEXTURE *textures;

 } LEVEL;

diff --git a/zoom/types.h b/zoom/types.h
index 4c86190..3feb5a3 100644
--- a/zoom/types.h
+++ b/zoom/types.h
@@ -23,7 +23,7 @@
 

 #pragma pack(push, 2)

 typedef struct WALL {

-	unsigned char type;

+	//unsigned char type;

 	unsigned char visible;

 	union {

 		TRIANGLE triangle;

@@ -42,15 +42,6 @@ typedef struct _THING {
 	unsigned char visible;

 	VERTEX pos;

 } THING;

-

-typedef struct _GATE {

-	unsigned char type;

-	unsigned char open;

-	WALL walls[2];

-	VERTEX point;

-	int room;

-	int gate;

-} GATE;

 #pragma pack(pop)

 

 #endif