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

Resolved bug #89: Identical defines in codebase.

Browse Source 
- GET_OBJ_PERM has been removed in favor of GET_OBJ_AFFECT.

Implemented idea #55: Mail stamp cost.
- Postmaster no longer mentions stamp price for immortals.
This commit is contained in:
wyld-sw
2015-08-05 12:48:22 -04:00
parent b0cb9aa549
commit 1e8dd801e3
7 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/db.c
View File

@@ -1886,10 +1886,10 @@ char *parse_object(FILE *obj_f, int nr)
GET_OBJ_WEAR(obj_proto + i)[1] = 0;
GET_OBJ_WEAR(obj_proto + i)[2] = 0;
GET_OBJ_WEAR(obj_proto + i)[3] = 0;
GET_OBJ_PERM(obj_proto + i)[0] = asciiflag_conv_aff(f3);
GET_OBJ_PERM(obj_proto + i)[1] = 0;
GET_OBJ_PERM(obj_proto + i)[2] = 0;
GET_OBJ_PERM(obj_proto + i)[3] = 0;
GET_OBJ_AFFECT(obj_proto + i)[0] = asciiflag_conv_aff(f3);
GET_OBJ_AFFECT(obj_proto + i)[1] = 0;
GET_OBJ_AFFECT(obj_proto + i)[2] = 0;
GET_OBJ_AFFECT(obj_proto + i)[3] = 0;
if(bitsavetodisk) {
add_to_save_list(zone_table[real_zone_by_thing(nr)].number, 1);
@@ -1907,10 +1907,10 @@ char *parse_object(FILE *obj_f, int nr)
GET_OBJ_WEAR(obj_proto + i)[1] = asciiflag_conv(f6);
GET_OBJ_WEAR(obj_proto + i)[2] = asciiflag_conv(f7);
GET_OBJ_WEAR(obj_proto + i)[3] = asciiflag_conv(f8);
GET_OBJ_PERM(obj_proto + i)[0] = asciiflag_conv(f9);
GET_OBJ_PERM(obj_proto + i)[1] = asciiflag_conv(f10);
GET_OBJ_PERM(obj_proto + i)[2] = asciiflag_conv(f11);
GET_OBJ_PERM(obj_proto + i)[3] = asciiflag_conv(f12);
GET_OBJ_AFFECT(obj_proto + i)[0] = asciiflag_conv(f9);
GET_OBJ_AFFECT(obj_proto + i)[1] = asciiflag_conv(f10);
GET_OBJ_AFFECT(obj_proto + i)[2] = asciiflag_conv(f11);
GET_OBJ_AFFECT(obj_proto + i)[3] = asciiflag_conv(f12);
} else {
log("SYSERR: Format error in first numeric line (expecting 13 args, got %d), %s", retval, buf2);