mistmud-commits — MistMUD CVS Commits

[Mistmud-commits] mistmud comm.c,1.9.2.2,1.9.2.3

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

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

Modified Files:
      Tag: rev_1_3
	comm.c 
Log Message:
- fix a minor bug on a call to log()



Index: comm.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/comm.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** comm.c	2 Sep 2003 07:08:27 -0000	1.9.2.2
--- comm.c	4 Mar 2004 00:33:55 -0000	1.9.2.3
***************
*** 844,848 ****
              tbuf[strl] = txt[strl];
          tbuf[strl] = 0;
!         log(strl);
          if (new)
              free(new);
--- 844,848 ----
              tbuf[strl] = txt[strl];
          tbuf[strl] = 0;
!         log(tbuf);
          if (new)
              free(new);

[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);

[Mistmud-commits] mistmud create.obj.c,1.2,1.3

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

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

Modified Files:
	create.obj.c 
Log Message:
- fixed unterminated string constant



Index: create.obj.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/create.obj.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** create.obj.c	17 Aug 2003 03:20:10 -0000	1.2
--- create.obj.c	4 Mar 2004 00:06:31 -0000	1.3
***************
*** 1432,1438 ****
  	case ITEM_TREE:
       if(value==0)
!        send_to_char("\n\rTrees are found by name search, make sure to set name before tree keyword.
!        				 \n\rExample: 'Rufus tree'.  Don't do: 'tree Rufus'.
!        				 \n\rValue not used for this item type.\n\r",ch);
       else
         send_to_char("\n\rValue not used for this item type.\n\r",ch);
--- 1432,1438 ----
  	case ITEM_TREE:
       if(value==0)
!        send_to_char("\n\rTrees are found by name search, make sure to set name before tree keyword."
! 		 "\n\rExample: 'Rufus tree'.  Don't do: 'tree Rufus'."
! 		 "\n\rValue not used for this item type.\n\r",ch);
       else
         send_to_char("\n\rValue not used for this item type.\n\r",ch);

[Mistmud-commits] mistmud act.wizard.c,1.9,1.10 interpreter.c,1.19,1.20

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

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

Modified Files:
	act.wizard.c interpreter.c 
Log Message:
- removed some unterminated string constant errors



Index: act.wizard.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/act.wizard.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** act.wizard.c	17 Aug 2003 03:20:10 -0000	1.9
--- act.wizard.c	4 Mar 2004 00:00:39 -0000	1.10
***************
*** 2183,2203 ****
  
      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;
--- 2183,2203 ----
  
      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;
***************
*** 5223,5230 ****
           */
  
!         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);
  
--- 5223,5230 ----
           */
  
!         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);
  
***************
*** 5264,5269 ****
      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;
      }
--- 5264,5269 ----
      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;
      }
