lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'next' into public_next

Browse source
This commit is contained in:
Alam Ed Arias 2016-07-24 01:08:00 -04:00
parent 5513e110d1 4321757df4
commit ff6440d343
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 2.1.14.{branch}-{build} version: 2.1.16.{branch}-{build}
os: MinGW os: MinGW
environment: environment:

6
src/lzf.c
View file

@ -59,7 +59,11 @@
* Unconditionally aligning does not cost very much, so do it if unsure * Unconditionally aligning does not cost very much, so do it if unsure
*/ */
#ifndef STRICT_ALIGN #ifndef STRICT_ALIGN
# define STRICT_ALIGN !(defined(__i386) || defined (__amd64)) || defined (__clang__) #if !(defined(__i386) || defined (__amd64)) || defined (__clang__)
#define STRICT_ALIGN 1
#else
#define STRICT_ALIGN 0
#endif
#endif #endif
/* /*

2
src/r_data.h
View file

@ -30,7 +30,7 @@ typedef struct
{ {
// Block origin (always UL), which has already accounted for the internal origin of the patch. // Block origin (always UL), which has already accounted for the internal origin of the patch.
INT16 originx, originy; INT16 originx, originy;
INT16 wad, lump; UINT16 wad, lump;
} texpatch_t; } texpatch_t;
// A maptexturedef_t describes a rectangular texture, // A maptexturedef_t describes a rectangular texture,