miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for the new webpage and bug fixes since 0.2.9.6

Browse Source 
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@36 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
gerstrong
2009-07-04 11:46:12 +00:00
parent 5a050591f5
commit 6d115861b7
39 changed files with 357 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/baby.cpp
View File

@@ -96,7 +96,7 @@ unsigned int ep3;
// got hit?
if (objects[o].zapped)
{
if (objects[o].zapped > 1 || !options[OPT_MEAN].value)
if (objects[o].zapped > 1 || !levelcontrol.hardmode)
{ // we're fried!!
if (objects[o].ai.baby.state != BABY_DYING)
{

12
src/ai/butler.cpp
View File

@@ -30,7 +30,7 @@
#define BUTLER_TURNLEFT_FRAME 96
#define BUTLER_TURNRIGHT_FRAME 97
void butler_ai(int o)
void butler_ai(int o, bool hardmode)
{
char not_about_to_fall;
if (objects[o].needinit)
@@ -58,14 +58,14 @@ char not_about_to_fall;
if (player[primaryplayer].x < objects[o].x)
{
player[objects[o].touchedBy].playpushed_x = -butlerpushamount;
if (options[OPT_MEAN].value) player[objects[o].touchedBy].playpushed_x -= BUTLERPUSHAMOUNTFAST;
if (hardmode) player[objects[o].touchedBy].playpushed_x -= BUTLERPUSHAMOUNTFAST;
player[objects[o].touchedBy].playpushed_decreasetimer = 0;
player[objects[o].touchedBy].pdir = player[objects[o].touchedBy].pshowdir = LEFT;
}
else
{
player[objects[o].touchedBy].playpushed_x = butlerpushamount;
if (options[OPT_MEAN].value) player[objects[o].touchedBy].playpushed_x += BUTLERPUSHAMOUNTFAST;
if (hardmode) player[objects[o].touchedBy].playpushed_x += BUTLERPUSHAMOUNTFAST;
player[objects[o].touchedBy].playpushed_decreasetimer = 0;
player[objects[o].touchedBy].pdir = player[objects[o].touchedBy].pshowdir = RIGHT;
}
@@ -91,7 +91,7 @@ char not_about_to_fall;
objects[o].sprite = BUTLER_WALK_LEFT_FRAME + objects[o].ai.butler.frame;
if (!objects[o].blockedl && not_about_to_fall)
{
if (options[OPT_MEAN].value)
if (hardmode)
objects[o].x -= BUTLER_WALK_SPEED_FAST;
else
objects[o].x -= BUTLER_WALK_SPEED;
@@ -113,7 +113,7 @@ char not_about_to_fall;
objects[o].sprite = BUTLER_WALK_RIGHT_FRAME + objects[o].ai.butler.frame;
if (!objects[o].blockedr && not_about_to_fall)
{
if (options[OPT_MEAN].value)
if (hardmode)
objects[o].x += BUTLER_WALK_SPEED_FAST;
else
objects[o].x += BUTLER_WALK_SPEED;
@@ -129,7 +129,7 @@ char not_about_to_fall;
}
// walk animation
if (objects[o].ai.butler.animtimer > BUTLER_WALK_ANIM_TIME || \
(objects[o].ai.butler.animtimer > BUTLER_WALK_ANIM_TIME_FAST && options[OPT_MEAN].value))
(objects[o].ai.butler.animtimer > BUTLER_WALK_ANIM_TIME_FAST && hardmode))
{
if (objects[o].ai.butler.frame>=3) objects[o].ai.butler.frame=0;
else objects[o].ai.butler.frame++;

2
src/ai/foob.cpp
View File

@@ -54,7 +54,7 @@ unsigned int i;
objects[o].ai.foob.state = FOOB_EXPLODE;
objects[o].canbezapped = 0;
if (objects[o].onscreen) g_pSound->playStereofromCoord(SOUND_YORP_DIE, PLAY_NOW, objects[o].scrx);
if (options[OPT_MEAN].value && objects[o].touchPlayer)
if (pCKP->Control.levelcontrol.hardmode && objects[o].touchPlayer)
{
killplayer(objects[o].touchedBy, pCKP);
}

6
src/ai/garg.cpp
View File

@@ -205,7 +205,7 @@ unsigned int i;
if (garg_CanWalkLeft(o))
{
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
objects[o].x -= GARG_WALK_SPEED_FAST;
else
objects[o].x -= GARG_WALK_SPEED;
@@ -223,7 +223,7 @@ unsigned int i;
objects[o].sprite = GARG_WALK_RIGHT + objects[o].ai.garg.walkframe;
if (garg_CanWalkRight(o))
{
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
objects[o].x += GARG_WALK_SPEED_FAST;
else
objects[o].x += GARG_WALK_SPEED;
@@ -239,7 +239,7 @@ unsigned int i;
/* walk animation */
if (objects[o].ai.garg.timer > GARG_WALK_ANIM_TIME || \
(objects[o].ai.garg.timer > GARG_WALK_ANIM_TIME && options[OPT_MEAN].value))
(objects[o].ai.garg.timer > GARG_WALK_ANIM_TIME && pCKP->Control.levelcontrol.hardmode))
{
objects[o].ai.garg.walkframe ^= 1;
objects[o].ai.garg.timer = 0;

4
src/ai/mother.cpp
View File

@@ -11,8 +11,8 @@
#define MOTHER_HURT 2
#define MOTHER_DEAD 3
#define MOTHER_WALK_ANIM_RATE 70
#define MOTHER_WALK_SPD 1
#define MOTHER_WALK_ANIM_RATE 40
#define MOTHER_WALK_SPD 4
#define MOTHER_SPIT_PROB 1000
#define MOTHER_SPIT_SHOW_TIME 100

2
src/ai/ninja.cpp
View File

@@ -35,7 +35,7 @@ int onsamelevel;
{
objects[o].ai.ninja.state = NINJA_STAND;
objects[o].ai.ninja.timetillkick = (rand()%(NINJA_MAX_TIME_TILL_KICK-NINJA_MIN_TIME_TILL_KICK))+NINJA_MIN_TIME_TILL_KICK;
if (options[OPT_MEAN].value) objects[o].ai.ninja.timetillkick /= 3;
if (pCKP->Control.levelcontrol.hardmode) objects[o].ai.ninja.timetillkick /= 3;
if (player[primaryplayer].x < objects[o].x)
{ objects[o].ai.ninja.dir = LEFT; }

4
src/ai/sndwave.cpp
View File

@@ -57,7 +57,7 @@ void sndwave_ai(int o, stCloneKeenPlus *pCKP)
}
else
{
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
objects[o].x += SNDWAVE_SPEED_FAST;
else
objects[o].x += SNDWAVE_SPEED;
@@ -72,7 +72,7 @@ void sndwave_ai(int o, stCloneKeenPlus *pCKP)
}
else
{
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
objects[o].x -= SNDWAVE_SPEED_FAST;
else
objects[o].x -= SNDWAVE_SPEED;

8
src/ai/tank.cpp
View File

@@ -38,7 +38,7 @@
char tank_CanMoveLeft(int o);
char tank_CanMoveRight(int o);
void tank_ai(int o)
void tank_ai(int o, bool hardmode)
{
int newobject;
unsigned int i;
@@ -150,11 +150,11 @@ unsigned int i;
if (objects[o].ai.tank.detectedPlayer)
{
objects[o].ai.tank.ponsameleveltime++;
if (objects[o].ai.tank.ponsameleveltime > TANK_SAME_LEVEL_TIME_FAST && options[OPT_MEAN].value)
if (objects[o].ai.tank.ponsameleveltime > TANK_SAME_LEVEL_TIME_FAST && hardmode)
{ // keen would be a good target now. (hard mode)
if (!objects[o].ai.tank.alreadyfiredcauseonsamelevel ||\
objects[o].ai.tank.ponsameleveltime > TANK_REPEAT_FIRE_TIME || \
(objects[o].ai.tank.ponsameleveltime > TANK_REPEAT_FIRE_TIME_FAST && options[OPT_MEAN].value))
(objects[o].ai.tank.ponsameleveltime > TANK_REPEAT_FIRE_TIME_FAST && hardmode))
{
// facing keen?
objects[o].ai.tank.alreadyfiredcauseonsamelevel = 1;
@@ -232,7 +232,7 @@ unsigned int i;
break;
case TANK_FIRE:
if (objects[o].ai.tank.timer > TANK_PREPAREFIRE_TIME || \
(objects[o].ai.tank.timer > TANK_PREPAREFIRE_TIME_FAST && options[OPT_MEAN].value))
(objects[o].ai.tank.timer > TANK_PREPAREFIRE_TIME_FAST && hardmode))
{
if (objects[o].onscreen) g_pSound->playStereofromCoord(SOUND_TANK_FIRE, PLAY_NOW, objects[o].scrx);
if (objects[o].ai.tank.movedir==RIGHT)

2
src/ai/tankep2.cpp
View File

@@ -141,7 +141,7 @@ unsigned int i;
else
{
// no we're not facing him, on hard difficulty turn around
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
{
objects[o].ai.tank.frame = 0;
objects[o].ai.tank.timer = 0;

4
src/ai/vort.cpp
View File

@@ -44,7 +44,7 @@ int bonk,kill;
objects[o].canbezapped = 1;
objects[o].needinit = 0;
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
{
objects[o].ai.vort.ep1style = 1;
}
@@ -118,7 +118,7 @@ int bonk,kill;
else
{
objects[o].ai.vort.state = VORT2_DYING;
if (options[OPT_MEAN].value)
if (pCKP->Control.levelcontrol.hardmode)
{
fade.mode = FADE_GO;
fade.dir = FADE_IN;

14
src/ai/yorp.cpp
View File

@@ -126,7 +126,7 @@ char numlooks;
{
bump_left: ;
player[objects[o].touchedBy].playpushed_x = -pushamt;
if (options[OPT_MEAN].value) player[objects[o].touchedBy].playpushed_x -= YORPPUSHAMOUNT_FAST;
if (levelcontrol.hardmode) player[objects[o].touchedBy].playpushed_x -= YORPPUSHAMOUNT_FAST;
player[objects[o].touchedBy].playpushed_decreasetimer = 0;
if (!player[objects[o].touchedBy].pjumping)
{
@@ -137,7 +137,7 @@ char numlooks;
{
bump_right: ;
player[objects[o].touchedBy].playpushed_x = pushamt;
if (options[OPT_MEAN].value) player[objects[o].touchedBy].playpushed_x += YORPPUSHAMOUNT_FAST;
if (levelcontrol.hardmode) player[objects[o].touchedBy].playpushed_x += YORPPUSHAMOUNT_FAST;
player[objects[o].touchedBy].playpushed_decreasetimer = 0;
if (!player[objects[o].touchedBy].pjumping)
{
@@ -185,7 +185,7 @@ char numlooks;
}
break;
case YORP_LOOK:
if (options[OPT_MEAN].value) numlooks = YORP_NUM_LOOKS_FAST; else numlooks = YORP_NUM_LOOKS;
if (levelcontrol.hardmode) numlooks = YORP_NUM_LOOKS_FAST; else numlooks = YORP_NUM_LOOKS;
if (objects[o].ai.yorp.looktimes>numlooks &&\
objects[o].ai.yorp.timer==YORP_LOOK_TIME-(YORP_LOOK_TIME/4))
{
@@ -251,7 +251,7 @@ char numlooks;
objects[o].sprite = YORP_WALK_LEFT + objects[o].ai.yorp.walkframe;
if (!objects[o].blockedl)
{
if (options[OPT_MEAN].value)
if (levelcontrol.hardmode)
objects[o].x -= YORP_WALK_SPEED_FAST;
else
objects[o].x -= YORP_WALK_SPEED;
@@ -271,7 +271,7 @@ char numlooks;
objects[o].sprite = YORP_WALK_RIGHT + objects[o].ai.yorp.walkframe;
if (!objects[o].blockedr)
{
if (options[OPT_MEAN].value)
if (levelcontrol.hardmode)
objects[o].x += YORP_WALK_SPEED_FAST;
else
objects[o].x += YORP_WALK_SPEED;
@@ -287,7 +287,7 @@ char numlooks;
}
// walk animation
if (objects[o].ai.yorp.timer > YORP_WALK_ANIM_TIME || \
(objects[o].ai.yorp.timer > YORP_WALK_ANIM_TIME_FAST && options[OPT_MEAN].value))
(objects[o].ai.yorp.timer > YORP_WALK_ANIM_TIME_FAST && levelcontrol.hardmode))
{
objects[o].ai.yorp.walkframe ^= 1;
objects[o].ai.yorp.timer = 0;
@@ -297,7 +297,7 @@ char numlooks;
objects[o].sprite = YORP_STUNFRAME + objects[o].ai.yorp.walkframe;
if (objects[o].ai.yorp.timer > YORP_STUN_ANIM_TIME)
{
if (options[OPT_MEAN].value) numlooks = YORP_STUNTIME_FAST; else numlooks = YORP_STUNTIME;
if (levelcontrol.hardmode) numlooks = YORP_STUNTIME_FAST; else numlooks = YORP_STUNTIME;
if (objects[o].ai.yorp.looktimes>numlooks)
{
objects[o].ai.yorp.looktimes = 0;