***************
*** 5275,5280 ****
                  ("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 {
--- 5275,5280 ----
                  ("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: interpreter.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/interpreter.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** interpreter.c	5 Sep 2003 20:40:52 -0000	1.19
--- interpreter.c	4 Mar 2004 00:00:39 -0000	1.20
***************
*** 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,369 ----
                      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;
                      }

[Mistmud-commits] mistmud board.c,1.2,1.3 comm.c,1.9,1.10 db.h,1.1.1.1,1.2 protos.h,1.11,1.12

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

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

Modified Files:
	board.c comm.c db.h protos.h 
Log Message:
- make it so log() doesn't complain, it will be renamed soon



Index: board.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/board.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** board.c	10 Aug 2003 02:11:56 -0000	1.2
--- board.c	3 Mar 2004 23:44:53 -0000	1.3
***************
*** 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: comm.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/comm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** comm.c	10 Aug 2003 02:11:56 -0000	1.9
--- comm.c	3 Mar 2004 23:44:53 -0000	1.10
***************
*** 768,772 ****
      log("strlen returned bogus length in write_to_q, string was: ");
      for(strl=0;strl<120;strl++) tbuf[strl]=txt[strl]; tbuf[strl]=0;
!     log(strl);
  	if (new)
  	    free(new);
--- 768,772 ----
      log("strlen returned bogus length in write_to_q, string was: ");
      for(strl=0;strl<120;strl++) tbuf[strl]=txt[strl]; tbuf[strl]=0;
!     log(tbuf);
  	if (new)
  	    free(new);

Index: db.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/db.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** db.h	8 Jul 2003 19:19:19 -0000	1.1.1.1
--- db.h	3 Mar 2004 23:44:53 -0000	1.2
***************
*** 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: protos.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/protos.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** protos.h	2 Sep 2003 07:36:18 -0000	1.11
--- protos.h	3 Mar 2004 23:44:53 -0000	1.12
***************
*** 2046,2049 ****
--- 2046,2050 ----
  int strn_cmp(char *arg1, char *arg2, int n);
  void log_sev(char *str,int sev);
+ void log(char *s);
  void slog(char *str);
  void sprintbit(unsigned long vektor, char *names[], char *result);

[Mistmud-commits] mistmud db.c,1.4,1.5

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

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

Modified Files:
	db.c 
Log Message:
- make it compile with a newer gcc/glibc.  there was a faulty malloc call



Index: db.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/db.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** db.c	10 Aug 2003 02:11:56 -0000	1.4
--- db.c	3 Mar 2004 23:13:00 -0000	1.5
***************
*** 4946,4951 ****
                      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 =
--- 4946,4950 ----
                      script_data[top_of_scripts].script =
                          (struct foo_data *)
!                         malloc(sizeof(struct foo_data));
                  } else {
                      script_data[top_of_scripts].script =

[Mistmud-commits] mistmud Makefile,1.5,1.6

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

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

Modified Files:
	Makefile 
Log Message:
- changed CFLAGS to -g -O6



Index: Makefile
===================================================================
RCS file: /cvsroot/mistmud/mistmud/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	10 Aug 2003 02:11:55 -0000	1.5
--- Makefile	3 Mar 2004 23:12:27 -0000	1.6
***************
*** 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,24 ----
  ##  these are architecture dependent flags
  TITANFLAGS = -g -43 -vector_c -safe=ptrs -DTITAN
! #MYFLAGS = -ggdb3 -m486 -mno-fp-ret-in-387 
! MYFLAGS = -g -O6 #-Wall #-Werror
  ##
  CFLAGS = $(MYFLAGS) $(CPPFLAGS)

[Mistmud-commits] mistmud version.h,1.11,1.12

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv29677

Modified Files:
	version.h 
Log Message:
- bump a version



Index: version.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/version.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** version.h	2 Sep 2003 07:36:44 -0000	1.11
--- version.h	5 Sep 2003 20:41:25 -0000	1.12
***************
*** 2,6 ****
  #define _version_h
  
! #define VERSION "1.2.5"
  
  #endif
--- 2,6 ----
  #define _version_h
  
! #define VERSION "1.2.6"
  
  #endif

[Mistmud-commits] mistmud interpreter.c,1.18,1.19

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv29272

Modified Files:
	interpreter.c 
Log Message:
- force chars in creation to do their race before class
- log the room number that commands are entered in, help debugging
- partial merge from 1.3.20



Index: interpreter.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/interpreter.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** interpreter.c	10 Aug 2003 02:11:56 -0000	1.18
--- interpreter.c	5 Sep 2003 20:40:52 -0000	1.19
***************
*** 270,274 ****
      }
  
!     sprintf(buf, "!!%s:%s", ch->player.name, argument);
      slog(buf);
  
--- 270,274 ----
      }
  
!     sprintf(buf, "!![%d] %s:%s", ch->in_room, ch->player.name, argument);
      slog(buf);
  
***************
*** 2338,2341 ****
--- 2338,2346 ----
              break;
          case '4':
+             if( GET_RACE(d->character) == 0 ) {
+                 SEND_TO_Q("\n\rPlease choose your race first.\n\r", d );
+                 EnterState( d, CON_CREATION_MENU );
+                 break;
+             }
              GET_ALIGNMENT(d->character) = 0;
              send_to_char("class", d->character);

