lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added restriction to prevent combination of CA2_GUNSLINGER and ringslinger on. 

* Swapped usage of player->spinitem to player->revitem for bullet type selection, since spinitem is used coming out of zoom tubes (which are universal).
* Switched the optional boolean for "bullet" in the Lua wrapper for P_LookForEnemies to be false by default.
* Allowed CA2_GUNSLINGER users to target Detons.
* Cleaned up some code here and there.
This commit is contained in:
toasterbabe 2017-03-21 23:24:57 +00:00
parent 7ac0373dbf
commit 90893c02a3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lua_baselib.c
View File

@ -1055,7 +1055,7 @@ static int lib_pLookForEnemies(lua_State *L)
{ {
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
boolean nonenemies = lua_opttrueboolean(L, 2); boolean nonenemies = lua_opttrueboolean(L, 2);
boolean bullet = lua_opttrueboolean(L, 3); boolean bullet = lua_optboolean(L, 3);
NOHUD NOHUD
INLEVEL INLEVEL
if (!player) if (!player)

16
src/p_user.c
View File

@ -969,6 +969,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings)
P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS); P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS);
player->mo->momx = player->mo->momy = player->mo->momz = 0; player->mo->momx = player->mo->momy = player->mo->momz = 0;
player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE);
if (giverings) if (giverings)
player->rings = 50; player->rings = 50;
@ -3849,17 +3850,17 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
break; break;
case CA2_GUNSLINGER: case CA2_GUNSLINGER:
if ((cmd->buttons & BT_USE) && !(player->pflags & PF_USEDOWN) if ((cmd->buttons & BT_USE) && !(player->pflags & PF_USEDOWN)
&& !player->mo->momz && onground // && !player->weapondelay && !player->mo->momz && onground && !player->weapondelay
&& canstand) && canstand)
{ {
mobj_t *bullet; mobj_t *bullet;
P_SetPlayerMobjState(player->mo, S_PLAY_FIRE); P_SetPlayerMobjState(player->mo, S_PLAY_FIRE);
#define zpos(posmo) (posmo->z + (posmo->height - mobjinfo[player->spinitem].height)/2) #define zpos(posmo) (posmo->z + (posmo->height - mobjinfo[player->revitem].height)/2)
if (P_LookForEnemies(player, false, true) && player->mo->tracer) if (P_LookForEnemies(player, false, true) && player->mo->tracer)
{ {
bullet = P_SpawnPointMissile(player->mo, player->mo->tracer->x, player->mo->tracer->y, zpos(player->mo->tracer), player->spinitem, player->mo->x, player->mo->y, zpos(player->mo)); bullet = P_SpawnPointMissile(player->mo, player->mo->tracer->x, player->mo->tracer->y, zpos(player->mo->tracer), player->revitem, player->mo->x, player->mo->y, zpos(player->mo));
if (!demoplayback || P_AnalogMove(player)) if (!demoplayback || P_AnalogMove(player))
{ {
if (player == &players[consoleplayer]) if (player == &players[consoleplayer])
@ -3870,7 +3871,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
} }
else else
{ {
bullet = P_SpawnPointMissile(player->mo, player->mo->x + P_ReturnThrustX(NULL, player->mo->angle, FRACUNIT), player->mo->y + P_ReturnThrustY(NULL, player->mo->angle, FRACUNIT), zpos(player->mo), player->spinitem, player->mo->x, player->mo->y, zpos(player->mo)); bullet = P_SpawnPointMissile(player->mo, player->mo->x + P_ReturnThrustX(NULL, player->mo->angle, FRACUNIT), player->mo->y + P_ReturnThrustY(NULL, player->mo->angle, FRACUNIT), zpos(player->mo), player->revitem, player->mo->x, player->mo->y, zpos(player->mo));
if (bullet) if (bullet)
{ {
bullet->flags &= ~MF_NOGRAVITY; bullet->flags &= ~MF_NOGRAVITY;
@ -3884,7 +3885,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
player->mo->momx >>= 1; player->mo->momx >>= 1;
player->mo->momy >>= 1; player->mo->momy >>= 1;
player->pflags |= PF_USEDOWN; player->pflags |= PF_USEDOWN;
// player->weapondelay = TICRATE/2; P_SetWeaponDelay(player, TICRATE/2);
} }
break; break;
case CA2_MELEE: // Melee attack case CA2_MELEE: // Melee attack
@ -7894,7 +7895,7 @@ boolean P_LookForEnemies(player_t *player, boolean nonenemies, boolean bullet)
if ((mo->flags & (MF_ENEMY|MF_BOSS)) && !(mo->flags & MF_SHOOTABLE)) // don't aim at something you can't shoot at anyway (see Egg Guard or Minus) if ((mo->flags & (MF_ENEMY|MF_BOSS)) && !(mo->flags & MF_SHOOTABLE)) // don't aim at something you can't shoot at anyway (see Egg Guard or Minus)
continue; continue;
if (mo->type == MT_DETON) // Don't be STUPID, Sonic! if (!bullet && mo->type == MT_DETON) // Don't be STUPID, Sonic!
continue; continue;
{ {
@ -7902,8 +7903,7 @@ boolean P_LookForEnemies(player_t *player, boolean nonenemies, boolean bullet)
dist = P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y); dist = P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y);
if (bullet) if (bullet)
{ {
angle_t ang = R_PointToAngle2(0, 0, dist, zdist) + ANGLE_45; if ((R_PointToAngle2(0, 0, dist, zdist) + ANGLE_45) > ANGLE_90)
if (ang > ANGLE_90)
continue; // Don't home outside of desired angle! continue; // Don't home outside of desired angle!
} }
else // Don't home upwards! else // Don't home upwards!