| … | |
… | |
| 409 | |
409 | |
| 410 | static void |
410 | static void |
| 411 | set_move (MoveType &mt, const char *str) |
411 | set_move (MoveType &mt, const char *str) |
| 412 | { |
412 | { |
| 413 | static const struct flagstr { |
413 | static const struct flagstr { |
| 414 | char *name; |
414 | const char *name; |
| 415 | MoveType flags; |
415 | MoveType flags; |
| 416 | } move_flags[] = { |
416 | } move_flags[] = { |
| 417 | { "walk" , MOVE_WALK }, |
417 | { "walk" , MOVE_WALK }, |
| 418 | { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, |
418 | { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, |
| 419 | { "fly_low" , MOVE_FLY_LOW }, |
419 | { "fly_low" , MOVE_FLY_LOW }, |
| … | |
… | |
| 587 | move_slow |= MOVE_WALK; |
587 | move_slow |= MOVE_WALK; |
| 588 | f.get (move_slow_penalty); |
588 | f.get (move_slow_penalty); |
| 589 | break; |
589 | break; |
| 590 | |
590 | |
| 591 | case KW_face: |
591 | case KW_face: |
| 592 | face = &new_faces[FindFace (f.get_str (), 0)]; |
592 | face = face_find (f.get_str ()); |
| 593 | break; |
593 | break; |
| 594 | |
594 | |
| 595 | case KW_x: f.get (x); break; |
595 | case KW_x: f.get (x); break; |
| 596 | case KW_y: f.get (y); break; |
596 | case KW_y: f.get (y); break; |
| 597 | |
597 | |
| … | |
… | |
| 878 | case KW_glow_radius: f.get (glow_radius); break; |
878 | case KW_glow_radius: f.get (glow_radius); break; |
| 879 | case KW_weapontype: f.get (weapontype); break; |
879 | case KW_weapontype: f.get (weapontype); break; |
| 880 | case KW_tooltype: f.get (tooltype); break; |
880 | case KW_tooltype: f.get (tooltype); break; |
| 881 | case KW_casting_time: f.get (casting_time); break; |
881 | case KW_casting_time: f.get (casting_time); break; |
| 882 | case KW_elevation: f.get (elevation); break; |
882 | case KW_elevation: f.get (elevation); break; |
| 883 | case KW_smoothlevel: f.get (smoothlevel); break; |
883 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
| 884 | case KW_client_type: f.get (client_type); break; |
884 | case KW_client_type: f.get (client_type); break; |
| 885 | case KW_duration: f.get (duration); break; |
885 | case KW_duration: f.get (duration); break; |
| 886 | case KW_range: f.get (range); break; |
886 | case KW_range: f.get (range); break; |
| 887 | case KW_range_modifier: f.get (range_modifier); break; |
887 | case KW_range_modifier: f.get (range_modifier); break; |
| 888 | case KW_dam_modifier: f.get (dam_modifier); break; |
888 | case KW_dam_modifier: f.get (dam_modifier); break; |
| … | |
… | |
| 1243 | f.put (KW_msg, KW_endmsg, op->msg); |
1243 | f.put (KW_msg, KW_endmsg, op->msg); |
| 1244 | if (op->lore != tmp->lore) |
1244 | if (op->lore != tmp->lore) |
| 1245 | f.put (KW_lore, KW_endlore, op->lore); |
1245 | f.put (KW_lore, KW_endlore, op->lore); |
| 1246 | |
1246 | |
| 1247 | CMP_OUT (other_arch); |
1247 | CMP_OUT (other_arch); |
| 1248 | CMP_OUT (face); |
1248 | |
|
|
1249 | if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); |
| 1249 | |
1250 | |
| 1250 | if (op->animation_id != tmp->animation_id) |
1251 | if (op->animation_id != tmp->animation_id) |
| 1251 | if (op->animation_id) |
1252 | if (op->animation_id) |
| 1252 | { |
1253 | { |
| 1253 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1254 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
