WebSVN – eduke32 – Diff – /source/sw/src/weapon.cpp




    return -1;
}

int
MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t dang_shift, int16_t turn_limit, int16_t z_limit*/)
{
    SPRITEp sp = &sprite[Weapon];
    USERp u = User[Weapon];

    int zh;

    return 0;
}

// combination of vector manipulation
int
ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t dang_shift, int16_t turn_limit, int16_t z_limit*/)
{
    SPRITEp sp = &sprite[Weapon];
    USERp u = User[Weapon];

    int dist;


    ox = sp->x;
    oy = sp->y;
    oz = sp->z;

//MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t dang_shift, int16_t turn_limit, int16_t z_limit*/)
    //MissileSeek(Weapon, 20, 1024/*, 6, 80, 6*/);
    DoBlurExtend(Weapon, 0, 4);

    dax = MOVEx(sp->xvel, sp->ang);
    day = MOVEy(sp->xvel, sp->ang);
    daz = sp->zvel;

        PlaySound(DIGI_MINEBEEP,&sp->x,&sp->y,&sp->z,v3df_follow);
    }

    if (TEST(u->Flags, SPR_FIND_PLAYER))
    {
        //MissileSeek(Weapon, 10, 768/*, 3, 48, 6*/);
        VectorMissileSeek(Weapon, 30, 16, 128, 768);
    }

    u->ret = move_missile(Weapon, u->xchange, u->ychange, u->zchange, u->ceiling_dist, u->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);


