diff --git a/defs.h b/defs.h index e0ba03f..4ee2a27 100644 --- a/defs.h +++ b/defs.h @@ -497,7 +497,7 @@ enum SPELL { #define S_SLOPE 2 // Sprite types -#define MAXPTYPES 178 +#define MAXPTYPES 179 #define P_PLAYER 0 #define P_RAT 1 #define P_CHEESE 2 @@ -681,6 +681,7 @@ enum SPELL { #define P_LEAF 175 #define P_FALLINGBRICK 176 #define P_BIGCHEST 177 +#define P_FIREUP 178 #define FLY_FLYTIME 150 diff --git a/rc.c b/rc.c index 53d68cb..2dc4fed 100644 --- a/rc.c +++ b/rc.c @@ -1278,8 +1278,6 @@ printf("timer = %d\n",timer); tick(); } // end main loop - // TODO: fade - // clear screen SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format,black.r,black.g,black.b)); @@ -10863,7 +10861,7 @@ void checksprites(void) { } } else { if ((s->id == P_PUFF) && (s->timer1 != 999)) { -printf("puff deid without changing!!!\n"); +printf("puff died without changing!!!\n"); } killsprite(s); // check for level completion @@ -11972,6 +11970,7 @@ void handleinput(void) { while (SDL_PollEvent(&event)) { if (event.type == SDL_KEYUP) { // TODO: can only add credits in title screen ? + // lose points for each credit after the first. if ((event.key.keysym.sym == SDLK_5) || (event.key.keysym.sym == SDLK_6)) { addcredit(); } diff --git a/shared.c b/shared.c index fdd7a2c..3ed70f0 100644 --- a/shared.c +++ b/shared.c @@ -2008,6 +2008,12 @@ int loadimagesets(void) { loadspriteimage(P_BIGFIREBALL,1, "sprites/bigfire2.png"); imageset[P_BIGFIREBALL].numimages = 2; + loadspriteimage(P_FIREUP,0, "sprites/fireup1.png"); + loadspriteimage(P_FIREUP,1, "sprites/fireup2.png"); + loadspriteimage(P_FIREUP,2, "sprites/fireup3.png"); + loadspriteimage(P_FIREUP,3, "sprites/fireup4.png"); + imageset[P_FIREUP].numimages = 4; + loadspriteimage(P_SONAR,0, "sprites/sonar0.png"); loadspriteimage(P_SONAR,1, "sprites/sonar1.png"); loadspriteimage(P_SONAR,2, "sprites/sonar2.png"); @@ -2929,6 +2935,7 @@ int isbullet(int id) { if (id == P_SPIT) return B_TRUE; if (id == P_FIREBALL) return B_TRUE; if (id == P_BIGFIREBALL) return B_TRUE; + if (id == P_FIREUP) return B_TRUE; if (id == P_SONAR) return B_TRUE; if (id == P_FALLINGBRICK) return B_TRUE; @@ -3951,7 +3958,7 @@ void setfruitinfo(void) { setinfo(P_KINGFLY, "King Fly", "King Fly is quite literally the lord of the flies. Far from the timid garden-variety fly, King Fly will roam around with its entourage of underlings in tow, running down anything in its path!", "kingfly.png"); setinfo(P_KINGANT, "King Ant", "All ants bow down to King Ant, the ultimate ant overlord. King Ant is an enormous fire ant, endlessly covered in flames and able to create ant sustenance from its body. Its flames are so intense that they can instantly melt through solid ice!", "kingant.png"); - setinfo(P_KINGCAT, "King Cat", "The mastermind of the great food heist, the elusive King Cat is rumoured to weild powerful arcane powers.", "kingcat.png"); + setinfo(P_KINGCAT, "King Cat", "The elusive King Cat masterminded the great food heist, and is rumoured to weild powerful arcane magic...", "kingcat.png"); setinfo(P_SNAIL, "Snail", "Snails are slow moving but tough. When attacked normally they will not die, but simply lose their shell and become a slug. The safest way to take them out is to slam another monster into them, thus killing them instantly.", "snail.png"); setinfo(P_SLUG, "Slug", "Slugs are faster moving than snails and capable of launching themselves through the air at their prey!", "slug.png"); @@ -4184,7 +4191,7 @@ void dumpinfo(void) { printf("