取消复活功能
This commit is contained in:
parent
950e2044f3
commit
0313de2402
@ -142,6 +142,12 @@ enum BuffEffectType_e
|
|||||||
kBET_HunLuan = 23, //混乱,在烟雾弹中不自动瞄准
|
kBET_HunLuan = 23, //混乱,在烟雾弹中不自动瞄准
|
||||||
kBET_Jump = 24, //跳伞中
|
kBET_Jump = 24, //跳伞中
|
||||||
kBET_ThroughWall = 25, //穿墙
|
kBET_ThroughWall = 25, //穿墙
|
||||||
|
kBET_InGrass = 26, //在草丛
|
||||||
|
kBET_InWater = 27, //在水里
|
||||||
|
kBET_InIce = 27, //在冰里
|
||||||
|
kBET_Driver = 28, //驾驶中
|
||||||
|
kBET_Passenger = 29, //乘座
|
||||||
|
|
||||||
kBET_End
|
kBET_End
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1136,6 +1136,10 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
room->CheckPartObjects();
|
room->CheckPartObjects();
|
||||||
#endif
|
#endif
|
||||||
|
#if 1
|
||||||
|
real_dead = true;
|
||||||
|
OnDie();
|
||||||
|
#else
|
||||||
int max_revive_times = MetaMgr::Instance()->GetSysParamAsInt("max_revive_times", 1);
|
int max_revive_times = MetaMgr::Instance()->GetSysParamAsInt("max_revive_times", 1);
|
||||||
if (weapon_id != VW_Spectate &&
|
if (weapon_id != VW_Spectate &&
|
||||||
dead_times <= max_revive_times &&
|
dead_times <= max_revive_times &&
|
||||||
@ -1146,6 +1150,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
|
|||||||
real_dead = true;
|
real_dead = true;
|
||||||
OnDie();
|
OnDie();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
DoGetDown();
|
DoGetDown();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user