[Mistmud-commits] mistmud utility.c,1.9,1.10

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv28207

Modified Files:
	utility.c 
Log Message:
- make drows only hate one race - all that the code allows



Index: utility.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/utility.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** utility.c	2 Sep 2003 07:36:19 -0000	1.9
--- utility.c	5 Sep 2003 20:34:20 -0000	1.10
***************
*** 3819,3824 ****
--- 3819,3827 ----
  
          case RACE_DROW:
+ #if 0
              AddHatred(mob, OP_RACE,
                        RACE_HIGH_ELF + RACE_SYLVAN_ELF + RACE_GREY_ELF);
+ #endif
+             AddHatred(mob, OP_RACE, RACE_HIGH_ELF);
              break;
          case RACE_SKEXIE:

[Mistmud-commits] mistmud version.h,1.7.2.18,1.7.2.19

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv28077

Modified Files:
      Tag: rev_1_3
	version.h 
Log Message:
- bumped a version



Index: version.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/version.h,v
retrieving revision 1.7.2.18
retrieving revision 1.7.2.19
diff -C2 -d -r1.7.2.18 -r1.7.2.19
*** version.h	2 Sep 2003 07:38:13 -0000	1.7.2.18
--- version.h	5 Sep 2003 20:33:17 -0000	1.7.2.19
***************
*** 2,6 ****
  #define _version_h
  
! #define VERSION "1.3.19"
  
  #endif
--- 2,6 ----
  #define _version_h
  
! #define VERSION "1.3.20"
  
  #endif

[Mistmud-commits] mistmud utility.c,1.5.2.10,1.5.2.11

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv27937

Modified Files:
      Tag: rev_1_3
	utility.c 
Log Message:
- make drows only hate one race as that's all that's allowed in the current code



Index: utility.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/utility.c,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -C2 -d -r1.5.2.10 -r1.5.2.11
*** utility.c	2 Sep 2003 07:37:40 -0000	1.5.2.10
--- utility.c	5 Sep 2003 20:32:56 -0000	1.5.2.11
***************
*** 3323,3328 ****
--- 3323,3331 ----
  
          case RACE_DROW:
+ #if 0
              AddHatred(mob, OP_RACE,
                        RACE_HIGH_ELF + RACE_SYLVAN_ELF + RACE_GREY_ELF);
+ #endif
+             AddHatred(mob, OP_RACE, RACE_HIGH_ELF);
              break;
          case RACE_SKEXIE:

[Mistmud-commits] mistmud interpreter.c,1.18.2.3,1.18.2.4

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv27765

Modified Files:
      Tag: rev_1_3
	interpreter.c 
Log Message:
- force a character in creation to do their race before their class



Index: interpreter.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/interpreter.c,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C2 -d -r1.18.2.3 -r1.18.2.4
*** interpreter.c	1 Sep 2003 15:55:56 -0000	1.18.2.3
--- interpreter.c	5 Sep 2003 20:31:57 -0000	1.18.2.4
***************
*** 2335,2338 ****
--- 2335,2343 ----
              break;
          case '4':
+             if( GET_RACE(d->character) == 0 ) {
+                 SEND_TO_Q("\n\rPlease choose your race first.\n\r", d );
+                 EnterState( d, CON_CREATION_MENU );
+                 break;
+             }
              GET_ALIGNMENT(d->character) = 0;
              send_to_char("class", d->character);

[Mistmud-commits] mistmud coins.c,1.1.2.2,1.1.2.3

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv27459

Modified Files:
      Tag: rev_1_3
	coins.c 
Log Message:
- make PayToFrom() remove extra coins from biggest to smallest, gets rid of
  as many coins as possible



Index: coins.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/Attic/coins.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** coins.c	1 Sep 2003 15:53:06 -0000	1.1.2.2
--- coins.c	5 Sep 2003 20:31:14 -0000	1.1.2.3
***************
*** 129,133 ****
      remValue = totValue - amount;
  
