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

removed SEH

Browse source
This commit is contained in:
jeefo 2015-07-05 18:53:58 +03:00
commit 6847bd34a6
6 changed files with 18 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/core.h
View file

@ -62,7 +62,6 @@ using namespace Math;
#if defined (COMPILER_VISUALC) && (COMPILER_VISUALC > 1000)
#pragma comment (linker, "/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1")
#pragma comment (linker, "/SECTION:.data,RW")
#pragma warning (disable : 4288)
#endif
typedef int (FAR *EntityAPI_t) (gamefuncs_t *, int);
@ -173,7 +172,7 @@ public:
#include <corelib.h>
// defines bots tasks
enum TaskId_t
enum TaskID
{
TASK_NORMAL,
TASK_PAUSE,
@ -622,7 +621,7 @@ struct KeywordFactory
// tasks definition
struct TaskItem
{
TaskId_t id; // major task/action carried out
TaskID id; // major task/action carried out
float desire; // desire (filled in) for this task
int data; // additional data (waypoint index)
float time; // time task expires
@ -1244,12 +1243,12 @@ public:
void DeleteSearchNodes (void);
void VerifyBreakable (edict_t *touch);
void RemoveCertainTask (TaskId_t id);
void StartTask (TaskId_t id, float desire, int data, float time, bool canContinue);
void RemoveCertainTask (TaskID id);
void StartTask (TaskID id, float desire, int data, float time, bool canContinue);
void ResetTasks (void);
TaskItem *GetTask (void);
inline TaskId_t GetTaskId (void) { return GetTask ()->id; };
inline TaskID GetTaskId (void) { return GetTask ()->id; };
void TakeDamage (edict_t *inflictor, int damage, int armor, int bits);
void TakeBlinded (const Vector &fade, int alpha);

25
include/corelib.h
View file

@ -21,10 +21,6 @@
#include <math.h>
#include <assert.h>
#if defined (PLATFORM_WIN32)
#pragma warning (disable : 4100 4189 4239 4996 4244 383 473 981)
#endif
//
// Title: Utility Classes Header
//
@ -1059,9 +1055,7 @@ template <typename T> class Array
{
private:
T *m_elements;
T m_failed;
private:
int m_resizeStep;
int m_itemSize;
int m_itemCount;
@ -1084,8 +1078,6 @@ public:
m_itemSize = 0;
m_itemCount = 0;
m_resizeStep = resizeStep;
m_failed = T ();
}
//
@ -1101,7 +1093,6 @@ public:
m_itemSize = 0;
m_itemCount = 0;
m_resizeStep = 0;
m_failed = T ();
AssignFrom (other);
}
@ -1277,11 +1268,6 @@ public:
//
T &GetAt (int index)
{
if (index >= m_itemCount)
{
m_failed = T ();
return m_failed;
}
return m_elements[index];
}
@ -1546,9 +1532,6 @@ public:
//
T Pop (void)
{
if (m_itemCount <= 0)
return m_failed;
T element = m_elements[m_itemCount - 1];
RemoveAt (m_itemCount - 1);
@ -1557,9 +1540,6 @@ public:
T &Last (void)
{
if (m_itemCount <= 0)
return m_failed;
return m_elements[m_itemCount - 1];
}
@ -2740,11 +2720,6 @@ public:
return static_cast <double> (ToFloat ());
}
String *operator -> (void) const
{
return (String *const) this;
}
friend String operator + (const String &s1, const String &s2)
{
String result (s1);

2
include/globals.h
View file

@ -126,4 +126,4 @@ static inline bool IsEntityNull (const edict_t *ent)
static inline int GetTeam (edict_t *ent)
{
return g_clients[IndexOfEntity (ent) - 1].team;
}
}