Update of /cvsroot/agd/server/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31446
Modified Files:
main.c net.c lpc_incl.h lpc.h
Log Message:
Small, subtle changes.
Index: net.c
===================================================================
RCS file: /cvsroot/agd/server/src/net.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- net.c 21 Mar 2004 16:37:06 -0000 1.12
+++ net.c 28 Mar 2004 17:57:04 -0000 1.13
@@ -2,6 +2,7 @@
net.c - network communication
started in summer 2003
*/
+
#include <stdio.h>
#include <string.h>
#include "sys.h"
@@ -11,8 +12,8 @@
#include "array.h"
#include "lpc.h"
#include "object.h"
-#include "interpret.h"
#include "net.h"
+#include "interpret.h"
#include <errno.h>
@@ -117,7 +118,7 @@
if(!login_ob->u.ob) {
fprintf(stderr, "Warning: master::connect() didn't return an object.\n");
- do_write("Oops, glitch in world fabric - you didn't get an object.\n");
+ do_write("Oops, glitch in world fabric - you didn't get a login object.\n");
xfree(player_ob);
net_disconnect(p);
return;
Index: lpc_incl.h
===================================================================
RCS file: /cvsroot/agd/server/src/lpc_incl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lpc_incl.h 21 Mar 2004 08:56:52 -0000 1.5
+++ lpc_incl.h 28 Mar 2004 17:57:10 -0000 1.6
@@ -6,8 +6,8 @@
#include "lpc.h"
#include "object.h"
#include "compile.h"
-#include "interpret.h"
#include "net.h"
+#include "interpret.h"
#include "dfuns.h"
#include "vars.h"
Index: lpc.h
===================================================================
RCS file: /cvsroot/agd/server/src/lpc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lpc.h 15 Mar 2004 18:49:30 -0000 1.6
+++ lpc.h 28 Mar 2004 17:57:10 -0000 1.7
@@ -21,9 +21,9 @@
#define ST_STATIC 2
typedef struct variable_t {
- int type;
+ unsigned char type;
char *name;
- int string_type;
+ char string_type;
union {
long int i;
#if 0
Index: main.c
===================================================================
RCS file: /cvsroot/agd/server/src/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- main.c 21 Mar 2004 14:06:23 -0000 1.16
+++ main.c 28 Mar 2004 17:57:04 -0000 1.17
@@ -1,7 +1,7 @@
/*
Adventure Game Driver - a graphical MUD driver with AGI-like
graphics, using LPC for scripting
- Copyright (C) 2003, 2004 Peep Pullerits (so...@es...)
+ Copyright (C) 2003, 2004 Peep Pullerits <so...@es...>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -32,6 +32,9 @@
#include "object.h"
#include "compile.h"
+#include "net.h"
+#include "interpret.h"
+
extern object_t *master;
static char *conf_file;
@@ -52,7 +55,7 @@
/* We generally do not want to debug the crash function. Causes unnecessary spam. */
dont_debug_interpreter = 1;
#endif
-
+
if(master) {
if(!apply(master, "crash", "i", sig))
fprintf(stderr, "master::crash() failed.\n");
|
