nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "no sstring"

Browse Source 
This reverts commit 78f21dbd86deb11f4dcd4f849d499e4b3ca165d9.
This commit is contained in:
nullifiedcat 2016-12-23 13:58:43 +03:00
parent 78f21dbd86
commit ec815bede5
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cathook/src/hack.cpp
View File

@ -111,6 +111,8 @@ void hack::Hk_PaintTraverse(void* p, unsigned int vp, bool fr, bool ar) {
} }
} }
if (g_Settings.bNoVisuals->GetBool()) return;
if (!draw::width || !draw::height) { if (!draw::width || !draw::height) {
interfaces::engineClient->GetScreenSize(draw::width, draw::height); interfaces::engineClient->GetScreenSize(draw::width, draw::height);
} }
@ -127,8 +129,6 @@ void hack::Hk_PaintTraverse(void* p, unsigned int vp, bool fr, bool ar) {
g_Settings.bInvalid = true; g_Settings.bInvalid = true;
} }
if (g_Settings.bInvalid) return; if (g_Settings.bInvalid) return;
if (g_Settings.bNoVisuals->GetBool()) return;
if (draw::panel_top == vp) { if (draw::panel_top == vp) {
ResetStrings(); ResetStrings();
if (g_Settings.bShowLogo->GetBool()) { if (g_Settings.bShowLogo->GetBool()) {

4
cathook/src/helpers.cpp
View File

@ -741,8 +741,8 @@ void EndPrediction() {
interfaces::gvars->frametime = oldFrametime; interfaces::gvars->frametime = oldFrametime;
}*/ }*/
char* strfmt(const char* fmt, ...) { sstring strfmt(const char* fmt, ...) {
char* result = new char[1024]; sstring result(1024);
va_list list; va_list list;
va_start(list, fmt); va_start(list, fmt);
vsprintf(result, fmt, list); vsprintf(result, fmt, list);

3
cathook/src/helpers.h
View File

@ -16,6 +16,7 @@ class CUserCmd;
class CCommand; class CCommand;
struct player_info_s; struct player_info_s;
class Vector; class Vector;
class sstring;
#define PI 3.14159265358979323846f #define PI 3.14159265358979323846f
#define RADPI 57.295779513082f #define RADPI 57.295779513082f
@ -69,7 +70,7 @@ bool GetProjectileData(CachedEntity* weapon, float& speed, float& gravity);
bool IsVectorVisible(Vector a, Vector b); bool IsVectorVisible(Vector a, Vector b);
relation GetRelation(CachedEntity* ent); // TODO new relations relation GetRelation(CachedEntity* ent); // TODO new relations
bool IsSentryBuster(CachedEntity* ent); bool IsSentryBuster(CachedEntity* ent);
char* strfmt(const char* fmt, ...); sstring strfmt(const char* fmt, ...);
// TODO move that to weaponid.h // TODO move that to weaponid.h
bool IsAmbassador(CachedEntity* ent); bool IsAmbassador(CachedEntity* ent);

8
cathook/src/sstring.h
View File

@ -8,17 +8,15 @@
#ifndef SSTRING_H_ #ifndef SSTRING_H_
#define SSTRING_H_ #define SSTRING_H_
//typedef char* sstring; class sstring {
/*class sstring {
public: public:
inline sstring() { length = 0; p_String = 0; }; inline sstring() { length = 0; p_String = 0; };
inline sstring(int length) { this->length = length; p_String = new char[length]; } inline sstring(int length) { this->length = length; p_String = new char[length]; }
inline ~sstring() { if (p_String) delete [] p_String; } inline ~sstring() { delete [] p_String; }
inline operator const char*() const { return p_String; }; inline operator const char*() const { return p_String; };
inline operator char*() const { return (char*)p_String; } inline operator char*() const { return (char*)p_String; }
const char* p_String; const char* p_String;
int length; int length;
};*/ };
#endif /* SSTRING_H_ */ #endif /* SSTRING_H_ */