OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Turning off follow mode with automap rotating enabled did not

Browse source 
function in an easy-to-understand manner.
- Fixed: D_AddWildFile() blindly assumed that all matches were files.
- Added back the dead player check to CheckIfExitIsGood(), but now it
  applies only if the next map is part of the same hub. Otherwise, you can
  still exit the map while dead.
- Removed the SpawnedPuff global variable and made it a return value from 
  P_LineAttack().
- Fixed: P_SpawnPuff() played sounds for temporary puffs.


SVN r739 (trunk)
This commit is contained in:
Randy Heit 2008-02-12 05:54:03 +00:00
commit e8e7cebe18
13 changed files with 121 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/g_level.cpp
View file

@ -494,7 +494,7 @@ static void ParseMapInfoLower (FScanner &sc,
cluster_info_t *clusterinfo,
QWORD levelflags);
static int FindWadLevelInfo (char *name)
static int FindWadLevelInfo (const char *name)
{
for (unsigned int i = 0; i < wadlevelinfos.Size(); i++)
if (!strnicmp (name, wadlevelinfos[i].mapname, 8))
@ -1771,26 +1771,35 @@ void G_ChangeLevel(const char * levelname, int position, bool keepFacing, int ne
}
}
void G_ExitLevel (int position, bool keepFacing)
const char *G_GetExitMap()
{
G_ChangeLevel(level.nextmap, position, keepFacing);
return level.nextmap;
}
void G_SecretExitLevel (int position)
const char *G_GetSecretExitMap()
{
const char *nextmap = level.nextmap;
if (level.secretmap[0] != 0)
{
MapData * map = P_OpenMapData(level.secretmap);
MapData *map = P_OpenMapData(level.secretmap);
if (map != NULL)
{
delete map;
nextmap = level.secretmap;
}
}
return nextmap;
}
G_ChangeLevel(nextmap, position, false);
void G_ExitLevel (int position, bool keepFacing)
{
G_ChangeLevel(G_GetExitMap(), position, keepFacing);
}
void G_SecretExitLevel (int position)
{
G_ChangeLevel(G_GetSecretExitMap(), position, false);
}
void G_DoCompleted (void)
@ -2455,7 +2464,7 @@ char *CalcMapName (int episode, int level)
return lumpname;
}
level_info_t *FindLevelInfo (char *mapname)
level_info_t *FindLevelInfo (const char *mapname)
{
int i;