markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: remove sse3 option, as it's cause bot to be not loadable on some KVM hypervisors.

Browse source 
graph: store only author name inside author string.
This commit is contained in:
ds 2020-10-01 10:43:51 +03:00
commit ced06c36cd
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inc/graph.h
View file

@ -389,8 +389,8 @@ public:
m_highestDamage[team] = value; m_highestDamage[team] = value;
} }
const char *getAuthor () const { StringRef getAuthor () const {
return m_tempStrings.chars (); return m_tempStrings;
} }
bool hasChanged () const { bool hasChanged () const {

4
meson.build
View file

@ -86,7 +86,7 @@ if isCLang or isGCC or (isIntel and not isWindows)
] ]
if isOptimize if isOptimize
flagsCompiler += '-msse3' flagsCompiler += '-msse2'
if (isCLang or isGCC) and not isDarwin if (isCLang or isGCC) and not isDarwin
flagsCompiler += '-flto' flagsCompiler += '-flto'
@ -138,7 +138,7 @@ if isLinux or isDarwin
else else
flagsCompiler += [ flagsCompiler += [
'-mtune=generic', '-mtune=generic',
'-msse3', '-msse2',
'-mfpmath=sse', '-mfpmath=sse',
'-fno-builtin', '-fno-builtin',
'-funroll-loops', '-funroll-loops',

5
src/graph.cpp
View file

@ -1783,10 +1783,10 @@ bool BotGraph::loadGraphData () {
} }
if ((outOptions & StorageOption::Official) || strncmp (exten.author, "official", 8) == 0 || strlen (exten.author) < 2) { if ((outOptions & StorageOption::Official) || strncmp (exten.author, "official", 8) == 0 || strlen (exten.author) < 2) {
m_tempStrings.assign ("Using Official Navigation Graph"); m_tempStrings.assign (product.folder);
} }
else { else {
m_tempStrings.assignf ("Navigation Graph Authored By: %s", exten.author); m_tempStrings.assign (exten.author);
} }
initNodesTypes (); initNodesTypes ();
loadPathMatrix (); loadPathMatrix ();
@ -2853,6 +2853,7 @@ BotGraph::BotGraph () {
m_needsVisRebuild = false; m_needsVisRebuild = false;
m_jumpLearnNode = false; m_jumpLearnNode = false;
m_hasChanged = false; m_hasChanged = false;
m_narrowChecked = false;
m_timeJumpStarted = 0.0f; m_timeJumpStarted = 0.0f;
m_lastJumpNode = kInvalidNodeIndex; m_lastJumpNode = kInvalidNodeIndex;

8
src/support.cpp
View file

@ -281,6 +281,12 @@ void BotSupport::checkWelcome () {
if (!game.is (GameFlags::Mobility | GameFlags::Xash3D)) { if (!game.is (GameFlags::Mobility | GameFlags::Xash3D)) {
game.serverCommand ("speak \"%s\"", m_sentences.random ()); game.serverCommand ("speak \"%s\"", m_sentences.random ());
} }
String authorStr = "Official Navigation Graph";
StringRef graphAuthor = graph.getAuthor ();
if (!graphAuthor.startsWith (product.folder)) {
authorStr.assignf ("Navigation Graph by: %s", graphAuthor);
}
MessageWriter (MSG_ONE, msgs.id (NetMsg::TextMsg), nullptr, receiveEntity) MessageWriter (MSG_ONE, msgs.id (NetMsg::TextMsg), nullptr, receiveEntity)
.writeByte (HUD_PRINTTALK) .writeByte (HUD_PRINTTALK)
@ -304,7 +310,7 @@ void BotSupport::checkWelcome () {
.writeShort (MessageWriter::fu16 (2.0f, 8.0f)) .writeShort (MessageWriter::fu16 (2.0f, 8.0f))
.writeShort (MessageWriter::fu16 (6.0f, 8.0f)) .writeShort (MessageWriter::fu16 (6.0f, 8.0f))
.writeShort (MessageWriter::fu16 (0.1f, 8.0f)) .writeShort (MessageWriter::fu16 (0.1f, 8.0f))
.writeString (strings.format ("\nHello! You are playing with %s v%s (Revision: %s)\nDevised by %s\n\n%s", product.name, product.version, product.build.count, product.author, graph.getAuthor ())); .writeString (strings.format ("\nHello! You are playing with %s v%s (Revision: %s)\nDevised by %s\n\n%s", product.name, product.version, product.build.count, product.author, authorStr));
m_welcomeReceiveTime = 0.0f; m_welcomeReceiveTime = 0.0f;
m_needToSendWelcome = false; m_needToSendWelcome = false;