!     for( i = 0; i < MAX_COIN_TYPE && remValue > 0; i++ ) {
          count = remValue / coinDef[i].value;
          has = MAX( MIN( coins[i], count ), 0 );
--- 129,133 ----
      remValue = totValue - amount;
  
!     for( i = MAX_COIN_TYPE - 1; i >= 0 && remValue > 0; i-- ) {
          count = remValue / coinDef[i].value;
          has = MAX( MIN( coins[i], count ), 0 );

[Mistmud-commits] mistmud act.other.c,1.7.2.2,1.7.2.3

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv27265

Modified Files:
      Tag: rev_1_3
	act.other.c 
Log Message:
- make do_steal() use the new currency scheme (missed a spot)



Index: act.other.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/act.other.c,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -d -r1.7.2.2 -r1.7.2.3
*** act.other.c	31 Aug 2003 05:49:39 -0000	1.7.2.2
--- act.other.c	5 Sep 2003 20:30:12 -0000	1.7.2.3
***************
*** 805,814 ****
               * Steal some gold coins 
               */
!             gold = (int) ((GET_GOLD(victim) * number(1, 10)) / 100);
              gold = MIN(number(1000, 2000), gold);
              if (gold > 0) {
!                 GET_GOLD(ch) += gold;
!                 GET_GOLD(victim) -= gold;
!                 sprintf(buf, "Bingo! You got %d gold coins.\n\r", gold);
                  send_to_char(buf, ch);
                  if (IS_PC(ch) && IS_PC(victim)) {
--- 805,813 ----
               * Steal some gold coins 
               */
!             gold = (int) ((ConvertToCopperCoins(victim) * number(1, 10)) / 100);
              gold = MIN(number(1000, 2000), gold);
              if (gold > 0) {
!                 PayFromTo(victim, ch, gold);
!                 sprintf(buf, "Bingo! You got %d  coins.\n\r", gold);
                  send_to_char(buf, ch);
                  if (IS_PC(ch) && IS_PC(victim)) {

[Mistmud-commits] mistmud act.off.c,1.5.2.1,1.5.2.2

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv27062

Modified Files:
      Tag: rev_1_3
	act.off.c 
Log Message:
- reformat
- change slay to actually work at 57
- add skills check to disengage.



Index: act.off.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/act.off.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** act.off.c	22 Aug 2003 21:55:31 -0000	1.5.2.1
--- act.off.c	5 Sep 2003 20:29:24 -0000	1.5.2.2
***************
*** 46,113 ****
  
      if (check_peaceful(ch,
! 		       "You feel too peaceful to contemplate violence.\n\r"))
! 	return;
  
      only_argument(argument, arg);
  
      if (*arg) {
! 	victim = get_char_room_vis(ch, arg);
! 	if (victim) {
[...5265 lines suppressed...]
!         for (i = descriptor_list; i; i = i->next)
!             if (i->character != ch && !i->connected
!                 && (IS_NPC(i->character)
!                     || (!IS_SET(i->character->specials.act, PLR_NOSHOUT)
!                         && !IS_SET(i->character->specials.act, PLR_NOOOC)
!                         && !IS_SET(i->character->specials.act,
!                                    PLR_WIZNOOOC)))
!                 && !check_soundproof(i->character)) {
!                 // ch_printf(ch,"My clan: %d Other clan: %d",
!                 // GET_CLAN(clannum), GET_CLAN(i->character) );
!                 if (IS_AFFECTED2(i->character, AFF2_QUEST))
!                     send_to_char(buf1, i->character);
!             }
      }
  }
+ 
+ /*
+  * vim:ts=4:sw=4:ai:et:si:sts=4
+  */
+ 

[Mistmud-commits] mistmud version.h,1.7.2.17,1.7.2.18

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31805

Modified Files:
      Tag: rev_1_3
	version.h 
Log Message:
- bumped revision



Index: version.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/version.h,v
retrieving revision 1.7.2.17
retrieving revision 1.7.2.18
diff -C2 -d -r1.7.2.17 -r1.7.2.18
*** version.h	2 Sep 2003 07:16:43 -0000	1.7.2.17
--- version.h	2 Sep 2003 07:38:13 -0000	1.7.2.18
***************
*** 2,6 ****
  #define _version_h
  
! #define VERSION "1.3.18"
  
  #endif
--- 2,6 ----
  #define _version_h
  
! #define VERSION "1.3.19"
  
  #endif

[Mistmud-commits] mistmud protos.h,1.8.2.7,1.8.2.8 reception.c,1.6.2.4,1.6.2.5 utility.c,1.5.2.9,1.5.2.10

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31663

Modified Files:
      Tag: rev_1_3
	protos.h reception.c utility.c 
Log Message:
- make it so unrentables say they are (Magic Mushroom!)



Index: protos.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/protos.h,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -C2 -d -r1.8.2.7 -r1.8.2.8
*** protos.h	1 Sep 2003 15:56:39 -0000	1.8.2.7
--- protos.h	2 Sep 2003 07:37:40 -0000	1.8.2.8
***************
*** 2090,2094 ****
  int CountRare(struct obj_data *obj);
  int CountNonRare(struct obj_data *obj);
! int CountUnrentable(struct char_data *ch, struct obj_data *obj);
  char *lower(char *s);
  int getFreeAffSlot( struct obj_data *obj);
--- 2090,2094 ----
  int CountRare(struct obj_data *obj);
  int CountNonRare(struct obj_data *obj);
! int CountUnrentable(struct char_data *ch, struct obj_data *obj, int warn);
  char *lower(char *s);
  int getFreeAffSlot( struct obj_data *obj);

Index: reception.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/reception.c,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** reception.c	31 Aug 2003 05:49:40 -0000	1.6.2.4
--- reception.c	2 Sep 2003 07:37:40 -0000	1.6.2.5
***************
*** 153,162 ****
      non_rare   = CountNonRare(ch->carrying);
      rare       = CountRare(ch->carrying);
!     unrentable = CountUnrentable(ch, ch->carrying );
  
      for (i = 0; i < MAX_WEAR; i++) {
          non_rare   += CountNonRare(ch->equipment[i]);
          rare       += CountRare(ch->equipment[i]);
!         unrentable += CountUnrentable(ch, ch->equipment[i] );
      }
  
--- 153,162 ----
      non_rare   = CountNonRare(ch->carrying);
      rare       = CountRare(ch->carrying);
!     unrentable = CountUnrentable(ch, ch->carrying, (int)receptionist );
  
      for (i = 0; i < MAX_WEAR; i++) {
          non_rare   += CountNonRare(ch->equipment[i]);
          rare       += CountRare(ch->equipment[i]);
!         unrentable += CountUnrentable(ch, ch->equipment[i], (int)receptionist );
      }
  

Index: utility.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/utility.c,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -C2 -d -r1.5.2.9 -r1.5.2.10
*** utility.c	1 Sep 2003 15:58:31 -0000	1.5.2.9
--- utility.c	2 Sep 2003 07:37:40 -0000	1.5.2.10
***************
*** 3191,3195 ****
  }
  
! int CountUnrentable(struct char_data *ch, struct obj_data *obj)
  {
      int             total = 0;
--- 3191,3195 ----
  }
  
! int CountUnrentable(struct char_data *ch, struct obj_data *obj, int warn)
  {
      int             total = 0;
***************
*** 3200,3213 ****
  
      if (obj->contains) {
!         total += CountUnrentable(ch, obj->contains);
      }
      if (obj->next_content) {
!         total += CountUnrentable(ch, obj->next_content);
      }
      if (obj->item_number <= -1) {
          total++;
      } else if (ItemEgoClash(ch, obj, 0) <= -5) {
!         act("Sorry, but $p can't be stored, it's WAY too powerful for you.", 
!             FALSE, ch, obj, NULL, TO_CHAR);
          total++;
      }
--- 3200,3219 ----
  
      if (obj->contains) {
!         total += CountUnrentable(ch, obj->contains, warn);
      }
      if (obj->next_content) {
!         total += CountUnrentable(ch, obj->next_content, warn);
      }
      if (obj->item_number <= -1) {
+         if( warn ) {
+             act("Sorry, but $p can't be stored.", FALSE, ch, obj, NULL, 
+                 TO_CHAR);
+         }
          total++;
      } else if (ItemEgoClash(ch, obj, 0) <= -5) {
!         if( warn ) {
!             act("Sorry, but $p can't be stored, it's WAY too powerful for "
!                 "you.", FALSE, ch, obj, NULL, TO_CHAR);
!         }
          total++;
      }

[Mistmud-commits] mistmud version.h,1.10,1.11

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31526

Modified Files:
	version.h 
Log Message:
- bump the version



Index: version.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/version.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** version.h	17 Aug 2003 03:20:11 -0000	1.10
--- version.h	2 Sep 2003 07:36:44 -0000	1.11
***************
*** 2,6 ****
  #define _version_h
  
! #define VERSION "1.2.4"
  
  #endif
--- 2,6 ----
  #define _version_h
  
! #define VERSION "1.2.5"
  
  #endif

[Mistmud-commits] mistmud protos.h,1.10,1.11 reception.c,1.7,1.8 utility.c,1.8,1.9

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31397

Modified Files:
	protos.h reception.c utility.c 
Log Message:
- make it so unrentables actually say they are unrentable (Magic Mushroom!)



Index: protos.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/protos.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** protos.h	17 Aug 2003 03:20:10 -0000	1.10
--- protos.h	2 Sep 2003 07:36:18 -0000	1.11
***************
*** 2109,2113 ****
  int CountRare(struct obj_data *obj);
  int CountNonRare(struct obj_data *obj);
! int CountUnrentable(struct char_data *ch, struct obj_data *obj);
  char *lower(char *s);
  int getFreeAffSlot( struct obj_data *obj);
--- 2109,2113 ----
  int CountRare(struct obj_data *obj);
  int CountNonRare(struct obj_data *obj);
! int CountUnrentable(struct char_data *ch, struct obj_data *obj, int warn);
  char *lower(char *s);
  int getFreeAffSlot( struct obj_data *obj);

Index: reception.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/reception.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** reception.c	14 Aug 2003 01:00:01 -0000	1.7
--- reception.c	2 Sep 2003 07:36:18 -0000	1.8
***************
*** 152,161 ****
      non_rare   = CountNonRare(ch->carrying);
      rare       = CountRare(ch->carrying);
!     unrentable = CountUnrentable(ch, ch->carrying );
  
      for (i = 0; i < MAX_WEAR; i++) {
          non_rare   += CountNonRare(ch->equipment[i]);
          rare       += CountRare(ch->equipment[i]);
!         unrentable += CountUnrentable(ch, ch->equipment[i] );
      }
  
--- 152,161 ----
      non_rare   = CountNonRare(ch->carrying);
      rare       = CountRare(ch->carrying);
!     unrentable = CountUnrentable(ch, ch->carrying, (int)receptionist );
  
      for (i = 0; i < MAX_WEAR; i++) {
          non_rare   += CountNonRare(ch->equipment[i]);
          rare       += CountRare(ch->equipment[i]);
!         unrentable += CountUnrentable(ch, ch->equipment[i], (int)receptionist );
      }
  

Index: utility.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/utility.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** utility.c	17 Aug 2003 03:20:11 -0000	1.8
--- utility.c	2 Sep 2003 07:36:19 -0000	1.9
***************
*** 3687,3691 ****
  }
  
! int CountUnrentable(struct char_data *ch, struct obj_data *obj)
  {
      int             total = 0;
--- 3687,3691 ----
  }
  
! int CountUnrentable(struct char_data *ch, struct obj_data *obj, int warn)
  {
      int             total = 0;
***************
*** 3696,3709 ****
  
      if (obj->contains) {
!         total += CountUnrentable(ch, obj->contains);
      }
      if (obj->next_content) {
!         total += CountUnrentable(ch, obj->next_content);
      }
      if (obj->item_number <= -1) {
          total++;
      } else if (ItemEgoClash(ch, obj, 0) <= -5) {
!         act("Sorry, but $p can't be stored, it's WAY too powerful for you.", 
!             FALSE, ch, obj, NULL, TO_CHAR);
          total++;
      }
--- 3696,3715 ----
  
      if (obj->contains) {
!         total += CountUnrentable(ch, obj->contains, warn);
      }
      if (obj->next_content) {
!         total += CountUnrentable(ch, obj->next_content, warn);
      }
      if (obj->item_number <= -1) {
+         if( warn ) {
+             act("Sorry, but $p can't be stored.", FALSE, ch, obj, NULL, 
+                 TO_CHAR);
+         }
          total++;
      } else if (ItemEgoClash(ch, obj, 0) <= -5) {
!         if( warn ) {
!             act("Sorry, but $p can't be stored, it's WAY too powerful for "
!                 "you.", FALSE, ch, obj, NULL, TO_CHAR);
!         }
          total++;
      }

[Mistmud-commits] mistmud constants.c,1.5,1.6

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31322

Modified Files:
	constants.c 
Log Message:
- put in some playable classes on the reinc races



Index: constants.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/constants.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** constants.c	17 Aug 2003 03:20:10 -0000	1.5
--- constants.c	2 Sep 2003 07:35:31 -0000	1.6
***************
*** 5071,5075 ****
      {RACE_HALF_OGRE, "Half-Ogre", 
  	{17, 0, 15, 29, 43, 64, 85}, 4,
! 	{0, 30, 50, 0, 0, 0, 30, 0, 0, 0},
  	{1, -3, 0, -2, 1, -3},
  	{3, 3, 3, 3, 3, 3},
--- 5071,5075 ----
      {RACE_HALF_OGRE, "Half-Ogre", 
  	{17, 0, 15, 29, 43, 64, 85}, 4,
! 	{0, 30, 50, 30, 0, 0, 30, 0, 0, 0},
  	{1, -3, 0, -2, 1, -3},
  	{3, 3, 3, 3, 3, 3},
***************
*** 5393,5397 ****
      {RACE_BUGBEARS, "Bugbear", 
  	{17, 0, 21, 41, 61, 91, 121}, 2,
! 	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
--- 5393,5397 ----
      {RACE_BUGBEARS, "Bugbear", 
  	{17, 0, 21, 41, 61, 91, 121}, 2,
! 	{0, 0, 30, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
***************
*** 5463,5467 ****
      {RACE_HOBGOBLIN, "Hobgoblin", 
  	{13, 0, 15, 27, 41, 61, 81}, 3,
! 	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
--- 5463,5467 ----
      {RACE_HOBGOBLIN, "Hobgoblin", 
  	{13, 0, 15, 27, 41, 61, 81}, 3,
! 	{0, 0, 30, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
***************
*** 5470,5474 ****
      {RACE_KOBOLD, "Kobold", 
  	{13, 0, 23, 46, 73, 101, 135}, 2,
! 	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
--- 5470,5474 ----
      {RACE_KOBOLD, "Kobold", 
  	{13, 0, 23, 46, 73, 101, 135}, 2,
! 	{0, 0, 30, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
***************
*** 5477,5481 ****
      {RACE_OGRE, "Ogre", 
  	{11, 0, 16, 31, 46, 69, 91}, 4,
! 	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},
--- 5477,5481 ----
      {RACE_OGRE, "Ogre", 
  	{11, 0, 16, 31, 46, 69, 91}, 4,
! 	{0, 30, 50, 30, 0, 0, 30, 0, 0, 0},
  	{0, 0, 0, 0, 0, 0},
  	{3, 3, 3, 3, 3, 3},

[Mistmud-commits] mistmud spec_procs3.c,1.9,1.10

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv31194

Modified Files:
	spec_procs3.c 
Log Message:
- remove bogus log in Psionist()



Index: spec_procs3.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/spec_procs3.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** spec_procs3.c	17 Aug 2003 03:20:11 -0000	1.9
--- spec_procs3.c	2 Sep 2003 07:34:41 -0000	1.10
***************
*** 3052,3056 ****
        }
      group = ((targ->followers || targ->master) ? TRUE : FALSE);
-     log(buf);
      if (group && (dice(1,2)-1)) group = FALSE;
      if (!group)
--- 3052,3055 ----

[Mistmud-commits] mistmud version.h,1.7.2.16,1.7.2.17

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv28561

Modified Files:
      Tag: rev_1_3
	version.h 
Log Message:
- bumped version



Index: version.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/version.h,v
retrieving revision 1.7.2.16
retrieving revision 1.7.2.17
diff -C2 -d -r1.7.2.16 -r1.7.2.17
*** version.h	1 Sep 2003 15:59:56 -0000	1.7.2.16
--- version.h	2 Sep 2003 07:16:43 -0000	1.7.2.17
***************
*** 2,6 ****
  #define _version_h
  
! #define VERSION "1.3.17"
  
  #endif
--- 2,6 ----
  #define _version_h
  
! #define VERSION "1.3.18"
  
  #endif

[Mistmud-commits] mistmud spec_procs3.c,1.8.2.4,1.8.2.5

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv28456

Modified Files:
      Tag: rev_1_3
	spec_procs3.c 
Log Message:
- reformat
- major cleanup in Psionist(), removed the stupid log() call that spammed crap



Index: spec_procs3.c
===================================================================
RCS file: /cvsroot/mistmud/mistmud/spec_procs3.c,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -d -r1.8.2.4 -r1.8.2.5
*** spec_procs3.c	31 Aug 2003 05:49:40 -0000	1.8.2.4
--- spec_procs3.c	2 Sep 2003 07:16:09 -0000	1.8.2.5
***************
*** 4,10 ****
  
  #include "protos.h"
! /* #include "mail.h" 	 moved to protos.h */
  
! /*   external vars  */
  
  extern struct room_data *world;
--- 4,14 ----
  
  #include "protos.h"
[...16697 lines suppressed...]
!         rp = real_roomp(ch->in_room);
  
!         if (GetMinLevel(ch) >= 20) {
!             char_from_room(ch);
!             char_to_room(ch, rp->dir_option[3]->to_room);
!             do_look(ch, "\0", 0);
!             return (TRUE);
!         } else {
!             act("\n\r$N blocks your path and says \"come back when yer READY to" " practice here!\".\n\r", TRUE, ch, 0, mob, TO_CHAR);
!             act("\n\r$N blocks $n's path into the training yards.\n\r",
!                 TRUE, ch, 0, mob, TO_ROOM);
!             return (TRUE);
!         }
      }
!     return (FALSE);
  }
  
+ /*
+  * vim:ts=4:sw=4:ai:et:si:sts=4
+  */

[Mistmud-commits] mistmud utils.h,1.3.2.6,1.3.2.7

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

Update of /cvsroot/mistmud/mistmud
In directory sc8-pr-cvs1:/tmp/cvs-serv28311

Modified Files:
      Tag: rev_1_3
	utils.h 
Log Message:
- added GET_LEARNED() macro



Index: utils.h
===================================================================
RCS file: /cvsroot/mistmud/mistmud/utils.h,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -C2 -d -r1.3.2.6 -r1.3.2.7
*** utils.h	1 Sep 2003 15:57:40 -0000	1.3.2.6
--- utils.h	2 Sep 2003 07:14:52 -0000	1.3.2.7
***************
*** 208,211 ****
--- 208,213 ----
  		   !IS_AFFECTED(ch, AFF_PARALYSIS) )
  
+ #define GET_LEARNED(ch,skill)	((ch)->skills[(skill)].learned)
+ 
  #ifndef LAG_MOBILES
  #define WAIT_STATE(ch, cycle)  (((ch)->desc) ? (ch)->desc->wait = ((GetMaxLevel(ch) >= DEMIGOD) ? (0) : (cycle)) : 0)