Merge branch 'master' into next

This commit is contained in:
James R 2021-09-03 17:15:53 -07:00
commit c1458aa6c7

View file

@ -116,9 +116,9 @@ void *Picture_PNGConvert(
size_t insize, size_t *outsize,
pictureflags_t flags);
boolean Picture_PNGDimensions(UINT8 *png, INT32 *width, INT32 *height, INT16 *topoffset, INT16 *leftoffset, size_t size);
#endif
#define PICTURE_PNG_USELOOKUP
#endif
// SpriteInfo
extern spriteinfo_t spriteinfo[NUMSPRITES];