fixes clang warnings

fixed bad combat strafe dir direction selection
added more 'shoot thru wall' code as reaction on sound
This commit is contained in:
jeefo 2016-03-09 22:34:24 +03:00
commit 4b0188222f
8 changed files with 68 additions and 86 deletions

View file

@ -3488,23 +3488,6 @@ public:
return fgets (buffer, count, m_handle);
}
//
// Function: GetBuffer
// Gets the line from file stream, and stores it inside string class.
//
// Parameters:
// buffer - String buffer, that should receive line.
// count - Max. size of buffer.
//
// Returns:
// True if operation succeeded, false otherwise.
//
bool GetBuffer (String &buffer, int count)
{
assert (m_handle != NULL);
return !String (fgets (buffer, count, m_handle)).IsEmpty ();
}
//
// Function: Printf
// Puts formatted buffer, into stream.
@ -3834,7 +3817,10 @@ public:
return NULL;
int lineStartOffset = m_filePos;
int lineEndOffset = (m_fileSize - m_filePos > count - 1) ? (lineEndOffset = m_filePos + count - 1) : lineEndOffset = m_fileSize - 1;
int lineEndOffset = m_fileSize - 1;
if (m_fileSize - m_filePos > count - 1)
lineEndOffset = m_filePos + count - 1;
while (m_filePos < lineEndOffset)
{
@ -3866,22 +3852,6 @@ public:
return buffer;
}
//
// Function: GetBuffer
// Gets the line from file stream, and stores it inside string class.
//
// Parameters:
// buffer - String buffer, that should receive line.
// count - Max. size of buffer.
//
// Returns:
// True if operation succeeded, false otherwise.
//
bool GetBuffer (String &buffer, int count)
{
return !String (GetBuffer (buffer, count)).IsEmpty ();
}
//
// Function: Read
// Reads buffer from file stream in binary format.