{
    SPRITEp sp = &sprite[Weapon];
    USERp u = User[Weapon];
    int32_t dax, day, daz;

    MissileSeek(Weapon, 30, 768/*, 4, 48, 6*/);
    DoBlurExtend(Weapon, 0, 4);

    dax = MOVEx(sp->xvel, sp->ang);
    day = MOVEy(sp->xvel, sp->ang);
    daz = sp->zvel;


    DoBlurExtend(Weapon, 0, 4);

    // only seek on Electro's after a hit on an actor
    if (u->Counter > 0)
        MissileSeek(Weapon, 30, 512/*, 3, 52, 2*/);

    dax = MOVEx(sp->xvel, sp->ang);
    day = MOVEy(sp->xvel, sp->ang);
    daz = sp->zvel;


Rev 8697	Rev 8698
Line 8270...	Line 8270...
8270		8270
8271	return -1;	8271	return -1;
8272	}	8272	}
8273		8273
8274	int	8274	int
8275	MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range, int16_t dang_shift, int16_t turn_limit, int16_t z_limit)	8275	MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/, int16_t dang_shift, int16_t turn_limit, int16_t z_limit/)
8276	{	8276	{
8277	SPRITEp sp = &sprite[Weapon];	8277	SPRITEp sp = &sprite[Weapon];
8278	USERp u = User[Weapon];	8278	USERp u = User[Weapon];
8279		8279
8280	int zh;	8280	int zh;
Line 8353...	Line 8353...
8353	return 0;	8353	return 0;
8354	}	8354	}
8355		8355
8356	// combination of vector manipulation	8356	// combination of vector manipulation
8357	int	8357	int
8358	ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range, int16_t dang_shift, int16_t turn_limit, int16_t z_limit)	8358	ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/, int16_t dang_shift, int16_t turn_limit, int16_t z_limit/)
8359	{	8359	{
8360	SPRITEp sp = &sprite[Weapon];	8360	SPRITEp sp = &sprite[Weapon];
8361	USERp u = User[Weapon];	8361	USERp u = User[Weapon];
8362		8362
8363	int dist;	8363	int dist;
Line 8689...	Line 8689...
8689		8689
8690	ox = sp->x;	8690	ox = sp->x;
8691	oy = sp->y;	8691	oy = sp->y;
8692	oz = sp->z;	8692	oz = sp->z;
8693		8693
8694	//MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range, int16_t dang_shift, int16_t turn_limit, int16_t z_limit)	8694	//MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/, int16_t dang_shift, int16_t turn_limit, int16_t z_limit/)
8695	//MissileSeek(Weapon, 20, 1024, 6, 80, 6);	8695	//MissileSeek(Weapon, 20, 1024/, 6, 80, 6/);
8696	DoBlurExtend(Weapon, 0, 4);	8696	DoBlurExtend(Weapon, 0, 4);
8697		8697
8698	dax = MOVEx(sp->xvel, sp->ang);	8698	dax = MOVEx(sp->xvel, sp->ang);
8699	day = MOVEy(sp->xvel, sp->ang);	8699	day = MOVEy(sp->xvel, sp->ang);
8700	daz = sp->zvel;	8700	daz = sp->zvel;
Line 10183...	Line 10183...
10183	PlaySound(DIGI_MINEBEEP,&sp->x,&sp->y,&sp->z,v3df_follow);	10183	PlaySound(DIGI_MINEBEEP,&sp->x,&sp->y,&sp->z,v3df_follow);
10184	}	10184	}
10185		10185
10186	if (TEST(u->Flags, SPR_FIND_PLAYER))	10186	if (TEST(u->Flags, SPR_FIND_PLAYER))
10187	{	10187	{
10188	//MissileSeek(Weapon, 10, 768, 3, 48, 6);	10188	//MissileSeek(Weapon, 10, 768/, 3, 48, 6/);
10189	VectorMissileSeek(Weapon, 30, 16, 128, 768);	10189	VectorMissileSeek(Weapon, 30, 16, 128, 768);
10190	}	10190	}
10191		10191
10192	u->ret = move_missile(Weapon, u->xchange, u->ychange, u->zchange, u->ceiling_dist, u->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);	10192	u->ret = move_missile(Weapon, u->xchange, u->ychange, u->zchange, u->ceiling_dist, u->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);
10193		10193
Line 10475...	Line 10475...
10475	{	10475	{
10476	SPRITEp sp = &sprite[Weapon];	10476	SPRITEp sp = &sprite[Weapon];
10477	USERp u = User[Weapon];	10477	USERp u = User[Weapon];
10478	int32_t dax, day, daz;	10478	int32_t dax, day, daz;
10479		10479
10480	MissileSeek(Weapon, 30, 768, 4, 48, 6);	10480	MissileSeek(Weapon, 30, 768/, 4, 48, 6/);
10481	DoBlurExtend(Weapon, 0, 4);	10481	DoBlurExtend(Weapon, 0, 4);
10482		10482
10483	dax = MOVEx(sp->xvel, sp->ang);	10483	dax = MOVEx(sp->xvel, sp->ang);
10484	day = MOVEy(sp->xvel, sp->ang);	10484	day = MOVEy(sp->xvel, sp->ang);
10485	daz = sp->zvel;	10485	daz = sp->zvel;
Line 10526...	Line 10526...
10526		10526
10527	DoBlurExtend(Weapon, 0, 4);	10527	DoBlurExtend(Weapon, 0, 4);
10528		10528
10529	// only seek on Electro's after a hit on an actor	10529	// only seek on Electro's after a hit on an actor
10530	if (u->Counter > 0)	10530	if (u->Counter > 0)
10531	MissileSeek(Weapon, 30, 512, 3, 52, 2);	10531	MissileSeek(Weapon, 30, 512/, 3, 52, 2/);
10532		10532
10533	dax = MOVEx(sp->xvel, sp->ang);	10533	dax = MOVEx(sp->xvel, sp->ang);
10534	day = MOVEy(sp->xvel, sp->ang);	10534	day = MOVEy(sp->xvel, sp->ang);
10535	daz = sp->zvel;	10535	daz = sp->zvel;
10536		10536

Subversion Repositories eduke32

(root)/source/sw/src/weapon.cpp – Rev 8697 → 8698