[Mistmud-commits] mistmud Makefile,1.5.2.1,1.5.2.2 act.wizard.c,1.7.2.7,1.7.2.8 board.c,1.2,1.2.2.1 db.c,1.4.2.7,1.4.2.8 db.h,1.1.1.1,1.1.1.1.4.1 interpreter.c,1.18.2.4,1.18.2.5 protos.h,1.8.2.8,1.8.2.9

[<gjh...@us...>]

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31207

Modified Files:
      Tag: rev_1_3
	Makefile act.wizard.c board.c db.c db.h interpreter.c protos.h 
Log Message:
- make compile with newer gcc/glibc



Index: Makefile
===================================================================
RCS file: /cvsroot/mistmud/mistmud/Makefile,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** Makefile	31 Aug 2003 05:49:39 -0000	1.5.2.1
--- Makefile	4 Mar 2004 00:22:11 -0000	1.5.2.2
***************
*** 19,23 ****
  ##  these are architecture dependent flags
  TITANFLAGS = -g -43 -vector_c -safe=ptrs -DTITAN
! MYFLAGS = -ggdb3 -m486 -mno-fp-ret-in-387 
  ##
  CFLAGS = $(MYFLAGS) $(CPPFLAGS)
--- 19,23 ----
  ##  these are architecture dependent flags
  TITANFLAGS = -g -43 -vector_c -safe=ptrs -DTITAN
! MYFLAGS = -g -O6 #-Wall #-Wall
  ##
  CFLAGS = $(MYFLAGS) $(CPPFLAGS)

