[ViewVC] Diff of: cvs/deliantra/server/include/global.h

Comparing deliantra/server/include/global.h (file contents):
Revision 1.24 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.28 by root, Fri Dec 15 20:08:45 2006 UTC

     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The author can be reached via e-mail to crossfire-devel@real-time.com
+    The author can be reached via e-mail to crossfire@schmorp.de
 */
 #ifndef GLOBAL_H
 #define GLOBAL_H
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
 #include "util.h"
 #include "shstr.h"
-#include "newclient.h"
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
 /* Include the basic defines from spells.h */
 #include "attack.h" /* needs to be before material.h */
 #include "tod.h"
 #include "skills.h"
 /* Pull in the socket structure - used in the player structure */
-#include "newserver.h"
+#include "network.h"
+#include "client.h"
 /* Pull in the player structure */
 #include "player.h"
 /* pull in treasure structure */
 extern New_Face *blank_face, *empty_face;
 extern New_Face *dark_faces[];
 extern New_Face *smooth_face;
-extern NewSocket *init_sockets;
+extern client *init_sockets;
 #include "libproto.h"
 #include "sockproto.h"
 #define decrease_ob(xyz) decrease_ob_nr(xyz,1)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines