r174 - in trunk: data src
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Sep 14 12:00:24 EDT 2005
Author: jonas
Date: 2005-09-14 12:00:24 -0400 (Wed, 14 Sep 2005)
New Revision: 174
Added:
trunk/data/fang.inf
Modified:
trunk/data/map1.cfg
trunk/data/map2.cfg
trunk/src/objects_common.cpp
Log:
added fang lvl animations, fixed a huge animation type bug
Added: trunk/data/fang.inf
===================================================================
--- trunk/data/fang.inf 2005-09-14 13:21:13 UTC (rev 173)
+++ trunk/data/fang.inf 2005-09-14 16:00:24 UTC (rev 174)
@@ -0,0 +1,27 @@
+#FANG
+anim_left= name=fang_idle_left: scale=lvl: bp_type=rightdown
+anim_right= name=fang_idle_right: scale=lvl: bp_type=leftdown
+anim_rock_left= name=fang_rock_left: scale=lvl: bp_type=rightdown
+anim_rock_right= name=fang_rock_right: scale=lvl: bp_type=leftdown
+anim_walk_left= name=fang_walk_left: scale=lvl: bp_type=rightdown
+anim_walk_right= name=fang_walk_right: scale=lvl: bp_type=leftdown
+anim_push_left= name=fang_push_left: scale=lvl: bp_type=rightdown
+anim_push_right= name=fang_push_right: scale=lvl: bp_type=leftdown
+anim_fall_left= name=fang_fall_left: scale=lvl: bp_type=rightdown
+anim_fall_right= name=fang_fall_right: scale=lvl: bp_type=leftdown
+anim_rope_left= name=fang_rope_left: scale=lvl: bp_type=rightdown
+anim_rope_right= name=fang_rope_right: scale=lvl: bp_type=leftdown
+anim_teleport_left= name=fang_teleport_left: scale=lvl: bp_type=rightdown: type=once
+anim_teleport_right= name=fang_teleport_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_burn_left= name=fang_die_burn_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_burn_right= name=fang_die_burn_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_bones_left= name=fang_die_bones_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_bones_right= name=fang_die_bones_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_elec_left= name=fang_die_elec_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_elec_right= name=fang_die_elec_right: scale=lvl: bp_type=leftdown: type=once
+anim_die_spike_left= name=fang_die_spike_left: scale=lvl: bp_type=rightdown: type=once
+anim_die_spike_right= name=fang_die_spike_right: scale=lvl: bp_type=leftdown: type=once
+anim_bar= name=bar_fang: scale=lvl: type=once
+
+anim_fang_claw_left= name=fang_claw_left: scale=lvl: bp_type=rightdown: type=once
+anim_fang_claw_right= name=fang_claw_right: scale=lvl: bp_type=leftdown: type=once
Modified: trunk/data/map1.cfg
===================================================================
--- trunk/data/map1.cfg 2005-09-14 13:21:13 UTC (rev 173)
+++ trunk/data/map1.cfg 2005-09-14 16:00:24 UTC (rev 174)
@@ -20,4 +20,4 @@
Baleog file=baleog.inf
Olaf 0 5 file=olaf.inf
Scorch 0 10 file=scorch.inf
-#Fang 30 10
+Fang 30 10 file=fang.inf
Modified: trunk/data/map2.cfg
===================================================================
--- trunk/data/map2.cfg 2005-09-14 13:21:13 UTC (rev 173)
+++ trunk/data/map2.cfg 2005-09-14 16:00:24 UTC (rev 174)
@@ -24,7 +24,7 @@
Geyser 200 668 image=viking1.bmp,aspeed=-1200
#Vikings
-Fang 0 116
+Fang 0 116 file=fang.inf
Erik 0 116 file=erik.inf
Olaf 0 116 file=olaf.inf
#Scorch 0 116
Modified: trunk/src/objects_common.cpp
===================================================================
--- trunk/src/objects_common.cpp 2005-09-14 13:21:13 UTC (rev 173)
+++ trunk/src/objects_common.cpp 2005-09-14 16:00:24 UTC (rev 174)
@@ -172,11 +172,11 @@
}
if (hasParam(parameters,"type")) {
animation_type=NOTHING;
- if (parameters.find("type")->second.find("once")) animation_type|=ATYPE_ONCE;
- if (parameters.find("type")->second.find("loop")) animation_type|=ATYPE_LOOP;
- if (parameters.find("type")->second.find("swing")) animation_type|=ATYPE_SWING;
- if (parameters.find("type")->second.find("step")) animation_type|=ATYPE_STEP;
- if (parameters.find("type")->second.find("reverse")) {
+ if (parameters.find("type")->second.find("once") !=string::npos) animation_type|=ATYPE_ONCE;
+ if (parameters.find("type")->second.find("loop") !=string::npos) animation_type|=ATYPE_LOOP;
+ if (parameters.find("type")->second.find("swing") !=string::npos) animation_type|=ATYPE_SWING;
+ if (parameters.find("type")->second.find("step") !=string::npos) animation_type|=ATYPE_STEP;
+ if (parameters.find("type")->second.find("reverse" !=string::npos)) {
animation_type<<=1;
}
if (animation_type==NOTHING) animation_type=ATYPE_LOOP;
More information about the lostpenguins-commits
mailing list