Index: act.wizard.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/act.wizard.c,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** act.wizard.c	2 Sep 2003 06:59:58 -0000	1.7.2.7
--- act.wizard.c	4 Mar 2004 00:22:11 -0000	1.7.2.8
***************
*** 2221,2241 ****
  
      if (!strcmp(item, "help")) {
!         send_to_char("Help for Oedit. Command line Parameters OEDIT <NAME> <FIELD> <VALUE>\r
! List of Fields :\r
! ldesc  = Long Item description | sdesc  = Short description\r
! extra  = Extra descriptions*NI*| name   = Item name\r
! wflags = wear flags            | afflags= affect flags\r
! exflags= extra flags           | weight = item weight\r
! cost   = item cost to rent per day\r
! value  = Item value if sold    | timer  = item timer\r
! type   = item type\r
! v0     = value[0] of item      | v1     = value[1] of item\r
! v2     = value[2] of item      | v3     = value[3] of item\r
! aff1   = special affect 1 (requires another value, oedit aff1 <modifer> <type>)\r
! aff2   = special affect 2      | aff3   = special affect 3\r
! aff4   = special affect 4      | aff5   = special affect 5\r
! speed  = speed of weapon       | ego    = level of item \r
! max    = max of item           | fullness = Show container fullness? 0=Yes, 1=No *NI*\r
! \rNote: NI = Not implemented.\n\r",
                       ch);
          return;
--- 2221,2241 ----
  
      if (!strcmp(item, "help")) {
!         send_to_char("Help for Oedit. Command line Parameters OEDIT <NAME> <FIELD> <VALUE>\r"
! "List of Fields :\r"
! "ldesc  = Long Item description | sdesc  = Short description\r"
! "extra  = Extra descriptions*NI*| name   = Item name\r"
! "wflags = wear flags            | afflags= affect flags\r"
! "exflags= extra flags           | weight = item weight\r"
! "cost   = item cost to rent per day\r"
! "value  = Item value if sold    | timer  = item timer\r"
! "type   = item type\r"
! "v0     = value[0] of item      | v1     = value[1] of item\r"
! "v2     = value[2] of item      | v3     = value[3] of item\r"
! "aff1   = special affect 1 (requires another value, oedit aff1 <modifer> <type>)\r"
! "aff2   = special affect 2      | aff3   = special affect 3\r"
! "aff4   = special affect 4      | aff5   = special affect 5\r"
! "speed  = speed of weapon       | ego    = level of item \r"
! "max    = max of item           | fullness = Show container fullness? 0=Yes, 1=No *NI*\r"
! "\rNote: NI = Not implemented.\n\r",
                       ch);
          return;
***************
*** 5302,5309 ****
           */
  
!         send_to_char("You are struck by a black beam from above, it hurts!\r
! The life force from your body fades and you feel yourself lose\r
! memories of old times and battles.\r
! The feeling fades and you shiver at a cold gust of wind.\n\r",
                       victim);
  
--- 5302,5309 ----
           */
  
!         send_to_char("You are struck by a black beam from above, it hurts!\r"
! "The life force from your body fades and you feel yourself lose\r"
! "memories of old times and battles.\r"
! "The feeling fades and you shiver at a cold gust of wind.\n\r",
                       victim);
  
***************
*** 5343,5348 ****
      if (!*arg) {
          send_to_char("Eh? What do you wanna intervene upon?\n\r", ch);
!         send_to_char("interven [type]
! (Type=portal,summon,astral,kill,logall,eclipse,dns,color,wizlock,nopoly,req,rp,worldarena, deinit )\n\r\n\r", ch);
          return;
      }
--- 5343,5348 ----
      if (!*arg) {
          send_to_char("Eh? What do you wanna intervene upon?\n\r", ch);
!         send_to_char("interven [type]"
! "(Type=portal,summon,astral,kill,logall,eclipse,dns,color,wizlock,nopoly,req,rp,worldarena, deinit )\n\r\n\r", ch);
          return;
      }
***************
*** 5354,5359 ****
                  ("You part the planets and the sun shines through!\n", ch);
              send_to_outdoor
!                 ("The planets return to their normal orbit, slowly
! the light will return.\n");
              log("The world is enlightend");
          } else {
--- 5354,5358 ----
                  ("You part the planets and the sun shines through!\n", ch);
              send_to_outdoor
!                 ("The planets return to their normal orbit, slowly the light will return.\n");
              log("The world is enlightend");
          } else {

Index: board.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/board.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** board.c	10 Aug 2003 02:11:56 -0000	1.2
--- board.c	4 Mar 2004 00:22:11 -0000	1.2.2.1
***************
*** 397,401 ****
      if (!the_file) {
        sprintf(buf,"Can't open message file for board %d.\n\r",bnum);
!       log(buf,0);
        continue;
      }
--- 397,401 ----
      if (!the_file) {
        sprintf(buf,"Can't open message file for board %d.\n\r",bnum);
!       log(buf);
        continue;
      }

Index: db.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/db.c,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -C2 -d -r1.4.2.7 -r1.4.2.8
*** db.c	2 Sep 2003 07:11:07 -0000	1.4.2.7
--- db.c	4 Mar 2004 00:22:11 -0000	1.4.2.8
***************
*** 4986,4991 ****
                      script_data[top_of_scripts].script =
                          (struct foo_data *)
!                         malloc(script_data[top_of_scripts].script,
!                                sizeof(struct foo_data));
                  } else {
                      script_data[top_of_scripts].script =
--- 4986,4990 ----
                      script_data[top_of_scripts].script =
                          (struct foo_data *)
!                         malloc(sizeof(struct foo_data));
                  } else {
                      script_data[top_of_scripts].script =

Index: db.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/db.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1
*** db.h	8 Jul 2003 19:19:19 -0000	1.1.1.1
--- db.h	4 Mar 2004 00:22:11 -0000	1.1.1.1.4.1
***************
*** 2,6 ****
--- 2,8 ----
  /* data files used by the game system */
  
+ #ifndef RLIMIT_OFILE
  #define RLIMIT_OFILE      99999
+ #endif
  #define DFLT_DIR          "../lib"           /* default data directory     */
  

Index: interpreter.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/interpreter.c,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -C2 -d -r1.18.2.4 -r1.18.2.5
*** interpreter.c	5 Sep 2003 20:31:57 -0000	1.18.2.4
--- interpreter.c	4 Mar 2004 00:22:11 -0000	1.18.2.5
***************
*** 210,215 ****
  
      if (HasClass(ch, TempDis) && GetMaxLevel(ch) < 58 && IS_PC(ch)) {
!         send_to_char("Sorry, we are tracking down a bug and this class or one of
! your classes is disabled.\n\r",
                       ch);
          return;
--- 210,214 ----
  
      if (HasClass(ch, TempDis) && GetMaxLevel(ch) < 58 && IS_PC(ch)) {
!         send_to_char("Sorry, we are tracking down a bug and this class or one of your classes is disabled.\n\r",
                       ch);
          return;
***************
*** 365,370 ****
                      if (IS_SET(ch->specials.act, ACT_POLYSELF)
                          || IS_PC(ch)) {
!                         send_to_char("You have been frozen in your steps, you cannot do a
! thing!\n\r", ch);
                          return;
                      }
--- 364,368 ----
                      if (IS_SET(ch->specials.act, ACT_POLYSELF)
                          || IS_PC(ch)) {
!                         send_to_char("You have been frozen in your steps, you cannot do a thing!\n\r", ch);
                          return;
                      }

Index: protos.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/protos.h,v
retrieving revision 1.8.2.8
retrieving revision 1.8.2.9
diff -C2 -d -r1.8.2.8 -r1.8.2.9
*** protos.h	2 Sep 2003 07:37:40 -0000	1.8.2.8
--- protos.h	4 Mar 2004 00:22:11 -0000	1.8.2.9
***************
*** 2043,2046 ****
--- 2043,2047 ----
  int strn_cmp(char *arg1, char *arg2, int n);
  void log_sev(char *str,int sev);
+ void log(char *str);
  void slog(char *str);
  void sprintbit(unsigned long vektor, char *names[], char *result);