for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
{
.entity weaponentity = weaponentities[slot];
+ if(!pl.(weaponentity))
+ continue; // continue incase other slots exist?
if(pl.(weaponentity).hook)
- {
delete(pl.(weaponentity).hook);
- pl.(weaponentity).hook = NULL;
- }
+ pl.(weaponentity).hook = NULL;
}
//pl.disableclientprediction = false;
void RemoveHook(entity this)
{
- for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
- {
- .entity weaponentity = weaponentities[slot];
- if(this.realowner.(weaponentity).hook == this)
- this.realowner.(weaponentity).hook = NULL;
- }
+ entity player = this.realowner;
+ .entity weaponentity = this.weaponentity_fld;
+
+ if(player.(weaponentity).hook == this)
+ player.(weaponentity).hook = NULL;
- if(this.realowner.move_movetype == MOVETYPE_FLY)
- set_movetype(this.realowner, MOVETYPE_WALK);
+ if(player.move_movetype == MOVETYPE_FLY)
+ set_movetype(player, MOVETYPE_WALK);
delete(this);
}
error("Owner lost the hook!\n");
return;
}
- if(LostMovetypeFollow(this) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
+ if(LostMovetypeFollow(this) || game_stopped || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
{
RemoveHook(this);
return;