Valve/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-01-24 20:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bsp lump names being declared non-portably.

Browse Source 
gcc issues warnings when encountering multicharacter constants, so we'll
simply emulate them in a manner works portably. The code assumes we are
using a little-endian machine - the real solution would be using using four
chars instead of an enum.
This commit is contained in:
Jonas 'Sortie' Termansen 2013-08-11 10:47:17 +02:00
parent 63325a7174
commit 82fe37f0e6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mp/src/public/gamebspfile.h
View File

@ -21,12 +21,14 @@
//-----------------------------------------------------------------------------
// This enumerations defines all the four-CC codes for the client lump names
//-----------------------------------------------------------------------------
// TODO: We may have some endian considerations here!
#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
enum
{
GAMELUMP_DETAIL_PROPS = 'dprp',
GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
GAMELUMP_STATIC_PROPS = 'sprp',
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
};
// Versions...

10
sp/src/public/gamebspfile.h
View File

@ -21,12 +21,14 @@
//-----------------------------------------------------------------------------
// This enumerations defines all the four-CC codes for the client lump names
//-----------------------------------------------------------------------------
// TODO: We may have some endian considerations here!
#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
enum
{
GAMELUMP_DETAIL_PROPS = 'dprp',
GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
GAMELUMP_STATIC_PROPS = 'sprp',
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
};
// Versions...