mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-07 17:29:36 +00:00
fix build with clang, fix saverestore again, android mod launcher support
This commit is contained in:
+2
-2
@@ -83,12 +83,12 @@ public:
|
||||
return _color[index];
|
||||
}
|
||||
|
||||
bool operator == (const Color &rhs)
|
||||
bool operator == (const Color &rhs) const
|
||||
{
|
||||
return Q_memcmp( this, &rhs, sizeof(Color) ) == 0;
|
||||
}
|
||||
|
||||
bool operator != (const Color &rhs)
|
||||
bool operator != (const Color &rhs) const
|
||||
{
|
||||
return !(operator==(rhs));
|
||||
}
|
||||
|
||||
+1
-1
@@ -128,7 +128,7 @@ DECLARE_FIELD_SIZE( FIELD_MATERIALINDEX, sizeof(int) )
|
||||
#define ARRAYSIZE2D(p) (sizeof(p)/sizeof(p[0][0]))
|
||||
#define SIZE_OF_ARRAY(p) _ARRAYSIZE(p)
|
||||
|
||||
#define _offsetof(s,m) ((size_t)&(((s *)0)->m))
|
||||
#define _offsetof(s,m) ((int)&(((s *)0)->m))
|
||||
|
||||
#define _FIELD(name,fieldtype,count,flags,mapname,tolerance) { fieldtype, #name, { _offsetof(classNameTypedef, name), 0 }, count, flags, mapname, NULL, NULL, NULL, sizeof( ((classNameTypedef *)0)->name ), NULL, 0, tolerance }
|
||||
#define DEFINE_FIELD_NULL { FIELD_VOID,0, {0,0},0,0,0,0,0,0}
|
||||
|
||||
@@ -993,6 +993,7 @@ typedef enum _D3DTEXTUREADDRESS
|
||||
|
||||
typedef enum _D3DSHADEMODE
|
||||
{
|
||||
D3DSHADE_NONE = 0,
|
||||
D3DSHADE_FLAT = 1,
|
||||
D3DSHADE_GOURAUD = 2,
|
||||
D3DSHADE_PHONG = 3,
|
||||
|
||||
Reference in New Issue
Block a user