OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r71 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-30 21:49:18 +00:00
commit 29cd024aba
31 changed files with 1718 additions and 1105 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/w_wad.cpp
View file

@ -126,44 +126,6 @@ FWadCollection Wads;
// CODE --------------------------------------------------------------------
//==========================================================================
//
// strupr
//
// Suprisingly, glibc lacks this
//==========================================================================
#ifdef NEED_STRUPR
void strupr (char *s)
{
while (*s) {
*s = toupper (*s);
++s;
}
}
#endif
//==========================================================================
//
// filelength
//
// Suprisingly, glibc lacks this
//==========================================================================
#ifdef NEED_FILELENGTH
int filelength (int handle)
{
struct stat fileinfo;
if (fstat (handle, &fileinfo) == -1)
{
close (handle);
I_Error ("Error fstating");
}
return fileinfo.st_size;
}
#endif
//==========================================================================
//
// uppercoppy
@ -532,8 +494,7 @@ void FWadCollection::AddFile (const char *filename, const char * data, int lengt
strcpy(base, lname);
char * dot = strrchr(base,'.');
if (dot) *dot=0;
strupr(base);
strncpy(lump_p->name, base, 8);
uppercopy(lump_p->name, base);
lump_p->fullname = copystring(name);
lump_p->position = LittleLong(zip_fh->dwFileOffset) + sizeof(FZipLocalHeader) + LittleShort(zip_fh->wFileNameSize);
lump_p->size = zip_fh->dwSize;
@ -600,8 +561,7 @@ void FWadCollection::AddFile (const char *filename, const char * data, int lengt
singleinfo.FilePos = 0;
singleinfo.Size = LittleLong(wadinfo->GetLength());
ExtractFileBase (filename, name);
strupr (name);
strncpy (singleinfo.Name, name, 8);
uppercopy(singleinfo.Name, name);
NumLumps++;
}
Printf ("\n");