zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 13:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update p_actionfunctions.cpp

Browse source 
- Let's fix some of the compile warnings
- We don't want to include models that were already parsed by modelDef, or already in savedModelFiles
This commit is contained in:
Shiny Metagross 2022-06-30 22:38:57 -07:00 committed by Christoph Oelckers
parent 6d00e4a3f3
commit 9f2c7c850d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/playsim/p_actionfunctions.cpp
View file

@ -5076,27 +5076,25 @@ DEFINE_ACTION_FUNCTION(AActor, A_ChangeModel)
mobj->modelData->modelIDs.Insert(index, queryModel);
mobj->modelData->skinIDs.Insert(index, skin != NAME_None ? LoadSkin(skinpath.GetChars(), skin.GetChars()) : FNullTextureID());
//[SM] - We need to serialize file paths and model names so that they are pushed on loading save files.
//[SM] - We need to serialize file paths and model names so that they are pushed on loading save files. Likewise, let's not include models that were already parsed when initialized.
if (model != NAME_None)
{
FString fullName;
fullName.Format("%s%s", modelpath, model.GetChars());
bool allowPush = true;
for (unsigned i = 0; i < savedModelFiles.Size(); i++)
if (!savedModelFiles[i].CompareNoCase(fullName)) allowPush = false;
for (unsigned i = 0; i < savedModelFiles.Size(); i++) if (!savedModelFiles[i].CompareNoCase(fullName)) allowPush = false;
for (unsigned i = 0; i < Models.Size()-1; i++) if (!Models[i]->mFileName.CompareNoCase(fullName)) allowPush = false;
if(allowPush) savedModelFiles.Push(fullName);
}
//[SM] - if an indice of modelIDs or skinIDs comes up blank and it's the last one, just delete it. For using very large amounts of indices, common sense says to just not run this repeatedly.
int i = 0;
for (i = 0; i < maxModels; i++)
for (int i = 0; i < maxModels; i++)
{
if (mobj->modelData->modelIDs.Last() == -1) mobj->modelData->modelIDs.Pop(mobj->modelData->modelIDs.Last());
else break;
}
for (i = 0; i < maxSkins; i++)
for (int i = 0; i < maxSkins; i++)
{
if (mobj->modelData->skinIDs.Last() == FNullTextureID()) mobj->modelData->skinIDs.Pop(mobj->modelData->skinIDs.Last());
else break;