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

fixes clang warnings

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

38
include/corelib.h
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.

4
include/engine/extdll.h
View file

@ -20,7 +20,7 @@
#define DEBUG 1
#endif
#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning (disable : 4244) // int or float down-conversion
#pragma warning (disable : 4305) // int or float data truncation
#pragma warning (disable : 4201) // nameless struct/union
@ -31,7 +31,7 @@
#pragma warning (disable : 4702) // unreachable code
#pragma warning (disable : 4706) // assignment within conditional expression
/* (dz): disable deprecation warnings concerning unsafe CRT functions */
/* disable deprecation warnings concerning unsafe CRT functions */
#if !defined _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
#endif