OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

August 10, 2006 (Changes by Graf Zahl)

Browse source 
- Fixed: CheckActorInventory stored the return value in the wrong address
  on the ACS stack.
- Fixed: Skin sounds weren't properly restored after a SNDINFO reset.
- Added a more flexible ACS ChangeLevel function. It gets passed a level name
  instead of a level number and has several additional options (e.g. changing
  skill, starting the map without monsters and clearing the players' inventories. (UNTESTED!)
- Changed Thing_Activate so that passing a tid of 0 activates the calling actor.
- Changed Thing_Remove so that passing a tid of 0 removes the calling actor.
- Added DECORATE parameters to A_Saw.

SVN r283 (trunk)
This commit is contained in:
Christoph Oelckers 2006-08-10 15:28:12 +00:00
commit 688476b9aa
12 changed files with 175 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/g_level.cpp
View file

@ -1559,11 +1559,13 @@ BOOL secretexit;
static int startpos; // [RH] Support for multiple starts per level
extern BOOL NoWipe; // [RH] Don't wipe when travelling in hubs
static bool startkeepfacing; // [RH] Support for keeping your facing angle
static bool resetinventory; // Reset the inventory to the player's default for the next level
// [RH] The position parameter to these next three functions should
// match the first parameter of the single player start spots
// that should appear in the next map.
static void goOn (int position, bool keepFacing, bool secret)
static void goOn (int position, bool keepFacing, bool secret, bool resetinv)
{
static bool unloading;
@ -1580,6 +1582,8 @@ static void goOn (int position, bool keepFacing, bool secret)
startkeepfacing = keepFacing;
gameaction = ga_completed;
secretexit = secret;
resetinventory = resetinv;
bglobal.End(); //Added by MC:
// [RH] Give scripts a chance to do something
@ -1603,7 +1607,7 @@ static void goOn (int position, bool keepFacing, bool secret)
void G_ExitLevel (int position, bool keepFacing)
{
goOn (position, keepFacing, false);
goOn (position, keepFacing, false, false);
}
// Here's for the german edition.
@ -1612,7 +1616,23 @@ void G_SecretExitLevel (int position)
// [RH] Check for secret levels is done in
// G_DoCompleted()
goOn (position, false, true);
goOn (position, false, true, false);
}
void G_ChangeLevel(const char * levelname, int position, bool keepFacing, int nextSkill,
bool nointermission, bool resetinventory, bool nomonsters)
{
strncpy (level.nextmap, levelname, 8);
level.nextmap[8] = 0;
if (nextSkill != -1) NextSkill = nextSkill;
if (!nomonsters) dmflags = dmflags & ~DF_NO_MONSTERS;
else dmflags = dmflags | DF_NO_MONSTERS;
if (nointermission) level.flags |= LEVEL_NOINTERMISSION;
goOn(position, keepFacing, false, resetinventory);
}
void G_DoCompleted (void)
@ -1738,7 +1758,7 @@ void G_DoCompleted (void)
{
if (playeringame[i])
{ // take away appropriate inventory
G_PlayerFinishLevel (i, mode);
G_PlayerFinishLevel (i, mode, resetinventory);
}
}