build: reworked build and package to simplify process
build: reworked build and package to simplify process build: windows dll is now compiled by clang, msvc build added to extras package fix: clear all the implicit conversions in the code (also fixed some bugs) fix: crash on never xash3d-fwgs engine fix: fixed bad bot behaviors on aarch64 fix: crash on some maps due to missing previous node fix: finally removed memset(this) within bot creatin
This commit is contained in:
parent
ae4e12c48c
commit
53df621dfc
35 changed files with 1004 additions and 949 deletions
|
|
@ -45,10 +45,10 @@ int BotControl::cmdKickBot () {
|
|||
enum args { alias = 1, team };
|
||||
|
||||
// if team is specified, kick from specified tram
|
||||
if (strValue (alias).find ("_ct", 0) != String::InvalidIndex || intValue (team) == 2 || strValue (team) == "ct") {
|
||||
if (strValue (alias).endsWith ("_ct") || intValue (team) == 2 || strValue (team) == "ct") {
|
||||
bots.kickFromTeam (Team::CT);
|
||||
}
|
||||
else if (strValue (alias).find ("_t", 0) != String::InvalidIndex || intValue (team) == 1 || strValue (team) == "t") {
|
||||
else if (strValue (alias).endsWith ("_t") || intValue (team) == 1 || strValue (team) == "t") {
|
||||
bots.kickFromTeam (Team::Terrorist);
|
||||
}
|
||||
else {
|
||||
|
|
@ -73,10 +73,10 @@ int BotControl::cmdKillBots () {
|
|||
enum args { alias = 1, team, max };
|
||||
|
||||
// if team is specified, kick from specified tram
|
||||
if (strValue (alias).find ("_ct", 0) != String::InvalidIndex || intValue (team) == 2 || strValue (team) == "ct") {
|
||||
if (strValue (alias).endsWith ("_ct") || intValue (team) == 2 || strValue (team) == "ct") {
|
||||
bots.killAllBots (Team::CT);
|
||||
}
|
||||
else if (strValue (alias).find ("_t", 0) != String::InvalidIndex || intValue (team) == 1 || strValue (team) == "t") {
|
||||
else if (strValue (alias).endsWith ("_t") || intValue (team) == 1 || strValue (team) == "t") {
|
||||
bots.killAllBots (Team::Terrorist);
|
||||
}
|
||||
else {
|
||||
|
|
@ -488,7 +488,7 @@ int BotControl::cmdNodeSave () {
|
|||
else {
|
||||
if (graph.checkNodes (false)) {
|
||||
graph.saveGraphData ();
|
||||
msg ("All nodes has been saved and written to disk.");
|
||||
msg ("All nodes has been saved and written to disk.\n*** Please don't forget to share your work by typing \"%s g upload\". Thank you! ***", product.cmdPri);
|
||||
}
|
||||
else {
|
||||
msg ("Could not save save nodes to disk. Graph check has failed.");
|
||||
|
|
@ -1943,7 +1943,7 @@ void BotControl::kickBotByMenu (int page) {
|
|||
|
||||
for (auto &menu : m_menus) {
|
||||
if (menu.ident == id) {
|
||||
menu.slots = menuKeys & static_cast <uint32> (-1);
|
||||
menu.slots = static_cast <int> (static_cast <uint32> (menuKeys) & static_cast <uint32> (-1));
|
||||
menu.text = menus;
|
||||
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue