[mw-devel] MW3 r1152 - trunk/src

[welshbyte at sucs.org]

Author: welshbyte
Date: 2010-07-16 00:38:33 +0100 (Fri, 16 Jul 2010)
New Revision: 1152

Modified:
   trunk/src/bb.h
   trunk/src/rooms.c
   trunk/src/rooms.h
   trunk/src/sort.c
   trunk/src/talker_privs.c
Log:
Move struct room into rooms.h and remove struct room_vis_info altogether (nothing uses it)



Modified: trunk/src/bb.h
===================================================================
--- trunk/src/bb.h	2010-07-14 22:53:37 UTC (rev 1151)
+++ trunk/src/bb.h	2010-07-15 23:38:33 UTC (rev 1152)
@@ -151,24 +151,6 @@
 	int32_t posn;
 };
 
-struct room_vis_info
-{
-	char *name;
-	int32_t  rnum;
-};
-
-
-struct room
-{
-	int32_t num;				/* room number */
-	char *name;				/* room name */
-	char *desc;				/* description */
-	char *prompt;				/* alternate prompt */
-	int32_t hidden;				/* cant find room using 'room' command */
-	int32_t sproof;				/* soundproof? */
-	int32_t locked;				/* locked even if mudmode off? */
-};
-
 typedef struct gag_info
 {
 	char *name;			/* gag filter name */

Modified: trunk/src/rooms.c
===================================================================
--- trunk/src/rooms.c	2010-07-14 22:53:37 UTC (rev 1151)
+++ trunk/src/rooms.c	2010-07-15 23:38:33 UTC (rev 1152)
@@ -7,7 +7,6 @@
 #include <readline/readline.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "bb.h"
 #include <signal.h>
 #include "talker_privs.h"
 #include "talker.h"
@@ -18,6 +17,7 @@
 #include "sqlite.h"
 #include "user.h"
 #include "main.h"
+#include "rooms.h"
 
 extern unsigned long rights;
 #define MAX_ARGC 128

Modified: trunk/src/rooms.h
===================================================================
--- trunk/src/rooms.h	2010-07-14 22:53:37 UTC (rev 1151)
+++ trunk/src/rooms.h	2010-07-15 23:38:33 UTC (rev 1152)
@@ -1,8 +1,19 @@
 #ifndef ROOMS_H
 #define ROOMS_H
 
-#include "bb.h"
+#include <stdint.h>
 
+struct room
+{
+	int32_t num;				/* room number */
+	char *name;				/* room name */
+	char *desc;				/* description */
+	char *prompt;				/* alternate prompt */
+	int32_t hidden;				/* cant find room using 'room' command */
+	int32_t sproof;				/* soundproof? */
+	int32_t locked;				/* locked even if mudmode off? */
+};
+
 void RoomInit(struct room *room);
 void RoomDestroy(struct room *room);
 int LoadRoom(struct room *room, int num);

Modified: trunk/src/sort.c
===================================================================
--- trunk/src/sort.c	2010-07-14 22:53:37 UTC (rev 1151)
+++ trunk/src/sort.c	2010-07-15 23:38:33 UTC (rev 1152)
@@ -5,7 +5,6 @@
  *********************************************************/
 
 #include <stdio.h>
-#include "bb.h"
 #include "sort.h"
 
 static int IsBigger(struct listing *a, struct listing *b)

Modified: trunk/src/talker_privs.c
===================================================================
--- trunk/src/talker_privs.c	2010-07-14 22:53:37 UTC (rev 1151)
+++ trunk/src/talker_privs.c	2010-07-15 23:38:33 UTC (rev 1152)
@@ -4,6 +4,7 @@
 #include "talker_privs.h"
 #include "talker.h"
 #include "bb.h"
+#include "rooms.h"
 #include "gags.h"
 #include "main.h"
 #include "user.h"