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

Revert "cleaning up the code. part 0.1"

Browse source 
This reverts commit 0c8a246c48.
This commit is contained in:
jeefo 2016-08-27 23:39:20 +03:00
commit fe572b3dc9
7 changed files with 74 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/core.h
View file

@ -1481,6 +1481,7 @@ extern bool FindNearestPlayer (void **holder, edict_t *to, float searchDistance
extern void FreeLibraryMemory (void);
extern void RoundInit (void);
extern void CheckWelcomeMessage (void);
extern void AddLogEntry (bool outputToConsole, int logLevel, const char *format, ...);
extern void DisplayMenuToClient (edict_t *ent, MenuText *menu);
extern void DecalTrace (entvars_t *pev, TraceResult *trace, int logotypeIndex);

6
include/corelib.h
View file

@ -4018,9 +4018,3 @@ public:
// Squared Length
//
#define GET_SQUARE(in) (in * in)
//
// Wrapper for singleton access
//
#define SA(obj) obj::GetReference ()

33
include/globals.h
View file

@ -17,6 +17,7 @@ extern bool g_waypointOn;
extern bool g_autoWaypoint;
extern bool g_botsCanPause;
extern bool g_editNoclip;
extern bool g_isCommencing;
extern float g_autoPathDistance;
extern float g_timeBombPlanted;
@ -73,35 +74,3 @@ static inline bool IsNullString (const char *input)
return *input == '\0';
}
//
// simple class to handle welcome messages
//
class WelcomeMessage : public Singleton <WelcomeMessage>
{
private:
bool m_gameCommenced;
bool m_msgReceived;
float m_receiveTimer;
public:
WelcomeMessage (void) : m_gameCommenced (false), m_msgReceived (false), m_receiveTimer (0.0f) { }
public:
void SetGameCommenceFlag (bool isCommenced);
void VerifyMessageSent (void);
};
]=.
inline void WelcomeMessage::SetGameCommenceFlag (bool isCommenced)
{
m_gameCommenced = isCommenced;
if (!isCommenced)
{
m_receiveTimer = 0.0f;
m_msgReceived = false;
}
}