agroschim/grenzland-mud
1
0
Fork 0
forked from kyonshi/grenzland-mud
Code Pull Requests 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

10
src/objsave.c
View File

@@ -116,7 +116,7 @@ int objsave_save_obj_record(struct obj_data *obj, FILE *fp, int locate)
if (TEST_OBJN(cost_per_day))
fprintf(fp, "Rent: %d\n", GET_OBJ_RENT(obj));
if (TEST_OBJN(bitvector))
fprintf(fp, "Perm: %d %d %d %d\n", GET_OBJ_PERM(obj)[0], GET_OBJ_PERM(obj)[1], GET_OBJ_PERM(obj)[2], GET_OBJ_PERM(obj)[3]);
fprintf(fp, "Perm: %d %d %d %d\n", GET_OBJ_AFFECT(obj)[0], GET_OBJ_AFFECT(obj)[1], GET_OBJ_AFFECT(obj)[2], GET_OBJ_AFFECT(obj)[3]);
if (TEST_OBJN(wear_flags))
fprintf(fp, "Wear: %d %d %d %d\n", GET_OBJ_WEAR(obj)[0], GET_OBJ_WEAR(obj)[1], GET_OBJ_WEAR(obj)[2], GET_OBJ_WEAR(obj)[3]);
@@ -1131,10 +1131,10 @@ obj_save_data *objsave_parse_objects(FILE *fl)
case 'P':
if (!strcmp(tag, "Perm")) {
sscanf(line, "%s %s %s %s", f1, f2, f3, f4);
GET_OBJ_PERM(temp)[0] = asciiflag_conv(f1);
GET_OBJ_PERM(temp)[1] = asciiflag_conv(f2);
GET_OBJ_PERM(temp)[2] = asciiflag_conv(f3);
GET_OBJ_PERM(temp)[3] = asciiflag_conv(f4);
GET_OBJ_AFFECT(temp)[0] = asciiflag_conv(f1);
GET_OBJ_AFFECT(temp)[1] = asciiflag_conv(f2);
GET_OBJ_AFFECT(temp)[2] = asciiflag_conv(f3);
GET_OBJ_AFFECT(temp)[3] = asciiflag_conv(f4);
}
break;
case 'R':