OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved all code related to global ACS variables to p_acs.cpp where it belongs.

Browse source 
- fixed: The nextmap and nextsecret CCMDs need to call G_DeferedInitNew instead of G_InitNew.
- merged MAPINFO branch back into trunk.

SVN r1393 (trunk)
This commit is contained in:
Christoph Oelckers 2009-02-03 19:11:43 +00:00
commit 4bcd3faef8
51 changed files with 3021 additions and 2197 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_shared/a_artifacts.cpp
View file

@ -951,7 +951,7 @@ void APowerFlight::InitEffect ()
void APowerFlight::Tick ()
{
// The Wings of Wrath only expire in multiplayer and non-hub games
if (!multiplayer && (level.flags & LEVEL_INFINITE_FLIGHT))
if (!multiplayer && (level.flags2 & LEVEL2_INFINITE_FLIGHT))
{
assert(EffectTics < INT_MAX); // I can't see a game lasting nearly two years, but...
EffectTics++;
@ -1364,7 +1364,7 @@ void APowerTimeFreezer::InitEffect( )
// Make sure the effect starts and ends on an even tic.
if ((level.time & 1) == 0)
{
level.flags |= LEVEL_FROZEN;
level.flags2 |= LEVEL2_FROZEN;
}
else
{
@ -1395,9 +1395,9 @@ void APowerTimeFreezer::DoEffect( )
|| (( EffectTics > 2*32 && EffectTics <= 3*32 ) && ((EffectTics + 1) & 7) != 0 )
|| (( EffectTics > 32 && EffectTics <= 2*32 ) && ((EffectTics + 1) & 3) != 0 )
|| (( EffectTics > 0 && EffectTics <= 1*32 ) && ((EffectTics + 1) & 1) != 0 ))
level.flags |= LEVEL_FROZEN;
level.flags2 |= LEVEL2_FROZEN;
else
level.flags &= ~LEVEL_FROZEN;
level.flags2 &= ~LEVEL2_FROZEN;
}
//===========================================================================
@ -1411,7 +1411,7 @@ void APowerTimeFreezer::EndEffect( )
int ulIdx;
// Allow other actors to move about freely once again.
level.flags &= ~LEVEL_FROZEN;
level.flags2 &= ~LEVEL2_FROZEN;
// Also, turn the music back on.
S_ResumeSound( );

2
src/g_shared/a_pickups.cpp
View file

@ -1707,7 +1707,7 @@ IMPLEMENT_CLASS (AMapRevealer)
bool AMapRevealer::TryPickup (AActor *&toucher)
{
level.flags |= LEVEL_ALLMAP;
level.flags2 |= LEVEL2_ALLMAP;
GoAwayAndDie ();
return true;
}

1
src/g_shared/sbarinfo_display.cpp
View file

@ -56,6 +56,7 @@
#include "a_strifeglobal.h"
#include "g_level.h"
#include "v_palette.h"
#include "p_acs.h"
static FRandom pr_chainwiggle; //use the same method of chain wiggling as heretic.

1
src/g_shared/sbarinfo_parser.cpp
View file

@ -46,6 +46,7 @@
#include "gi.h"
#include "i_system.h"
#include "g_level.h"
#include "p_acs.h"
SBarInfo *SBarInfoScript[2] = {NULL,NULL};

2
src/g_shared/shared_hud.cpp
View file

@ -875,7 +875,7 @@ void DrawHUD()
}
}
mysnprintf(printstr, countof(printstr), "%s: %s", level.mapname, level.level_name);
mysnprintf(printstr, countof(printstr), "%s: %s", level.mapname, level.LevelName.GetChars());
screen->DrawText(SmallFont, hudcolor_titl, 1, hudheight-fonth-1, printstr,
DTA_KeepRatio, true,
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight, TAG_DONE);

8
src/g_shared/shared_sbar.cpp
View file

@ -1242,11 +1242,11 @@ void DBaseStatusBar::Draw (EHudState state)
{
i = mysnprintf (line, countof(line), "%s: ", level.mapname);
}
line[i] = TEXTCOLOR_ESCAPE;
line[i+1] = CR_GREY + 'A';
strcpy (&line[i+2], level.level_name);
FString mapname;
mapname.Format("%c%c%s", TEXTCOLOR_ESCAPE, CR_GREY + 'A', level.LevelName.GetChars());
screen->DrawText (SmallFont, highlight,
(SCREENWIDTH - SmallFont->StringWidth (line)*CleanXfac)/2, y, line,
(SCREENWIDTH - SmallFont->StringWidth (mapname)*CleanXfac)/2, y, mapname,
DTA_CleanNoMove, true, TAG_DONE);
if (!deathmatch)