r173 - in trunk: data src
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Sep 14 09:21:13 EDT 2005
Author: jonas
Date: 2005-09-14 09:21:13 -0400 (Wed, 14 Sep 2005)
New Revision: 173
Modified:
trunk/data/baleog.inf
trunk/data/erik.inf
trunk/data/olaf.inf
trunk/data/scorch.inf
trunk/src/objects_common.cpp
Log:
support keyword scale parameter (lvl)
Modified: trunk/data/baleog.inf
===================================================================
--- trunk/data/baleog.inf 2005-09-13 12:58:51 UTC (rev 172)
+++ trunk/data/baleog.inf 2005-09-14 13:21:13 UTC (rev 173)
@@ -1,34 +1,34 @@
#BALEOG
-anim_left= name=baleog_idle_left: scale=2: bp_type=rightdown
-anim_right= name=baleog_idle_right: scale=2: bp_type=leftdown
-anim_rock_left= name=baleog_rock_left: scale=2: bp_type=rightdown
-anim_rock_right= name=baleog_rock_right: scale=2: bp_type=leftdown
-anim_walk_left= name=baleog_walk_left: scale=2: bp_type=rightdown
-anim_walk_right= name=baleog_walk_right: scale=2: bp_type=leftdown
-anim_push_left= name=baleog_push_left: scale=2: bp_type=rightdown
-anim_push_right= name=baleog_push_right: scale=2: bp_type=leftdown
-#anim_fall_middle= name=baleog_fall_middle: scale=2
-anim_fall_left= name=baleog_fall_left: scale=2: bp_type=rightdown
-anim_fall_right= name=baleog_fall_right: scale=2: bp_type=leftdown
-anim_fall_fast_left= name=baleog_fall_fast_left: scale=2: bp_type=rightdown
-anim_fall_fast_right= name=baleog_fall_fast_right: scale=2: bp_type=leftdown
-anim_crash_left= name=baleog_crash_left: scale=2: bp_type=rightdown: type=once
-anim_crash_right= name=baleog_crash_right: scale=2: bp_type=leftdown: type=once
-anim_rope_left= name=baleog_rope_left: scale=2: bp_type=rightdown
-anim_rope_right= name=baleog_rope_right: scale=2: bp_type=leftdown
-#anim_teleport_left= name=baleog_teleport_left: scale=2: bp_type=rightdown: type=once
-#anim_teleport_right= name=baleog_teleport_right: scale=2: bp_type=leftdown: type=once
-anim_die_crash_left= name=baleog_die_crash_left: scale=2: bp_type=rightdown: type=once
-anim_die_crash_right= name=baleog_die_crash_right: scale=2: bp_type=leftdown: type=once
-#anim_die_burn_left= name=baleog_die_burn_left: scale=2: bp_type=rightdown: type=once
-#anim_die_burn_right= name=baleog_die_burn_right: scale=2: bp_type=leftdown: type=once
-anim_die_bones_left= name=baleog_die_bones_left: scale=2: bp_type=rightdown: type=once
-anim_die_bones_right= name=baleog_die_bones_right: scale=2: bp_type=leftdown: type=once
-anim_die_elec_left= name=baleog_die_elec_left: scale=2: bp_type=rightdown: type=once
-anim_die_elec_right= name=baleog_die_elec_right: scale=2: bp_type=leftdown: type=once
-#anim_die_spike_left= name=baleog_die_spike_left: scale=2: bp_type=rightdown: type=once
-#anim_die_spike_right= name=baleog_die_spike_right: scale=2: bp_type=leftdown: type=once
-anim_bar= name=bar_baleog: scale=2: type=once
+anim_left= name=baleog_idle_left: scale=lvl: bp_type=rightdown
+anim_right= name=baleog_idle_right: scale=lvl: bp_type=leftdown
+anim_rock_left= name=baleog_rock_left: scale=lvl: bp_type=rightdown
+anim_rock_right= name=baleog_rock_right: scale=lvl: bp_type=leftdown
+anim_walk_left= name=baleog_walk_left: scale=lvl: bp_type=rightdown
+anim_walk_right= name=baleog_walk_right: scale=lvl: bp_type=leftdown
+anim_push_left= name=baleog_push_left: scale=lvl: bp_type=rightdown
+anim_push_right= name=baleog_push_right: scale=lvl: bp_type=leftdown
+#anim_fall_middle= name=baleog_fall_middle: scale=lvl
+anim_fall_left= name=baleog_fall_left: scale=lvl: bp_type=rightdown
+anim_fall_right= name=baleog_fall_right: scale=lvl: bp_type=leftdown
+anim_fall_fast_left= name=baleog_fall_fast_left: scale=lvl: bp_type=rightdown
+anim_fall_fast_right= name=baleog_fall_fast_right: scale=lvl: bp_type=leftdown
+anim_crash_left= name=baleog_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_crash_right= name=baleog_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_rope_left= name=baleog_rope_left: scale=lvl: bp_type=rightdown
+anim_rope_right= name=baleog_rope_right: scale=lvl: bp_type=leftdown
+#anim_teleport_left= name=baleog_teleport_left: scale=lvl: bp_type=rightdown: type=once
+#anim_teleport_right= name=baleog_teleport_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_crash_left= name=baleog_die_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_crash_right= name=baleog_die_crash_right: scale=lvl: bp_type=leftdown: type=once
+#anim_die_burn_left= name=baleog_die_burn_left: scale=lvl: bp_type=rightdown: type=once
+#anim_die_burn_right= name=baleog_die_burn_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_bones_left= name=baleog_die_bones_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_bones_right= name=baleog_die_bones_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_elec_left= name=baleog_die_elec_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_elec_right= name=baleog_die_elec_right: scale=lvl: bp_type=leftdown: type=once
+#anim_die_spike_left= name=baleog_die_spike_left: scale=lvl: bp_type=rightdown: type=once
+#anim_die_spike_right= name=baleog_die_spike_right: scale=lvl: bp_type=leftdown: type=once
+anim_bar= name=bar_baleog: scale=lvl: type=once
-anim_baleog_sword_left= name=baleog_sword_left: scale=2: bp_type=rightdown: type=once
-anim_baleog_sword_right= name=baleog_sword_right: scale=2: bp_type=leftdown: type=once
+anim_baleog_sword_left= name=baleog_sword_left: scale=lvl: bp_type=rightdown: type=once
+anim_baleog_sword_right= name=baleog_sword_right: scale=lvl: bp_type=leftdown: type=once
Modified: trunk/data/erik.inf
===================================================================
--- trunk/data/erik.inf 2005-09-13 12:58:51 UTC (rev 172)
+++ trunk/data/erik.inf 2005-09-14 13:21:13 UTC (rev 173)
@@ -1,50 +1,50 @@
#ERIK
-anim_left= name=erik_idle_left: scale=2: bp_type=rightdown
-anim_right= name=erik_idle_right: scale=2: bp_type=leftdown
-anim_rock_left= name=erik_rock_left: scale=2: bp_type=rightdown
-anim_rock_right= name=erik_rock_right: scale=2: bp_type=leftdown
-anim_walk_left= name=erik_walk_left: scale=2: bp_type=rightdown
-anim_walk_right= name=erik_walk_right: scale=2: bp_type=leftdown
-anim_push_left= name=erik_push_left: scale=2: bp_type=rightdown
-anim_push_right= name=erik_push_right: scale=2: bp_type=leftdown
-anim_fall_middle= name=erik_fall_middle: scale=2
-anim_fall_left= name=erik_fall_left: scale=2: bp_type=rightdown
-anim_fall_right= name=erik_fall_right: scale=2: bp_type=leftdown
-anim_fall_fast_left= name=erik_fall_fast_left: scale=2: bp_type=rightdown
-anim_fall_fast_right= name=erik_fall_fast_right: scale=2: bp_type=leftdown
-anim_crash_left= name=erik_crash_left: scale=2: bp_type=rightdown: type=once
-anim_crash_right= name=erik_crash_right: scale=2: bp_type=leftdown: type=once
-anim_rope_left= name=erik_rope_left: scale=2: bp_type=rightdown
-anim_rope_right= name=erik_rope_right: scale=2: bp_type=leftdown
-anim_teleport_left= name=erik_teleport_left: scale=2: bp_type=rightdown: type=once
-anim_teleport_right= name=erik_teleport_right: scale=2: bp_type=leftdown: type=once
-anim_die_crash_left= name=erik_die_crash_left: scale=2: bp_type=rightdown: type=once
-anim_die_crash_right= name=erik_die_crash_right: scale=2: bp_type=leftdown: type=once
-anim_die_burn_left= name=erik_die_burn_left: scale=2: bp_type=rightdown: type=once
-anim_die_burn_right= name=erik_die_burn_right: scale=2: bp_type=leftdown: type=once
-anim_die_bones_left= name=erik_die_bones_left: scale=2: bp_type=rightdown: type=once
-anim_die_bones_right= name=erik_die_bones_right: scale=2: bp_type=leftdown: type=once
-anim_die_elec_left= name=erik_die_elec_left: scale=2: bp_type=rightdown: type=once
-anim_die_elec_right= name=erik_die_elec_right: scale=2: bp_type=leftdown: type=once
-anim_die_spike_left= name=erik_die_spike_left: scale=2: bp_type=rightdown: type=once
-anim_die_spike_right= name=erik_die_spike_right: scale=2: bp_type=leftdown: type=once
-anim_bar= name=bar_erik: scale=2: type=once
+anim_left= name=erik_idle_left: scale=lvl: bp_type=rightdown
+anim_right= name=erik_idle_right: scale=lvl: bp_type=leftdown
+anim_rock_left= name=erik_rock_left: scale=lvl: bp_type=rightdown
+anim_rock_right= name=erik_rock_right: scale=lvl: bp_type=leftdown
+anim_walk_left= name=erik_walk_left: scale=lvl: bp_type=rightdown
+anim_walk_right= name=erik_walk_right: scale=lvl: bp_type=leftdown
+anim_push_left= name=erik_push_left: scale=lvl: bp_type=rightdown
+anim_push_right= name=erik_push_right: scale=lvl: bp_type=leftdown
+anim_fall_middle= name=erik_fall_middle: scale=lvl
+anim_fall_left= name=erik_fall_left: scale=lvl: bp_type=rightdown
+anim_fall_right= name=erik_fall_right: scale=lvl: bp_type=leftdown
+anim_fall_fast_left= name=erik_fall_fast_left: scale=lvl: bp_type=rightdown
+anim_fall_fast_right= name=erik_fall_fast_right: scale=lvl: bp_type=leftdown
+anim_crash_left= name=erik_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_crash_right= name=erik_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_rope_left= name=erik_rope_left: scale=lvl: bp_type=rightdown
+anim_rope_right= name=erik_rope_right: scale=lvl: bp_type=leftdown
+anim_teleport_left= name=erik_teleport_left: scale=lvl: bp_type=rightdown: type=once
+anim_teleport_right= name=erik_teleport_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_crash_left= name=erik_die_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_crash_right= name=erik_die_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_burn_left= name=erik_die_burn_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_burn_right= name=erik_die_burn_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_bones_left= name=erik_die_bones_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_bones_right= name=erik_die_bones_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_elec_left= name=erik_die_elec_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_elec_right= name=erik_die_elec_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_spike_left= name=erik_die_spike_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_spike_right= name=erik_die_spike_right: scale=lvl: bp_type=leftdown: type=once
+anim_bar= name=bar_erik: scale=lvl: type=once
#anim_die_water and anim_climb not specified
-anim_erik_jump_left= name=erik_jump_left: scale=2: bp_type=rightdown: type=once
-anim_erik_jump_right= name=erik_jump_right: scale=2: bp_type=leftdown: type=once
-anim_erik_jump2_left= name=erik_jump2_left: scale=2: bp_type=rightdown: type=once
-anim_erik_jump2_right= name=erik_jump2_right: scale=2: bp_type=leftdown: type=once
-anim_erik_start_run_left= name=erik_start_run_left: scale=2: bp_type=rightdown: type=once
-anim_erik_start_run_right= name=erik_start_run_right: scale=2: bp_type=leftdown: type=once
-anim_erik_run_left= name=erik_run_left: scale=2: bp_type=rightdown: type=once
-anim_erik_run_right= name=erik_run_right: scale=2: bp_type=leftdown: type=once
-anim_erik_swim_left= name=erik_swim_left: scale=2: bp_type=rightdown: type=once
-anim_erik_swim_right= name=erik_swim_right: scale=2: bp_type=leftdown: type=once
-anim_erik_swim_up_left= name=erik_swim_up_left: scale=2: bp_type=rightdown: type=once
-anim_erik_swim_up_right= name=erik_swim_up_right: scale=2: bp_type=leftdown: type=once
-anim_erik_hit_water_left= name=erik_hit_water_left: scale=2: bp_type=rightdown: type=once
-anim_erik_hit_water_right= name=erik_hit_water_right: scale=2: bp_type=leftdown: type=once
+anim_erik_jump_left= name=erik_jump_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_jump_right= name=erik_jump_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_jump2_left= name=erik_jump2_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_jump2_right= name=erik_jump2_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_start_run_left= name=erik_start_run_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_start_run_right= name=erik_start_run_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_run_left= name=erik_run_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_run_right= name=erik_run_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_swim_left= name=erik_swim_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_swim_right= name=erik_swim_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_swim_up_left= name=erik_swim_up_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_swim_up_right= name=erik_swim_up_right: scale=lvl: bp_type=leftdown: type=once
+anim_erik_hit_water_left= name=erik_hit_water_left: scale=lvl: bp_type=rightdown: type=once
+anim_erik_hit_water_right= name=erik_hit_water_right: scale=lvl: bp_type=leftdown: type=once
au_hit= erikhit.wav
au_jump= rboots.wav
Modified: trunk/data/olaf.inf
===================================================================
--- trunk/data/olaf.inf 2005-09-13 12:58:51 UTC (rev 172)
+++ trunk/data/olaf.inf 2005-09-14 13:21:13 UTC (rev 173)
@@ -1,37 +1,37 @@
#OLAF
-anim_left= name=olaf_idle_left: scale=2: bp_type=rightdown
-anim_right= name=olaf_idle_right: scale=2: bp_type=leftdown
-anim_rock_left= name=olaf_rock_left: scale=2: bp_type=rightdown
-anim_rock_right= name=olaf_rock_right: scale=2: bp_type=leftdown
-anim_walk_left= name=olaf_walk_left: scale=2: bp_type=rightdown
-anim_walk_right= name=olaf_walk_right: scale=2: bp_type=leftdown
-anim_push_left= name=olaf_push_left: scale=2: bp_type=rightdown
-anim_push_right= name=olaf_push_right: scale=2: bp_type=leftdown
-anim_fall_left= name=olaf_fall_left: scale=2: bp_type=rightdown
-anim_fall_right= name=olaf_fall_right: scale=2: bp_type=leftdown
-anim_fall_fast_left= name=olaf_fall_fast_left: scale=2: bp_type=rightdown
-anim_fall_fast_right= name=olaf_fall_fast_right: scale=2: bp_type=leftdown
-anim_crash_left= name=olaf_crash_left: scale=2: bp_type=rightdown: type=once
-anim_crash_right= name=olaf_crash_right: scale=2: bp_type=leftdown: type=once
-anim_rope_left= name=olaf_rope_left: scale=2: bp_type=rightdown
-anim_rope_right= name=olaf_rope_right: scale=2: bp_type=leftdown
-anim_teleport_left= name=olaf_teleport_left: scale=2: bp_type=rightdown: type=once
-anim_teleport_right= name=olaf_teleport_right: scale=2: bp_type=leftdown: type=once
-anim_die_bones_left= name=olaf_die_bones_left: scale=2: bp_type=rightdown: type=once
-anim_die_bones_right= name=olaf_die_bones_right: scale=2: bp_type=leftdown: type=once
-anim_die_elec_left= name=olaf_die_elec_left: scale=2: bp_type=rightdown: type=once
-anim_die_elec_right= name=olaf_die_elec_right: scale=2: bp_type=leftdown: type=once
-anim_die_spike_left= name=olaf_die_spike_left: scale=2: bp_type=rightdown: type=once
-anim_die_spike_right= name=olaf_die_spike_right: scale=2: bp_type=leftdown: type=once
-anim_bar= name=bar_olaf: scale=2: type=once
+anim_left= name=olaf_idle_left: scale=lvl: bp_type=rightdown
+anim_right= name=olaf_idle_right: scale=lvl: bp_type=leftdown
+anim_rock_left= name=olaf_rock_left: scale=lvl: bp_type=rightdown
+anim_rock_right= name=olaf_rock_right: scale=lvl: bp_type=leftdown
+anim_walk_left= name=olaf_walk_left: scale=lvl: bp_type=rightdown
+anim_walk_right= name=olaf_walk_right: scale=lvl: bp_type=leftdown
+anim_push_left= name=olaf_push_left: scale=lvl: bp_type=rightdown
+anim_push_right= name=olaf_push_right: scale=lvl: bp_type=leftdown
+anim_fall_left= name=olaf_fall_left: scale=lvl: bp_type=rightdown
+anim_fall_right= name=olaf_fall_right: scale=lvl: bp_type=leftdown
+anim_fall_fast_left= name=olaf_fall_fast_left: scale=lvl: bp_type=rightdown
+anim_fall_fast_right= name=olaf_fall_fast_right: scale=lvl: bp_type=leftdown
+anim_crash_left= name=olaf_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_crash_right= name=olaf_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_rope_left= name=olaf_rope_left: scale=lvl: bp_type=rightdown
+anim_rope_right= name=olaf_rope_right: scale=lvl: bp_type=leftdown
+anim_teleport_left= name=olaf_teleport_left: scale=lvl: bp_type=rightdown: type=once
+anim_teleport_right= name=olaf_teleport_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_bones_left= name=olaf_die_bones_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_bones_right= name=olaf_die_bones_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_elec_left= name=olaf_die_elec_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_elec_right= name=olaf_die_elec_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_spike_left= name=olaf_die_spike_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_spike_right= name=olaf_die_spike_right: scale=lvl: bp_type=leftdown: type=once
+anim_bar= name=bar_olaf: scale=lvl: type=once
-anim_olaf_small_left= name=olaf_idle_small_left: scale=2: bp_type=rightdown
-anim_olaf_small_right= name=olaf_idle_small_right: scale=2: bp_type=leftdown
-anim_olaf_walk_small_left= name=olaf_walk_small_left: scale=2: bp_type=rightdown
-anim_olaf_walk_small_right= name=olaf_walk_small_right: scale=2: bp_type=leftdown
-anim_olaf_shield_left= name=olaf_idle_shield_left: scale=2: bp_type=rightdown
-anim_olaf_shield_right= name=olaf_idle_shield_right: scale=2: bp_type=leftdown
-anim_olaf_fall_shield_left= name=olaf_fall_shield_left: scale=2: bp_type=rightdown
-anim_olaf_fall_shield_right= name=olaf_fall_shield_right: scale=2: bp_type=leftdown
-anim_olaf_walk_shield_left= name=olaf_walk_shield_left: scale=2: bp_type=rightdown
-anim_olaf_walk_shield_right= name=olaf_walk_shield_right: scale=2: bp_type=leftdown
+anim_olaf_small_left= name=olaf_idle_small_left: scale=lvl: bp_type=rightdown
+anim_olaf_small_right= name=olaf_idle_small_right: scale=lvl: bp_type=leftdown
+anim_olaf_walk_small_left= name=olaf_walk_small_left: scale=lvl: bp_type=rightdown
+anim_olaf_walk_small_right= name=olaf_walk_small_right: scale=lvl: bp_type=leftdown
+anim_olaf_shield_left= name=olaf_idle_shield_left: scale=lvl: bp_type=rightdown
+anim_olaf_shield_right= name=olaf_idle_shield_right: scale=lvl: bp_type=leftdown
+anim_olaf_fall_shield_left= name=olaf_fall_shield_left: scale=lvl: bp_type=rightdown
+anim_olaf_fall_shield_right= name=olaf_fall_shield_right: scale=lvl: bp_type=leftdown
+anim_olaf_walk_shield_left= name=olaf_walk_shield_left: scale=lvl: bp_type=rightdown
+anim_olaf_walk_shield_right= name=olaf_walk_shield_right: scale=lvl: bp_type=leftdown
Modified: trunk/data/scorch.inf
===================================================================
--- trunk/data/scorch.inf 2005-09-13 12:58:51 UTC (rev 172)
+++ trunk/data/scorch.inf 2005-09-14 13:21:13 UTC (rev 173)
@@ -1,18 +1,18 @@
#SCORCH
-anim_left= name=scorch_idle_left: scale=2: bp_type=rightdown
-anim_right= name=scorch_idle_right: scale=2: bp_type=leftdown
-anim_walk_left= name=scorch_walk_left: scale=2: bp_type=rightdown
-anim_walk_right= name=scorch_walk_right: scale=2: bp_type=leftdown
-anim_push_left= name=scorch_push_left: scale=2: bp_type=rightdown
-anim_push_right= name=scorch_push_right: scale=2: bp_type=leftdown
-anim_crash_left= name=scorch_crash_left: scale=2: bp_type=rightdown: type=once
-anim_crash_right= name=scorch_crash_right: scale=2: bp_type=leftdown: type=once
-anim_teleport_left= name=scorch_teleport_left: scale=2: bp_type=rightdown: type=once
-anim_teleport_right= name=scorch_teleport_right: scale=2: bp_type=leftdown: type=once
-anim_die_crash_left= name=scorch_die_crash_left: scale=2: bp_type=rightdown: type=once
-anim_die_crash_right= name=scorch_die_crash_right: scale=2: bp_type=leftdown: type=once
-anim_die_burn_left= name=scorch_die_burn_left: scale=2: bp_type=rightdown: type=once
-anim_die_burn_right= name=scorch_die_burn_right: scale=2: bp_type=leftdown: type=once
-anim_die_bones_left= name=scorch_die_bones_left: scale=2: bp_type=rightdown: type=once
-anim_die_bones_right= name=scorch_die_bones_right: scale=2: bp_type=leftdown: type=once
-anim_bar= name=bar_scorch: scale=2: type=once
+anim_left= name=scorch_idle_left: scale=lvl: bp_type=rightdown
+anim_right= name=scorch_idle_right: scale=lvl: bp_type=leftdown
+anim_walk_left= name=scorch_walk_left: scale=lvl: bp_type=rightdown
+anim_walk_right= name=scorch_walk_right: scale=lvl: bp_type=leftdown
+anim_push_left= name=scorch_push_left: scale=lvl: bp_type=rightdown
+anim_push_right= name=scorch_push_right: scale=lvl: bp_type=leftdown
+anim_crash_left= name=scorch_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_crash_right= name=scorch_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_teleport_left= name=scorch_teleport_left: scale=lvl: bp_type=rightdown: type=once
+anim_teleport_right= name=scorch_teleport_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_crash_left= name=scorch_die_crash_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_crash_right= name=scorch_die_crash_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_burn_left= name=scorch_die_burn_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_burn_right= name=scorch_die_burn_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_bones_left= name=scorch_die_bones_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_bones_right= name=scorch_die_bones_right: scale=lvl: bp_type=leftdown: type=once
+anim_bar= name=bar_scorch: scale=lvl: type=once
Modified: trunk/src/objects_common.cpp
===================================================================
--- trunk/src/objects_common.cpp 2005-09-13 12:58:51 UTC (rev 172)
+++ trunk/src/objects_common.cpp 2005-09-14 13:21:13 UTC (rev 173)
@@ -151,7 +151,10 @@
double fps=0;
AllignType allign_type=AT_MD;
- if (hasParam(parameters,"scale")) scale_factor=atof(parameters.find("scale")->second.c_str());
+ if (hasParam(parameters,"scale")) {
+ if (parameters.find("scale")->second == "lvl") scale_factor=config.lvlscale;
+ else scale_factor=atof(parameters.find("scale")->second.c_str());
+ }
if (hasParam(parameters,"bp_type")) {
if (parameters.find("bp_type")->second.find("hleft") !=string::npos) {
if (parameters.find("bp_type")->second.find("vup") !=string::npos) bp_type=BP_LU;
More information about the lostpenguins-commits
mailing list