Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-12-23 02:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed various mid-function defines of variables.

Browse source
This commit is contained in:
Fizban 2008-08-31 21:53:52 +00:00
parent 3936b7a4a1
commit a2c51f88eb
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -35,9 +35,11 @@ export (QQ's a zone into a tarball)t
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
tbaMUD 3.57 [Aug 31 2008] - Fizban
Removed various mid-function defines of variables.
[Aug 27 2008] - Rumble [Aug 27 2008] - Rumble
Fixed Mob using '((c)->player_specials->saved.pref)' at dg_variables.c:860 Fixed Mob using '((c)->player_specials->saved.pref)' at dg_variables.c:860
tbaMUD-3.57
[Aug 11 2008] - Rumble [Aug 11 2008] - Rumble
Updated World and files for 3.57 release. Updated World and files for 3.57 release.
[Aug 10 2008] - Fizban [Aug 10 2008] - Fizban

6
src/objsave.c
View file

@ -875,6 +875,7 @@ static int gen_receptionist(struct char_data *ch, struct char_data *recep, int c
char *arg, int mode) char *arg, int mode)
{ {
int cost; int cost;
char buf[128];
const char *action_table[] = { "smile", "dance", "sigh", "blush", "burp", const char *action_table[] = { "smile", "dance", "sigh", "blush", "burp",
"cough", "fart", "twiddle", "yawn" }; "cough", "fart", "twiddle", "yawn" };
@ -906,7 +907,6 @@ static int gen_receptionist(struct char_data *ch, struct char_data *recep, int c
} }
if (CMD_IS("rent")) { if (CMD_IS("rent")) {
char buf[128];
if (!(cost = Crash_offer_rent(ch, recep, FALSE, mode))) if (!(cost = Crash_offer_rent(ch, recep, FALSE, mode)))
return (TRUE); return (TRUE);
@ -1163,6 +1163,8 @@ static int Crash_load_objs(struct char_data *ch) {
FILE *fl; FILE *fl;
char filename[MAX_STRING_LENGTH]; char filename[MAX_STRING_LENGTH];
char line[READ_SIZE]; char line[READ_SIZE];
char buf[MAX_STRING_LENGTH];
char str[64];
int i, num_of_days, orig_rent_code, cost, num_objs=0; int i, num_of_days, orig_rent_code, cost, num_objs=0;
struct obj_data *cont_row[MAX_BAG_ROWS]; struct obj_data *cont_row[MAX_BAG_ROWS];
int rentcode,timed,netcost,gold,account,nitems; int rentcode,timed,netcost,gold,account,nitems;
@ -1176,7 +1178,6 @@ static int Crash_load_objs(struct char_data *ch) {
if (!(fl = fopen(filename, "r"))) { if (!(fl = fopen(filename, "r"))) {
if (errno != ENOENT) { /* if it fails, NOT because of no file */ if (errno != ENOENT) { /* if it fails, NOT because of no file */
char buf[MAX_STRING_LENGTH];
sprintf(buf, "SYSERR: READING OBJECT FILE %s (5)", filename); sprintf(buf, "SYSERR: READING OBJECT FILE %s (5)", filename);
perror(buf); perror(buf);
send_to_char(ch, "\r\n********************* NOTICE *********************\r\n" send_to_char(ch, "\r\n********************* NOTICE *********************\r\n"
@ -1191,7 +1192,6 @@ static int Crash_load_objs(struct char_data *ch) {
&netcost,&gold,&account,&nitems); &netcost,&gold,&account,&nitems);
if (rentcode == RENT_RENTED || rentcode == RENT_TIMEDOUT) { if (rentcode == RENT_RENTED || rentcode == RENT_TIMEDOUT) {
char str[64];
sprintf(str, "%d", SECS_PER_REAL_DAY); sprintf(str, "%d", SECS_PER_REAL_DAY);
num_of_days = (int)((float) (time(0) - timed) / (float)atoi(str)); num_of_days = (int)((float) (time(0) - timed) / (float)atoi(str));
cost = (int) (netcost * num_of_days); cost = (int) (netcost * num_of_days);