- Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods.

- Fixed: Heretic shareware used a different border for the statusbar.
This commit is contained in:
Braden Obrzut 2014-01-18 15:09:12 -05:00
parent 6f7885210b
commit e5d7077d74
2 changed files with 7 additions and 0 deletions

View file

@ -4639,6 +4639,12 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
if (defaults->SpawnState == NULL || if (defaults->SpawnState == NULL ||
sprites[defaults->SpawnState->sprite].numframes == 0) sprites[defaults->SpawnState->sprite].numframes == 0)
{ {
// We don't load mods for shareware games so we'll just ignore
// missing actors. Heretic needs this since the shareware includes
// the retail weapons in Deathmatch.
if (gameinfo.flags & GI_SHAREWARE)
return NULL;
Printf ("%s at (%i, %i) has no frames\n", Printf ("%s at (%i, %i) has no frames\n",
i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS); i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS);
i = PClass::FindClass("Unknown"); i = PClass::FindClass("Unknown");

View file

@ -4,5 +4,6 @@ gameinfo
{ {
finalepage = "ORDER" finalepage = "ORDER"
infopage = "ORDER", "HELP1", "HELP2", "CREDIT" infopage = "ORDER", "HELP1", "HELP2", "CREDIT"
borderflat = "FLOOR04"
} }