zdoom/wadext
0
0
Fork 0
mirror of https://github.com/ZDoom/wadext.git synced 2024-11-28 06:42:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix most of warnings with non-MSVC toolchains

Browse source
This commit is contained in:
alexey.lysiuk 2016-11-12 12:04:17 +02:00
parent 554774506d
commit e63e9a9b02
4 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fileformat.cpp
View file

@ -312,9 +312,9 @@ bool isHmp(const uint8_t *pbuffer, int len)
bool isXmi(const uint8_t *pbuffer, int len) bool isXmi(const uint8_t *pbuffer, int len)
{ {
return len >= 12 && return len >= 12 &&
(IsMagic(pbuffer, "FORM") && IsMagic(pbuffer + 8, "XDIR") || ((IsMagic(pbuffer, "FORM") && IsMagic(pbuffer + 8, "XDIR")) ||
IsMagic(pbuffer, "FORM") && IsMagic(pbuffer + 8, "XMID") || (IsMagic(pbuffer, "FORM") && IsMagic(pbuffer + 8, "XMID")) ||
IsMagic(pbuffer, "CAT ") && IsMagic(pbuffer + 8, "XMID")); (IsMagic(pbuffer, "CAT ") && IsMagic(pbuffer + 8, "XMID")));
} }
//============================================================================ //============================================================================

4
main.cpp
View file

@ -33,7 +33,7 @@ int ParseOptions(int argc,char ** argv,int & index)
{ {
struct parseinf struct parseinf
{ {
char * opt; const char * opt;
int flag; int flag;
int argc; int argc;
} pi[]={ } pi[]={
@ -92,4 +92,4 @@ int main(int argc, char ** argv)
printf(" -tx: Converts a set of TEXTURE1/TEXTURE2/PNAMES in the current directory to a textures.txt file.\n"); printf(" -tx: Converts a set of TEXTURE1/TEXTURE2/PNAMES in the current directory to a textures.txt file.\n");
} }
return 0; return 0;
} }

2
resourcefile.h
View file

@ -85,4 +85,4 @@ struct WadItemList
void OpenMainWad(char * filename); void OpenMainWad(char * filename);
#endif #endif

16
wadext.cpp
View file

@ -117,10 +117,10 @@ const char * MakeFileName(const char * base, const char * ext)
{ {
// replace special path characters in the lump name // replace special path characters in the lump name
if (basebuffer[i] == '\\') basebuffer[i] = '^'; if (basebuffer[i] == '\\') basebuffer[i] = '^';
if (basebuffer[i] == '/') basebuffer[i] = '§'; if (basebuffer[i] == '/') basebuffer[i] = '\xA7';
if (basebuffer[i] == ':') basebuffer[i] = '¡'; if (basebuffer[i] == ':') basebuffer[i] = '\xA1';
if (basebuffer[i] == '*') basebuffer[i] = '²'; if (basebuffer[i] == '*') basebuffer[i] = '\xB2';
if (basebuffer[i] == '?') basebuffer[i] = '¿'; if (basebuffer[i] == '?') basebuffer[i] = '\xBF';
} }
for(int i=0;;i++) for(int i=0;;i++)
@ -134,7 +134,7 @@ const char * MakeFileName(const char * base, const char * ext)
} }
} }
void Extract(WadItemList *w,char * dir,const char * ext, int options, bool isflat) //It is completely impossible to detect flats, so we have to flag it when extracting the F_ namespace void Extract(WadItemList *w,const char * dir,const char * ext, int options, bool isflat) //It is completely impossible to detect flats, so we have to flag it when extracting the F_ namespace
{ {
FileType ft = IdentifyFileType(w->Name(), (uint8_t*)w->Address(), w->Length()); FileType ft = IdentifyFileType(w->Name(), (uint8_t*)w->Address(), w->Length());
const char *filename; const char *filename;
@ -208,9 +208,8 @@ void Extract(WadItemList *w,char * dir,const char * ext, int options, bool isfla
chdir(maindir); chdir(maindir);
} }
int ListExtract(int startmarker,char * dir,char * endm,char * endm2,bool isflat,int options,int pack=0) int ListExtract(int startmarker,const char * dir,const char * endm,const char * endm2,bool isflat,int options,int pack=0)
{ {
int ev=0;
char dirbuf[200]; char dirbuf[200];
mkdir(dir); mkdir(dir);
@ -234,11 +233,10 @@ bool isLevel(int lump)
return false; return false;
} }
int MapExtract(int startmarker,char *dir,int options) int MapExtract(int startmarker,const char *dir,int options)
{ {
int i; int i;
char buffer[40]; char buffer[40];
int packlength[13]={0};
TArray<CWADLump> directory; TArray<CWADLump> directory;
mkdir(dir); mkdir(dir);