OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Roll back filesystem changes. These were causing instabilities in the master branch that were interfering with development.

Browse source
This commit is contained in:
Rachael Alexanderson 2025-01-03 09:02:12 -05:00
commit f3b0c3ac5e
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
90 changed files with 1349 additions and 1582 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/g_dumpinfo.cpp
View file

@ -143,7 +143,7 @@ CCMD (mapchecksum)
{
if (argv.argc() == 1)
{ //current map
const char *wadname = fileSystem.GetContainerName(fileSystem.GetFileContainer(level.lumpnum));
const char *wadname = fileSystem.GetResourceFileName(fileSystem.GetFileContainer(level.lumpnum));
for (size_t i = 0; i < 16; ++i)
{
@ -165,7 +165,7 @@ CCMD (mapchecksum)
{
if(!strcmp(argv[i], "*"))
{
const char *wadname = fileSystem.GetContainerName(fileSystem.GetFileContainer(level.lumpnum));
const char *wadname = fileSystem.GetResourceFileName(fileSystem.GetFileContainer(level.lumpnum));
for (size_t i = 0; i < 16; ++i)
{
@ -184,7 +184,7 @@ CCMD (mapchecksum)
else
{
map->GetChecksum(cksum);
const char *wadname = fileSystem.GetContainerName(fileSystem.GetFileContainer(map->lumpnum));
const char *wadname = fileSystem.GetResourceFileName(fileSystem.GetFileContainer(map->lumpnum));
delete map;
for (size_t j = 0; j < sizeof(cksum); ++j)
{
@ -389,7 +389,7 @@ CCMD(targetinv)
CCMD(listmaps)
{
int iwadNum = fileSystem.GetBaseNum();
int iwadNum = fileSystem.GetIwadNum();
for (unsigned i = 0; i < wadlevelinfos.Size(); i++)
{
@ -403,7 +403,7 @@ CCMD(listmaps)
if (argv.argc() == 1
|| CheckWildcards(argv[1], info->MapName.GetChars())
|| CheckWildcards(argv[1], info->LookupLevelName().GetChars())
|| CheckWildcards(argv[1], fileSystem.GetContainerName(mapWadNum)))
|| CheckWildcards(argv[1], fileSystem.GetResourceFileName(mapWadNum)))
{
bool isFromPwad = mapWadNum != iwadNum;
@ -411,7 +411,7 @@ CCMD(listmaps)
Printf("%s%s: '%s' (%s)\n", lineColor, info->MapName.GetChars(),
info->LookupLevelName().GetChars(),
fileSystem.GetContainerName(mapWadNum));
fileSystem.GetResourceFileName(mapWadNum));
}
delete map;
}