… | |
… | |
473 | CLEAR_FLAG (op, flag) \ |
473 | CLEAR_FLAG (op, flag) \ |
474 | |
474 | |
475 | bool |
475 | bool |
476 | object::parse_kv (object_thawer &f) |
476 | object::parse_kv (object_thawer &f) |
477 | { |
477 | { |
478 | assert (f.kw == KW_object || f.kw == KW_arch); |
|
|
479 | |
|
|
480 | if (f.kw == KW_object) |
|
|
481 | f.get (name); // preset name from object name |
|
|
482 | |
|
|
483 | f.next (); |
|
|
484 | |
|
|
485 | object *op_inv = inv; |
478 | object *op_inv = inv; |
486 | |
479 | |
487 | for (;;) |
480 | for (;;) |
488 | { |
481 | { |
489 | switch (f.kw) |
482 | switch (f.kw) |
… | |
… | |
990 | arch = archetype::find ("earthwall"); |
983 | arch = archetype::find ("earthwall"); |
991 | } |
984 | } |
992 | |
985 | |
993 | assert (arch); //D maybe use exception handling of sorts? |
986 | assert (arch); //D maybe use exception handling of sorts? |
994 | |
987 | |
|
|
988 | f.next (); |
|
|
989 | |
995 | object *op = object::create (); |
990 | object *op = object::create (); |
996 | |
991 | |
997 | op->map = map; |
992 | op->map = map; |
998 | arch->clone.copy_to (op); |
993 | arch->clone.copy_to (op); |
999 | // copy_to activates, this should be fixed properly |
994 | // copy_to activates, this should be fixed properly |
… | |
… | |
1017 | int |
1012 | int |
1018 | set_variable (object *op, char *buf) |
1013 | set_variable (object *op, char *buf) |
1019 | { |
1014 | { |
1020 | object_thawer f (buf, (AV *)0); |
1015 | object_thawer f (buf, (AV *)0); |
1021 | |
1016 | |
1022 | f.kw = KW_arch; // special hack so that parse_kv skips |
1017 | f.next (); |
1023 | return op->parse_kv (f); |
1018 | return op->parse_kv (f); |
1024 | } |
1019 | } |
1025 | |
1020 | |
1026 | /* This returns a string of the integer movement type */ |
1021 | /* This returns a string of the integer movement type */ |
1027 | #if 0 |
1022 | #if 0 |