kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated World files for 3.62 release. --Rumble

Browse Source
This commit is contained in:
Rumble
2010-09-19 02:58:36 +00:00
parent 7e989be191
commit 505d8f1236
19 changed files with 1340 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/constants.c
View File

@@ -24,7 +24,7 @@
* @todo cpp_extern isn't needed here (or anywhere) as the extern reserved word
* works correctly with C compilers (at least in my Experience)
* Jeremy Osborne 1/28/2008 */
cpp_extern const char *tbamud_version = "tbaMUD 3.61";
cpp_extern const char *tbamud_version = "tbaMUD 3.62";
/* strings corresponding to ordinals/bitvectors in structs.h */
/* (Note: strings for class definitions in class.c instead of here) */

2
src/genmob.c
View File

@@ -395,6 +395,6 @@ void check_mobile_string(mob_vnum i, char **string, const char *desc)
mudlog(BRF, LVL_GOD, TRUE, "%s", smbuf);
if (*string)
free(*string);
*string = strdup("An undefined string.");
*string = strdup("An undefined string.\n");
}
}

1838
src/prefedit.c
View File

File diff suppressed because it is too large Load Diff

120
src/prefedit.h
View File

@@ -1,60 +1,60 @@
/**************************************************************************
* File: prefedit.c Part of tbaMUD *
* Usage: Player-level OLC for setting preferences and toggles *
* *
* Created by Jamdog for tbaMUD 3.59 *
* All rights reserved. See license for complete information. *
* *
* Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
* CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991. *
**************************************************************************/
/* Toggle structure held for OLC purposes */
struct prefs_data
{
struct char_data *ch; /* Pointer to char being edited */
int pref_flags[PR_ARRAY_MAX]; /* Copy of player's pref flags */
int wimp_level; /* Copy of player's wimp level */
int page_length; /* Copy of player's pagelength */
int screen_width; /* Copy of player's screenwidth */
};
/* Prefedit utility macros */
/** Get the character being edited */
#define PREFEDIT_GET_CHAR (OLC_PREFS(d)->ch ? (OLC_PREFS(d)->ch) : (d->character))
/** Get a pointer to the pref toggles of the character being edited */
#define PREFEDIT_GET_FLAGS OLC_PREFS(d)->pref_flags
/** Get the wimpy level of the character being edited */
#define PREFEDIT_GET_WIMP_LEV OLC_PREFS(d)->wimp_level
/** Get the page length of the character being edited */
#define PREFEDIT_GET_PAGELENGTH OLC_PREFS(d)->page_length
/** Get the screen width of the character being edited */
#define PREFEDIT_GET_SCREENWIDTH OLC_PREFS(d)->screen_width
/** Get one of the flag array elements for the character being edited */
#define PREFEDIT_GET_FLAG(i) OLC_PREFS(d)->pref_flags[(i)]
/** Get the state of a flag (on/off) for the character being edited */
#define PREFEDIT_FLAGGED(flag) IS_SET_AR(PREFEDIT_GET_FLAGS, (flag))
/* Prefedit OLC sub-modes */
#define PREFEDIT_MAIN_MENU 0
#define PREFEDIT_PROMPT 1
#define PREFEDIT_COLOR 2
#define PREFEDIT_PAGELENGTH 3
#define PREFEDIT_SCREENWIDTH 4
#define PREFEDIT_WIMPY 5
#define PREFEDIT_CONFIRM_SAVE 6
#define PREFEDIT_SYSLOG 7
#define PREFEDIT_TOGGLE_MENU 8
/* External Functions in prefedit.c */
void prefedit_Restore_Defaults(struct descriptor_data *d);
void prefedit_parse(struct descriptor_data * d, char *arg);
ACMD(do_oasis_prefedit);
/**************************************************************************
* File: prefedit.c Part of tbaMUD *
* Usage: Player-level OLC for setting preferences and toggles *
* *
* Created by Jamdog for tbaMUD 3.59 *
* All rights reserved. See license for complete information. *
* *
* Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
* CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991. *
**************************************************************************/
/* Toggle structure held for OLC purposes */
struct prefs_data
{
struct char_data *ch; /* Pointer to char being edited */
int pref_flags[PR_ARRAY_MAX]; /* Copy of player's pref flags */
int wimp_level; /* Copy of player's wimp level */
int page_length; /* Copy of player's pagelength */
int screen_width; /* Copy of player's screenwidth */
};
/* Prefedit utility macros */
/** Get the character being edited */
#define PREFEDIT_GET_CHAR (OLC_PREFS(d)->ch ? (OLC_PREFS(d)->ch) : (d->character))
/** Get a pointer to the pref toggles of the character being edited */
#define PREFEDIT_GET_FLAGS OLC_PREFS(d)->pref_flags
/** Get the wimpy level of the character being edited */
#define PREFEDIT_GET_WIMP_LEV OLC_PREFS(d)->wimp_level
/** Get the page length of the character being edited */
#define PREFEDIT_GET_PAGELENGTH OLC_PREFS(d)->page_length
/** Get the screen width of the character being edited */
#define PREFEDIT_GET_SCREENWIDTH OLC_PREFS(d)->screen_width
/** Get one of the flag array elements for the character being edited */
#define PREFEDIT_GET_FLAG(i) OLC_PREFS(d)->pref_flags[(i)]
/** Get the state of a flag (on/off) for the character being edited */
#define PREFEDIT_FLAGGED(flag) IS_SET_AR(PREFEDIT_GET_FLAGS, (flag))
/* Prefedit OLC sub-modes */
#define PREFEDIT_MAIN_MENU 0
#define PREFEDIT_PROMPT 1
#define PREFEDIT_COLOR 2
#define PREFEDIT_PAGELENGTH 3
#define PREFEDIT_SCREENWIDTH 4
#define PREFEDIT_WIMPY 5
#define PREFEDIT_CONFIRM_SAVE 6
#define PREFEDIT_SYSLOG 7
#define PREFEDIT_TOGGLE_MENU 8
/* External Functions in prefedit.c */
void prefedit_Restore_Defaults(struct descriptor_data *d);
void prefedit_parse(struct descriptor_data * d, char *arg);
ACMD(do_oasis_prefedit);

2
src/structs.h
View File

@@ -19,7 +19,7 @@
* on an older version. You are supposed to compare this with the macro
* TBAMUD_VERSION() in utils.h.
* It is read as Major/Minor/Patchlevel - MMmmPP */
#define _TBAMUD 0x030610
#define _TBAMUD 0x030620
/** If you want equipment to be automatically equipped to the same place
* it was when players rented, set the define below to 1 because