… | |
… | |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
608 | animation_id = 0; |
608 | animation_id = 0; |
609 | |
609 | |
610 | const char *str = f.get_str (); |
610 | const char *str = f.get_str (); |
611 | if (str && (animation_id = find_animation (str))) |
611 | if (str && (animation_id = find_animation (str))) |
612 | SET_FLAG (this, FLAG_ANIMATE); |
612 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
613 | } |
613 | } |
614 | break; |
614 | break; |
615 | |
615 | |
616 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_heal: f.get (last_heal); break; |
617 | case KW_last_sp: f.get (last_sp); break; |
617 | case KW_last_sp: f.get (last_sp); break; |
… | |
… | |
921 | case KW_expmul: f.get (expmul); break; |
921 | case KW_expmul: f.get (expmul); break; |
922 | case KW_glow_radius: f.get (glow_radius); break; |
922 | case KW_glow_radius: f.get (glow_radius); break; |
923 | case KW_weapontype: f.get (weapontype); break; |
923 | case KW_weapontype: f.get (weapontype); break; |
924 | case KW_tooltype: f.get (tooltype); break; |
924 | case KW_tooltype: f.get (tooltype); break; |
925 | case KW_casting_time: f.get (casting_time); break; |
925 | case KW_casting_time: f.get (casting_time); break; |
|
|
926 | |
|
|
927 | // elevation is deprecated |
926 | case KW_elevation: f.get (elevation); break; |
928 | case KW_elevation: break; |
|
|
929 | |
927 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
930 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
928 | case KW_client_type: f.get (client_type); break; |
931 | case KW_client_type: f.get (client_type); break; |
929 | case KW_duration: f.get (duration); break; |
932 | case KW_duration: f.get (duration); break; |
930 | case KW_range: f.get (range); break; |
933 | case KW_range: f.get (range); break; |
931 | case KW_range_modifier: f.get (range_modifier); break; |
934 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
1298 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1301 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1299 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1302 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1300 | |
1303 | |
1301 | if (op->animation_id != tmp->animation_id) |
1304 | if (op->animation_id != tmp->animation_id) |
1302 | if (op->animation_id) |
1305 | if (op->animation_id) |
|
|
1306 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
|
|
1307 | else |
1303 | { |
1308 | { |
1304 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1309 | f.put (KW_animation, (const char *)0); |
1305 | |
1310 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1306 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1307 | f.put (KW_is_animated, (sint32)0); |
|
|
1308 | } |
1311 | } |
1309 | else |
|
|
1310 | f.put (KW_animation, (const char *)0); |
|
|
1311 | |
1312 | |
1312 | CMP_OUT2 (str, stats.Str); |
1313 | CMP_OUT2 (str, stats.Str); |
1313 | CMP_OUT2 (dex, stats.Dex); |
1314 | CMP_OUT2 (dex, stats.Dex); |
1314 | CMP_OUT2 (con, stats.Con); |
1315 | CMP_OUT2 (con, stats.Con); |
1315 | CMP_OUT2 (wis, stats.Wis); |
1316 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1379 | CMP_OUT (pick_up); |
1380 | CMP_OUT (pick_up); |
1380 | CMP_OUT (will_apply); |
1381 | CMP_OUT (will_apply); |
1381 | CMP_OUT (smoothlevel); |
1382 | CMP_OUT (smoothlevel); |
1382 | CMP_OUT (weapontype); |
1383 | CMP_OUT (weapontype); |
1383 | CMP_OUT (tooltype); |
1384 | CMP_OUT (tooltype); |
1384 | CMP_OUT (elevation); |
|
|
1385 | CMP_OUT (client_type); |
1385 | CMP_OUT (client_type); |
1386 | CMP_OUT (item_power); |
1386 | CMP_OUT (item_power); |
1387 | CMP_OUT (duration); |
1387 | CMP_OUT (duration); |
1388 | CMP_OUT (range); |
1388 | CMP_OUT (range); |
1389 | CMP_OUT (range_modifier); |
1389 | CMP_OUT (range_modifier); |