r76 - trunk/src/objects
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 6 07:22:14 EDT 2004
Author: jonas
Date: 2004-10-06 07:22:14 -0400 (Wed, 06 Oct 2004)
New Revision: 76
Modified:
trunk/src/objects/baleog.cpp
trunk/src/objects/erik.cpp
trunk/src/objects/fang.cpp
trunk/src/objects/olaf.cpp
trunk/src/objects/scorch.cpp
trunk/src/objects/zombie.cpp
Log:
more sprites...
Modified: trunk/src/objects/baleog.cpp
===================================================================
--- trunk/src/objects/baleog.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/baleog.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -9,19 +9,19 @@
Baleog::Baleog(string imagename, Sint16 xcord, Sint16 ycord, string pname):
Player(imagename,xcord,ycord,pname) {
- im_left=new Animation(imgcache->loadImage("baleog_left.bmp"));
- im_right=new Animation(imgcache->loadImage("baleog_right.bmp"));
- im_run_left=new Animation(imgcache->loadImage("baleog-run_left.png"),8,1000);
- im_run_right=new Animation(imgcache->loadImage("baleog-run_right.png"),8,1000);
+ im_left=new Animation(imgcache->loadImage("baleog1_left.bmp"));
+ im_right=new Animation(imgcache->loadImage("baleog1_right.bmp"));
+ im_run_left=new Animation(imgcache->loadImage("baleog1-run_left.png"),8,1000);
+ im_run_right=new Animation(imgcache->loadImage("baleog1-run_right.png"),8,1000);
im_fall_left=im_left;
im_fall_right=im_right;
im_krit_left=im_left;
im_krit_right=im_right;
- im_land_left=new Animation(imgcache->loadImage("olaf_land_left.bmp"),1,T_IRR,true);
- im_land_right=new Animation(imgcache->loadImage("olaf_land_right.bmp"),1,T_IRR,true);
+ im_land_left=new Animation(imgcache->loadImage("olaf1_land_left.bmp"),1,T_IRR,true);
+ im_land_right=new Animation(imgcache->loadImage("olaf1_land_right.bmp"),1,T_IRR,true);
weapon=Weapon(-1,W_STRIKE);
- im_sword_left=new Animation(60,imgcache->loadImage("kuru.bmp"),12,500,true);
- im_sword_right=im_sword_left;
+ im_sword_left=new Animation(imgcache->loadImage("BaleogCyborg_Slash_left.png"),8,1000,true);
+ im_sword_right=new Animation(imgcache->loadImage("BaleogCyborg_Slash_right.png"),8,1000,true);
au_sword=sndcache->loadWAV("swrdsw2.wav");
}
@@ -33,6 +33,7 @@
delete im_land_left;
delete im_land_right;
delete im_sword_left;
+ delete im_sword_right;
}
//Baleog1: Sword attack
Modified: trunk/src/objects/erik.cpp
===================================================================
--- trunk/src/objects/erik.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/erik.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -15,16 +15,16 @@
jump(V_JUMP),
jump2(V_JUMP2) {
weapon=Weapon(-1,W_PRESSURE,WS_PRESSURE);
- im_left=new Animation(imgcache->loadImage("erik_left.bmp"));
- im_right=new Animation(imgcache->loadImage("erik_right.bmp"));
+ im_left=new Animation(imgcache->loadImage("erik1_left.bmp"));
+ im_right=new Animation(imgcache->loadImage("erik1_right.bmp"));
im_run_right=im_right;
im_run_left=im_left;
im_fall_left=im_left;
im_fall_right=im_right;
im_krit_left=im_left;
im_krit_right=im_right;
- im_land_left=new Animation(imgcache->loadImage("olaf_land_left.bmp"),1,T_IRR,true);
- im_land_right=new Animation(imgcache->loadImage("olaf_land_right.bmp"),1,T_IRR,true);
+ im_land_left=new Animation(imgcache->loadImage("olaf1_land_left.bmp"),1,T_IRR,true);
+ im_land_right=new Animation(imgcache->loadImage("olaf1_land_right.bmp"),1,T_IRR,true);
au_jump=sndcache->loadWAV("rboots.wav");
au_hit=sndcache->loadWAV("erikhit.wav");
au_run=NULL;
Modified: trunk/src/objects/fang.cpp
===================================================================
--- trunk/src/objects/fang.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/fang.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -11,18 +11,18 @@
Player(imagename,xcord,ycord,pname),
jump(V_JUMP) {
weapon=Weapon(-1,W_STRIKE);
- im_left=new Animation(imgcache->loadImage("olaf_left.bmp"));
- im_right=new Animation(imgcache->loadImage("olaf_right.bmp"));
- im_run_left=new Animation(imgcache->loadImage("olaf-run_left.png"),8,1000);
- im_run_right=new Animation(imgcache->loadImage("olaf-run_right.png"),8,1000);
+ im_left=new Animation(imgcache->loadImage("Fang_Breath_left.png"),4,1000);
+ im_right=new Animation(imgcache->loadImage("Fang_Breath_right.png"),4,1000);
+ im_run_left=new Animation(imgcache->loadImage("Fang_walk_left.png"),8,1000);
+ im_run_right=new Animation(imgcache->loadImage("Fang_walk_right.png"),8,1000);
im_fall_left=im_left;
im_fall_right=im_right;
im_krit_left=im_left;
im_krit_right=im_right;
- im_land_left=new Animation(imgcache->loadImage("olaf_land_left.bmp"),1,T_IRR,true);
- im_land_right=new Animation(imgcache->loadImage("olaf_land_right.bmp"),1,T_IRR,true);
- im_claw_left=new Animation(60,imgcache->loadImage("kuru.bmp"),12,500,true);
- im_claw_right=im_claw_left;
+ im_land_left=new Animation(imgcache->loadImage("olaf1_land_left.bmp"),1,T_IRR,true);
+ im_land_right=new Animation(imgcache->loadImage("olaf1_land_right.bmp"),1,T_IRR,true);
+ im_claw_left=new Animation(imgcache->loadImage("Fang_Clawslash_left.png"),8,1000,true);
+ im_claw_right=new Animation(imgcache->loadImage("Fang_Clawslash_right.png"),8,1000,true);
au_hit=sndcache->loadWAV("wolfhit.wav");
au_claw=sndcache->loadWAV("wolfjmp1.wav");
au_jump=sndcache->loadWAV("fangjump.wav");
@@ -35,6 +35,7 @@
delete im_land_left;
delete im_land_right;
delete im_claw_left;
+ delete im_claw_right;
}
void Fang::in_left(Sint16 dt) {
Modified: trunk/src/objects/olaf.cpp
===================================================================
--- trunk/src/objects/olaf.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/olaf.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -11,23 +11,23 @@
Olaf::Olaf(string imagename, Sint16 xcord, Sint16 ycord, string pname):
Player(imagename,xcord,ycord,pname),
fart(V_FART) {
- im_left=new Animation(imgcache->loadImage("olaf_left.bmp"));
- im_right=new Animation(imgcache->loadImage("olaf_right.bmp"));
- im_run_left=new Animation(imgcache->loadImage("olaf-run_left.png"),8,1000);
- im_run_right=new Animation(imgcache->loadImage("olaf-run_right.png"),8,1000);
+ im_left=new Animation(imgcache->loadImage("olaf1_left.bmp"));
+ im_right=new Animation(imgcache->loadImage("olaf1_right.bmp"));
+ im_run_left=new Animation(imgcache->loadImage("olaf1-run_left.png"),8,1000);
+ im_run_right=new Animation(imgcache->loadImage("olaf1-run_right.png"),8,1000);
im_fall_left=im_left;
im_fall_right=im_right;
im_krit_left=im_left;
im_krit_right=im_right;
- im_land_left=new Animation(imgcache->loadImage("olaf_land_left.bmp"),1,T_IRR,true);
- im_land_right=new Animation(imgcache->loadImage("olaf_land_right.bmp"),1,T_IRR,true);
+ im_land_left=new Animation(imgcache->loadImage("olaf1_land_left.bmp"),1,T_IRR,true);
+ im_land_right=new Animation(imgcache->loadImage("olaf1_land_right.bmp"),1,T_IRR,true);
- im_small_left=new Animation(imgcache->loadImage("gun.bmp"),9,1000);
- im_small_right=im_small_left;
- im_run_small_left=im_small_left;
- im_run_small_right=im_small_right;
- im_shield_right=new Animation(imgcache->loadImage("olaf_fall_shield_right.bmp"));
- im_shield_left=new Animation(imgcache->loadImage("olaf_fall_shield_left.bmp"));
+ im_small_left=new Animation(imgcache->loadImage("Olaf_Small_Walk_left.png"),7,0);
+ im_small_right=new Animation(imgcache->loadImage("Olaf_Small_Walk_right.png"),7,0);
+ im_run_small_left=new Animation(imgcache->loadImage("Olaf_Small_Walk_left.png"),7,500);
+ im_run_small_right=new Animation(imgcache->loadImage("Olaf_Small_Walk_right.png"),7,500);
+ im_shield_right=new Animation(imgcache->loadImage("olaf1_fall_shield_right.bmp"));
+ im_shield_left=new Animation(imgcache->loadImage("olaf1_fall_shield_left.bmp"));
im_run_shield_right=im_shield_right;
im_run_shield_left=im_shield_left;
im_fall_shield_left=im_shield_left;
@@ -46,6 +46,9 @@
delete im_land_left;
delete im_land_right;
delete im_small_left;
+ delete im_small_right;
+ delete im_run_small_left;
+ delete im_run_small_right;
delete im_shield_right;
delete im_shield_left;
}
@@ -121,9 +124,11 @@
//as we don't fall most states are off anyway
unsetState(STATE_SHIELD);
setState(STATE_SMALL);
+ maxspeedx/=4;
} else {
sfxeng->playWAV(au_big);
unsetState(STATE_SMALL);
+ maxspeedx*=4;
}
return true;
} else return false;
Modified: trunk/src/objects/scorch.cpp
===================================================================
--- trunk/src/objects/scorch.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/scorch.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -11,16 +11,16 @@
Player(imagename,xcord,ycord,pname),
left_wings(SCORCH_MAX_WINGS),
wing(V_FLY) {
- im_left=new Animation(imgcache->loadImage("baleog_left.bmp"));
- im_right=new Animation(imgcache->loadImage("baleog_right.bmp"));
- im_run_left=new Animation(imgcache->loadImage("baleog-run_left.png"),8,1000);
- im_run_right=new Animation(imgcache->loadImage("baleog-run_right.png"),8,1000);
+ im_left=new Animation(imgcache->loadImage("baleog1_left.bmp"));
+ im_right=new Animation(imgcache->loadImage("baleog1_right.bmp"));
+ im_run_left=new Animation(imgcache->loadImage("baleog1-run_left.png"),8,1000);
+ im_run_right=new Animation(imgcache->loadImage("baleog1-run_right.png"),8,1000);
im_fall_left=im_left;
im_fall_right=im_right;
im_krit_left=im_left;
im_krit_right=im_right;
- im_land_left=new Animation(imgcache->loadImage("olaf_land_left.bmp"),1,T_IRR,true);
- im_land_right=new Animation(imgcache->loadImage("olaf_land_right.bmp"),1,T_IRR,true);
+ im_land_left=new Animation(imgcache->loadImage("olaf1_land_left.bmp"),1,T_IRR,true);
+ im_land_right=new Animation(imgcache->loadImage("olaf1_land_right.bmp"),1,T_IRR,true);
au_swing=sndcache->loadWAV("flapwngs.wav");
au_tired=sndcache->loadWAV("flwings.wav");
au_hit=sndcache->loadWAV("draghit.wav");
Modified: trunk/src/objects/zombie.cpp
===================================================================
--- trunk/src/objects/zombie.cpp 2004-10-05 19:18:09 UTC (rev 75)
+++ trunk/src/objects/zombie.cpp 2004-10-06 11:22:14 UTC (rev 76)
@@ -15,8 +15,8 @@
au_attack(sndcache->loadWAV("clang.wav")),
T_Attack_Bite(1500) {
maxspeedx=100;
- im_left=new Animation(imgcache->loadImage("olaf_left.bmp"),2,1000);
- im_right=new Animation(imgcache->loadImage("olaf_right.bmp"),2,1000);
+ im_left=new Animation(imgcache->loadImage("olaf1_left.bmp"),2,1000);
+ im_right=new Animation(imgcache->loadImage("olaf1_right.bmp"),2,1000);
weapon=Weapon(-1,W_STRIKE);
}
More information about the lostpenguins-commits
mailing list