X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=plugins%2Farchivewad%2Fwad.h;fp=plugins%2Farchivewad%2Fwad.h;h=ab67a62d02b0232ff96a5d16cd1a38379645bb6c;hp=617900c3a04c330ef85f32f795c58750497ea072;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hpb=0a6d5683b0cfa1a0bd7ef64bada105dbe4ddd6e1 diff --git a/plugins/archivewad/wad.h b/plugins/archivewad/wad.h index 617900c3..ab67a62d 100644 --- a/plugins/archivewad/wad.h +++ b/plugins/archivewad/wad.h @@ -38,39 +38,39 @@ #define TYP_SOUND 67 #define TYP_MIPTEX 68 -typedef struct -{ - char identification[4]; // should be WAD2 or 2DAW - int numlumps; - int infotableofs; +typedef struct { + char identification[4]; // should be WAD2 or 2DAW + int numlumps; + int infotableofs; } wadinfo_t; -typedef struct -{ - int filepos; - int disksize; - int size; // uncompressed - char type; - char compression; - char pad1, pad2; - char name[16]; // must be null terminated +typedef struct { + int filepos; + int disksize; + int size; // uncompressed + char type; + char compression; + char pad1, pad2; + char name[16]; // must be null terminated } lumpinfo_t; -inline void istream_read_wadinfo( InputStream& istream, wadinfo_t& wadinfo ){ - istream.read( reinterpret_cast( wadinfo.identification ), 4 ); - wadinfo.numlumps = istream_read_int32_le( istream ); - wadinfo.infotableofs = istream_read_int32_le( istream ); +inline void istream_read_wadinfo(InputStream &istream, wadinfo_t &wadinfo) +{ + istream.read(reinterpret_cast( wadinfo.identification ), 4); + wadinfo.numlumps = istream_read_int32_le(istream); + wadinfo.infotableofs = istream_read_int32_le(istream); } -inline void istream_read_lumpinfo( InputStream& istream, lumpinfo_t& lumpinfo ){ - lumpinfo.filepos = istream_read_int32_le( istream ); - lumpinfo.disksize = istream_read_int32_le( istream ); - lumpinfo.size = istream_read_int32_le( istream ); - lumpinfo.type = istream_read_byte( istream ); - lumpinfo.compression = istream_read_byte( istream ); - lumpinfo.pad1 = istream_read_byte( istream ); - lumpinfo.pad2 = istream_read_byte( istream ); - istream.read( reinterpret_cast( lumpinfo.name ), 16 ); +inline void istream_read_lumpinfo(InputStream &istream, lumpinfo_t &lumpinfo) +{ + lumpinfo.filepos = istream_read_int32_le(istream); + lumpinfo.disksize = istream_read_int32_le(istream); + lumpinfo.size = istream_read_int32_le(istream); + lumpinfo.type = istream_read_byte(istream); + lumpinfo.compression = istream_read_byte(istream); + lumpinfo.pad1 = istream_read_byte(istream); + lumpinfo.pad2 = istream_read_byte(istream); + istream.read(reinterpret_cast( lumpinfo.name ), 16); } #endif