libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-28 23:36:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some more cleanup

Browse Source 
svn-id: r8488
This commit is contained in:
Max Horn 2003-06-14 23:05:40 +00:00
parent 5c56edc26f
commit f51caefbe0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/scummsys.h
View File

@ -315,12 +315,12 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
#if defined(SCUMM_LITTLE_ENDIAN)
#define PROTO_MKID(a) \
((a >> 24) & 0x000000FF) | \
((a >> 8) & 0x0000FF00) | \
((a << 8) & 0x00FF0000) | \
((a << 24) & 0xFF000000)
#define PROTO_MKID_BE(a) (a & 0xFFFFFFFFUL)
#define PROTO_MKID(a) ((uint32) \
(((a) >> 24) & 0x000000FF) | \
(((a) >> 8) & 0x0000FF00) | \
(((a) << 8) & 0x00FF0000) | \
(((a) << 24) & 0xFF000000))
#define PROTO_MKID_BE(a) ((uint32)(a))
#if defined(INVERSE_MKID)
# define MKID(a) PROTO_MKID_BE(a)
@ -386,7 +386,8 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
#if defined(SCUMM_NEED_ALIGNMENT) || defined(SCUMM_LITTLE_ENDIAN)
FORCEINLINE uint16 READ_BE_UINT16(const void *ptr) {
return (((const byte *)ptr)[0] << 8)|((const byte *)ptr)[1];
const byte *b = (const byte *)ptr;
return (b[0] << 8) + b[1];
}
FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
const byte *b = (const byte*)ptr;