2008-01-27 11:25:03 +00:00
|
|
|
// Emacs style mode select -*- C++ -*-
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// $Id:$
|
|
|
|
//
|
|
|
|
// Copyright (C) 1993-1996 by id Software, Inc.
|
|
|
|
//
|
|
|
|
// This source is available for distribution and/or modification
|
|
|
|
// only under the terms of the DOOM Source Code License as
|
|
|
|
// published by id Software. All rights reserved.
|
|
|
|
//
|
|
|
|
// The source is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
|
|
|
|
// for more details.
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// $Log:$
|
|
|
|
//
|
|
|
|
// DESCRIPTION: the automap code
|
|
|
|
//
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include "doomdef.h"
|
|
|
|
#include "templates.h"
|
|
|
|
#include "g_level.h"
|
|
|
|
#include "doomdef.h"
|
|
|
|
#include "st_stuff.h"
|
|
|
|
#include "p_local.h"
|
|
|
|
#include "p_lnspec.h"
|
|
|
|
#include "w_wad.h"
|
|
|
|
#include "a_sharedglobal.h"
|
|
|
|
#include "statnums.h"
|
2011-07-06 15:39:10 +00:00
|
|
|
#include "r_data/r_translate.h"
|
2008-09-15 23:47:00 +00:00
|
|
|
#include "d_event.h"
|
2009-06-14 18:05:00 +00:00
|
|
|
#include "gi.h"
|
2010-08-27 17:42:01 +00:00
|
|
|
#include "r_bsp.h"
|
|
|
|
#include "p_setup.h"
|
|
|
|
#include "c_bind.h"
|
2011-07-06 18:59:20 +00:00
|
|
|
#include "farchive.h"
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
#include "m_cheat.h"
|
|
|
|
#include "i_system.h"
|
|
|
|
#include "c_dispatch.h"
|
2008-09-15 23:47:00 +00:00
|
|
|
#include "colormatcher.h"
|
|
|
|
#include "d_netinf.h"
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
// Needs access to LFB.
|
|
|
|
#include "v_video.h"
|
2008-09-15 23:47:00 +00:00
|
|
|
#include "v_palette.h"
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
#include "v_text.h"
|
|
|
|
|
|
|
|
// State.
|
|
|
|
#include "doomstat.h"
|
|
|
|
#include "r_state.h"
|
|
|
|
|
|
|
|
// Data.
|
|
|
|
#include "gstrings.h"
|
|
|
|
|
|
|
|
#include "am_map.h"
|
|
|
|
#include "a_artifacts.h"
|
2010-07-23 14:32:07 +00:00
|
|
|
#include "po_man.h"
|
2010-07-25 22:56:01 +00:00
|
|
|
#include "a_keys.h"
|
2011-07-06 15:39:10 +00:00
|
|
|
#include "r_data/colormaps.h"
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2010-12-14 22:53:44 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// Automap colors
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
struct AMColor
|
|
|
|
{
|
|
|
|
int Index;
|
|
|
|
uint32 RGB;
|
|
|
|
|
|
|
|
void FromCVar(FColorCVar & cv)
|
|
|
|
{
|
|
|
|
Index = cv.GetIndex();
|
|
|
|
RGB = uint32(cv) | MAKEARGB(255, 0, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void FromRGB(int r,int g, int b)
|
|
|
|
{
|
|
|
|
RGB = MAKEARGB(255, r, g, b);
|
|
|
|
Index = ColorMatcher.Pick(r, g, b);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static AMColor Background, YourColor, WallColor, TSWallColor,
|
2011-01-09 11:50:35 +00:00
|
|
|
FDWallColor, CDWallColor, EFWallColor, ThingColor,
|
2010-07-25 22:56:01 +00:00
|
|
|
ThingColor_Item, ThingColor_CountItem, ThingColor_Monster, ThingColor_Friend,
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor, SecretWallColor, GridColor, XHairColor,
|
2008-01-27 11:25:03 +00:00
|
|
|
NotSeenColor,
|
|
|
|
LockedColor,
|
|
|
|
AlmostBackground,
|
|
|
|
IntraTeleportColor, InterTeleportColor,
|
|
|
|
SecretSectorColor;
|
|
|
|
|
|
|
|
static AMColor DoomColors[11];
|
|
|
|
static BYTE DoomPaletteVals[11*3] =
|
|
|
|
{
|
|
|
|
0x00,0x00,0x00, 0xff,0xff,0xff, 0x10,0x10,0x10,
|
|
|
|
0xfc,0x00,0x00, 0x80,0x80,0x80, 0xbc,0x78,0x48,
|
|
|
|
0xfc,0xfc,0x00, 0x74,0xfc,0x6c, 0x4c,0x4c,0x4c,
|
|
|
|
0x80,0x80,0x80, 0x6c,0x6c,0x6c
|
|
|
|
};
|
|
|
|
|
2008-08-23 21:48:24 +00:00
|
|
|
static AMColor StrifeColors[11];
|
|
|
|
static BYTE StrifePaletteVals[11*3] =
|
|
|
|
{
|
|
|
|
0x00,0x00,0x00, 239, 239, 0, 0x10,0x10,0x10,
|
|
|
|
199, 195, 195, 119, 115, 115, 55, 59, 91,
|
|
|
|
119, 115, 115, 0xfc,0x00,0x00, 0x4c,0x4c,0x4c,
|
Update to ZDoom r1222
- Moved IF_ALWAYSPICKUP and GiveQuest into CallTryPickup so that they are
automatically used by all inventory classes.
- The previous change made it necessary to replace all TryPickup calls with
another function that just calls TryPickup.
- Fixed: AInventory::TryPickup can change the toucher so this must be reported
to subclasses calling the super function. Changed TryPickup to pass the
toucher pointer by reference.
- Prefixed all names of CQ decorations with Chex after seeing some conflicts
with PWADs.
- Removed Chex Quest actors that were just unaltered duplicates of Doom's.
- Added detection for Chex Quest 3 IWAD.
- Cleaned up M_QuitGame because the code was almost incomprehensible and I
wanted to add CQ3's new quit messages.
- Added Chex Quest obituaries and a few other messages from CQ3.
- Fixed: drawbar improperly clipped images when not in the top left quadrant.
- Fixed: Crouching no longer worked due to a bug introduced by the
player input code.
- Added GetPlayerInput() for examining a player's inputs from ACS. Most
buttons are now passed across the network, and there are four new user
buttons specifically for use with this command. Also defined +zoom
and +reload for future implementation.
- Fixed: Hexen's fourth weapon pieces did not play the correct pickup sound,
and when they were fully assembled, they did not play the sound across the
entire level.
- Antialiasing of lines is now controlled solely by the vid_hwaalines cvar,
ignoring what the driver reports, since ATI is apparently just as bad as
NVidia.
- Added a check for D3DLINECAPS_ANTIALIAS, but this is complicated by the
fact that NVidia's don't report it, even though they support it. If there
are any cards that no longer have antialised lines on the automap, please
let me know.
- Added vid_hwaalines cvar to force antialiased lines off for the
Direct3D renderer, in case it doesn't really support them.
- Fixed: The new rolloff values being stored in FSoundChan need to be serialized
for savegames.
- Since loading of the sound lump is now done in S_LoadSound I added an IsNull
method to the SoundRenderer class so that this function doesn't need to
load the sound for the NullSoundRenderer.
- Took some more non-FMOD related code out of fmodsound.cpp, including the
code that checks for raw and Doom sounds. This means that sfxinfo_t is no
longer needed in the SoundRenderer class so I took out all references to it.
- Fixed: FMODSoundRenderer::StartSound3D must set the static variable pointing
to the rolloff information back to NULL when starting the sound fails.
- Fixed: Rolloff information was taken from the sfxinfo that contained the
actual sound data, not the one that was used for starting the sound.
- Fixed: Chex Quest's Super Bootspork was missing the pickup message.
- Added missing Strife automap colors for items and non-monsters.
- Fixed: GetMSLength didn't resolve random and player sounds.
- Moved sound aliasing code out of fmodsound.cpp into S_LoadSound.
- Fixed: The tagged version of TranslucentLine took the information for additive
translucency from the tagged linedef, not the control linedef.
- Added check for additive translucency to TRANMAP checking.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@175 b0f79afe-0144-0410-b225-9a4edf0717df
2008-09-14 07:03:28 +00:00
|
|
|
187, 59, 0, 219, 171, 0
|
2008-08-23 21:48:24 +00:00
|
|
|
};
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
static AMColor RavenColors[11];
|
|
|
|
static BYTE RavenPaletteVals[11*3] =
|
|
|
|
{
|
|
|
|
0x6c,0x54,0x40, 255, 255, 255, 0x74,0x5c,0x48,
|
|
|
|
75, 50, 16, 88, 93, 86, 208, 176, 133,
|
|
|
|
103, 59, 31, 236, 236, 236, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0,
|
|
|
|
};
|
|
|
|
|
2010-12-14 22:53:44 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// globals
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
#define MAPBITS 12
|
|
|
|
#define MapDiv SafeDivScale12
|
|
|
|
#define MapMul MulScale12
|
|
|
|
#define MAPUNIT (1<<MAPBITS)
|
|
|
|
#define FRACTOMAPBITS (FRACBITS-MAPBITS)
|
|
|
|
|
|
|
|
// scale on entry
|
|
|
|
#define INITSCALEMTOF (.2*MAPUNIT)
|
|
|
|
// used by MTOF to scale from map-to-frame-buffer coords
|
|
|
|
static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
|
|
|
|
// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
|
|
|
|
static fixed_t scale_ftom;
|
|
|
|
|
|
|
|
// translates between frame-buffer and map distances
|
|
|
|
inline fixed_t FTOM(fixed_t x)
|
|
|
|
{
|
|
|
|
return x * scale_ftom;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline fixed_t MTOF(fixed_t x)
|
|
|
|
{
|
|
|
|
return MulScale24 (x, scale_mtof);
|
|
|
|
}
|
|
|
|
|
|
|
|
CVAR (Int, am_rotate, 0, CVAR_ARCHIVE);
|
|
|
|
CVAR (Int, am_overlay, 0, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_showsecrets, true, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_showmonsters, true, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_showitems, false, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_showtime, true, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_showtotaltime, false, CVAR_ARCHIVE);
|
2008-08-23 21:48:24 +00:00
|
|
|
CVAR (Int, am_colorset, 0, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_backcolor, 0x6c5440, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_yourcolor, 0xfce8d8, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_wallcolor, 0x2c1808, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_secretwallcolor, 0x000000, CVAR_ARCHIVE);
|
2010-12-15 16:32:37 +00:00
|
|
|
CVAR (Color, am_specialwallcolor, 0xffffff, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_tswallcolor, 0x888888, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_fdwallcolor, 0x887058, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_cdwallcolor, 0x4c3820, CVAR_ARCHIVE);
|
2011-01-09 11:50:35 +00:00
|
|
|
CVAR (Color, am_efwallcolor, 0x665555, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_thingcolor, 0xfcfcfc, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_gridcolor, 0x8b5a2b, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_xhaircolor, 0x808080, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_notseencolor, 0x6c6c6c, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_lockedcolor, 0x007800, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovyourcolor, 0xfce8d8, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovwallcolor, 0x00ff00, CVAR_ARCHIVE);
|
2010-12-15 16:32:37 +00:00
|
|
|
CVAR (Color, am_ovspecialwallcolor, 0xffffff, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_ovthingcolor, 0xe88800, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovotherwallscolor, 0x008844, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovunseencolor, 0x00226e, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovtelecolor, 0xffff00, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_intralevelcolor, 0x0000ff, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_interlevelcolor, 0xff0000, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_secretsectorcolor, 0xff00ff, CVAR_ARCHIVE);
|
2010-01-30 09:26:44 +00:00
|
|
|
CVAR (Color, am_ovsecretsectorcolor,0x00ffff, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Int, am_map_secrets, 1, CVAR_ARCHIVE);
|
|
|
|
CVAR (Bool, am_drawmapback, true, CVAR_ARCHIVE);
|
2010-07-25 22:56:01 +00:00
|
|
|
CVAR (Bool, am_showkeys, true, CVAR_ARCHIVE);
|
2010-12-15 16:32:37 +00:00
|
|
|
CVAR (Bool, am_showtriggerlines, false, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_thingcolor_friend, 0xfcfcfc, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_thingcolor_monster, 0xfcfcfc, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_thingcolor_item, 0xfcfcfc, CVAR_ARCHIVE);
|
2010-07-25 22:56:01 +00:00
|
|
|
CVAR (Color, am_thingcolor_citem, 0xfcfcfc, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
CVAR (Color, am_ovthingcolor_friend, 0xe88800, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovthingcolor_monster, 0xe88800, CVAR_ARCHIVE);
|
|
|
|
CVAR (Color, am_ovthingcolor_item, 0xe88800, CVAR_ARCHIVE);
|
2010-07-25 22:56:01 +00:00
|
|
|
CVAR (Color, am_ovthingcolor_citem, 0xe88800, CVAR_ARCHIVE);
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2010-07-23 14:32:07 +00:00
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
static int bigstate = 0;
|
|
|
|
static bool textured = 1; // internal toggle for texture mode
|
|
|
|
|
|
|
|
CUSTOM_CVAR(Bool, am_textured, false, CVAR_ARCHIVE)
|
|
|
|
{
|
|
|
|
textured |= self;
|
|
|
|
}
|
|
|
|
|
2010-07-23 14:32:07 +00:00
|
|
|
CVAR(Int, am_showsubsector, -1, 0);
|
|
|
|
|
|
|
|
|
2010-05-01 17:31:45 +00:00
|
|
|
// Disable the ML_DONTDRAW line flag if x% of all lines in a map are flagged with it
|
|
|
|
// (To counter annoying mappers who think they are smart by making the automap unusable)
|
|
|
|
bool am_showallenabled;
|
|
|
|
|
|
|
|
CUSTOM_CVAR (Int, am_showalllines, -1, 0) // This is a cheat so don't save it.
|
|
|
|
{
|
|
|
|
int flagged = 0;
|
|
|
|
int total = 0;
|
2010-05-01 20:34:42 +00:00
|
|
|
if (self > 0 && numlines > 0)
|
2010-05-01 17:31:45 +00:00
|
|
|
{
|
|
|
|
for(int i=0;i<numlines;i++)
|
|
|
|
{
|
|
|
|
line_t *line = &lines[i];
|
|
|
|
|
|
|
|
// disregard intra-sector lines
|
|
|
|
if (line->frontsector == line->backsector) continue;
|
|
|
|
|
|
|
|
// disregard control sectors for deep water
|
|
|
|
if (line->frontsector->e->FakeFloor.Sectors.Size() > 0) continue;
|
|
|
|
|
|
|
|
// disregard control sectors for 3D-floors
|
|
|
|
if (line->frontsector->e->XFloor.attached.Size() > 0) continue;
|
|
|
|
|
|
|
|
total++;
|
|
|
|
if (line->flags & ML_DONTDRAW) flagged++;
|
|
|
|
}
|
|
|
|
am_showallenabled = (flagged * 100 / total >= self);
|
|
|
|
}
|
|
|
|
else if (self == 0)
|
|
|
|
{
|
|
|
|
am_showallenabled = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
am_showallenabled = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
#define AM_NUMMARKPOINTS 10
|
|
|
|
|
|
|
|
// player radius for automap checking
|
|
|
|
#define PLAYERRADIUS 16*MAPUNIT
|
|
|
|
|
|
|
|
// how much the automap moves window per tic in frame-buffer coordinates
|
|
|
|
// moves 140 pixels at 320x200 in 1 second
|
|
|
|
#define F_PANINC (140/TICRATE)
|
|
|
|
// how much zoom-in per tic
|
|
|
|
// goes to 2x in 1 second
|
2010-09-01 06:57:40 +00:00
|
|
|
#define M_ZOOMIN (1.02*MAPUNIT)
|
2008-01-27 11:25:03 +00:00
|
|
|
// how much zoom-out per tic
|
|
|
|
// pulls out to 0.5x in 1 second
|
2010-09-01 06:57:40 +00:00
|
|
|
#define M_ZOOMOUT (MAPUNIT/1.02)
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
// translates between frame-buffer and map coordinates
|
|
|
|
#define CXMTOF(x) (MTOF((x)-m_x)/* - f_x*/)
|
|
|
|
#define CYMTOF(y) (f_h - MTOF((y)-m_y)/* + f_y*/)
|
|
|
|
|
2009-03-29 11:21:36 +00:00
|
|
|
struct fpoint_t
|
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
int x, y;
|
2009-03-29 11:21:36 +00:00
|
|
|
};
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-03-29 11:21:36 +00:00
|
|
|
struct fline_t
|
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
fpoint_t a, b;
|
2009-03-29 11:21:36 +00:00
|
|
|
};
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-03-29 11:21:36 +00:00
|
|
|
struct mpoint_t
|
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
fixed_t x,y;
|
2009-03-29 11:21:36 +00:00
|
|
|
};
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-03-29 11:21:36 +00:00
|
|
|
struct mline_t
|
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
mpoint_t a, b;
|
2009-03-29 11:21:36 +00:00
|
|
|
};
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-03-29 11:21:36 +00:00
|
|
|
struct islope_t
|
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
fixed_t slp, islp;
|
2009-03-29 11:21:36 +00:00
|
|
|
};
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// The vector graphics for the automap.
|
|
|
|
// A line drawing of the player pointing right,
|
|
|
|
// starting from the middle.
|
|
|
|
//
|
2010-12-14 22:53:44 +00:00
|
|
|
static TArray<mline_t> MapArrow;
|
|
|
|
static TArray<mline_t> CheatMapArrow;
|
|
|
|
static TArray<mline_t> CheatKey;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
#define R (MAPUNIT)
|
|
|
|
// [RH] Avoid lots of warnings without compiler-specific #pragmas
|
|
|
|
#define L(a,b,c,d) { {(fixed_t)((a)*R),(fixed_t)((b)*R)}, {(fixed_t)((c)*R),(fixed_t)((d)*R)} }
|
2010-12-14 22:53:44 +00:00
|
|
|
static mline_t triangle_guy[] = {
|
2008-01-27 11:25:03 +00:00
|
|
|
L (-.867,-.5, .867,-.5),
|
|
|
|
L (.867,-.5, 0,1),
|
|
|
|
L (0,1, -.867,-.5)
|
|
|
|
};
|
|
|
|
#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
|
|
|
|
|
2010-12-14 22:53:44 +00:00
|
|
|
static mline_t thintriangle_guy[] = {
|
2008-01-27 11:25:03 +00:00
|
|
|
L (-.5,-.7, 1,0),
|
|
|
|
L (1,0, -.5,.7),
|
|
|
|
L (-.5,.7, -.5,-.7)
|
|
|
|
};
|
2010-07-25 22:56:01 +00:00
|
|
|
#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
|
|
|
|
|
2010-12-14 22:53:44 +00:00
|
|
|
static mline_t square_guy[] = {
|
2010-07-25 22:56:01 +00:00
|
|
|
L (0,1,1,0),
|
|
|
|
L (1,0,0,-1),
|
|
|
|
L (0,-1,-1,0),
|
|
|
|
L (-1,0,0,1)
|
|
|
|
};
|
|
|
|
#define NUMSQUAREGUYLINES (sizeof(square_guy)/sizeof(mline_t))
|
|
|
|
|
|
|
|
#undef R
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, sv_cheats)
|
|
|
|
CUSTOM_CVAR (Int, am_cheat, 0, 0)
|
|
|
|
{
|
|
|
|
// No automap cheat in net games when cheats are disabled!
|
|
|
|
if (netgame && !sv_cheats && self != 0)
|
|
|
|
{
|
|
|
|
self = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int grid = 0;
|
|
|
|
|
|
|
|
bool automapactive = false;
|
|
|
|
|
|
|
|
// location of window on screen
|
|
|
|
static int f_x;
|
|
|
|
static int f_y;
|
|
|
|
|
|
|
|
// size of window on screen
|
|
|
|
static int f_w;
|
|
|
|
static int f_h;
|
|
|
|
static int f_p; // [RH] # of bytes from start of a line to start of next
|
|
|
|
|
|
|
|
static int amclock;
|
|
|
|
|
|
|
|
static mpoint_t m_paninc; // how far the window pans each tic (map coords)
|
|
|
|
static fixed_t mtof_zoommul; // how far the window zooms in each tic (map coords)
|
2010-09-01 06:57:40 +00:00
|
|
|
static float am_zoomdir;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
static fixed_t m_x, m_y; // LL x,y where the window is on the map (map coords)
|
|
|
|
static fixed_t m_x2, m_y2; // UR x,y where the window is on the map (map coords)
|
|
|
|
|
|
|
|
//
|
|
|
|
// width/height of window on map (map coords)
|
|
|
|
//
|
|
|
|
static fixed_t m_w;
|
|
|
|
static fixed_t m_h;
|
|
|
|
|
|
|
|
// based on level size
|
|
|
|
static fixed_t min_x, min_y, max_x, max_y;
|
|
|
|
|
|
|
|
static fixed_t max_w; // max_x-min_x,
|
|
|
|
static fixed_t max_h; // max_y-min_y
|
|
|
|
|
|
|
|
// based on player size
|
|
|
|
static fixed_t min_w;
|
|
|
|
static fixed_t min_h;
|
|
|
|
|
|
|
|
|
|
|
|
static fixed_t min_scale_mtof; // used to tell when to stop zooming out
|
|
|
|
static fixed_t max_scale_mtof; // used to tell when to stop zooming in
|
|
|
|
|
|
|
|
// old stuff for recovery later
|
|
|
|
static fixed_t old_m_w, old_m_h;
|
|
|
|
static fixed_t old_m_x, old_m_y;
|
|
|
|
|
|
|
|
// old location used by the Follower routine
|
|
|
|
static mpoint_t f_oldloc;
|
|
|
|
|
2008-06-28 13:29:59 +00:00
|
|
|
static FTextureID marknums[10]; // numbers used for marking by the automap
|
2008-01-27 11:25:03 +00:00
|
|
|
static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
|
|
|
|
static int markpointnum = 0; // next point to be assigned
|
|
|
|
|
2008-08-12 23:22:08 +00:00
|
|
|
static FTextureID mapback; // the automap background
|
2008-01-27 11:25:03 +00:00
|
|
|
static fixed_t mapystart=0; // y-value for the start of the map bitmap...used in the parallax stuff.
|
|
|
|
static fixed_t mapxstart=0; //x-value for the bitmap.
|
|
|
|
|
|
|
|
static bool stopped = true;
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
static void AM_calcMinMaxMtoF();
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
void AM_rotatePoint (fixed_t *x, fixed_t *y);
|
|
|
|
void AM_rotate (fixed_t *x, fixed_t *y, angle_t an);
|
2008-02-14 13:07:19 +00:00
|
|
|
void AM_doFollowPlayer ();
|
2010-08-27 17:42:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// map functions
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
bool AM_addMark ();
|
|
|
|
bool AM_clearMarks ();
|
|
|
|
void AM_saveScaleAndLoc ();
|
|
|
|
void AM_restoreScaleAndLoc ();
|
|
|
|
void AM_minOutWindowScale ();
|
|
|
|
|
|
|
|
|
2010-10-24 08:40:22 +00:00
|
|
|
CVAR(Bool, am_followplayer, true, CVAR_ARCHIVE)
|
|
|
|
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
CCMD(am_togglefollow)
|
|
|
|
{
|
2010-10-24 08:40:22 +00:00
|
|
|
am_followplayer = !am_followplayer;
|
2010-08-27 17:42:01 +00:00
|
|
|
f_oldloc.x = FIXED_MAX;
|
2010-10-24 08:40:22 +00:00
|
|
|
Printf ("%s\n", GStrings(am_followplayer ? "AMSTR_FOLLOWON" : "AMSTR_FOLLOWOFF"));
|
2010-08-27 17:42:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
CCMD(am_togglegrid)
|
|
|
|
{
|
|
|
|
grid = !grid;
|
|
|
|
Printf ("%s\n", GStrings(grid ? "AMSTR_GRIDON" : "AMSTR_GRIDOFF"));
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD(am_toggletexture)
|
|
|
|
{
|
|
|
|
if (am_textured && hasglnodes)
|
|
|
|
{
|
|
|
|
textured = !textured;
|
|
|
|
Printf ("%s\n", GStrings(textured ? "AMSTR_TEXON" : "AMSTR_TEXOFF"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD(am_setmark)
|
|
|
|
{
|
|
|
|
if (AM_addMark())
|
|
|
|
{
|
|
|
|
Printf ("%s %d\n", GStrings("AMSTR_MARKEDSPOT"), markpointnum);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD(am_clearmarks)
|
|
|
|
{
|
|
|
|
if (AM_clearMarks())
|
|
|
|
{
|
|
|
|
Printf ("%s\n", GStrings("AMSTR_MARKSCLEARED"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD(am_gobig)
|
|
|
|
{
|
|
|
|
bigstate = !bigstate;
|
|
|
|
if (bigstate)
|
|
|
|
{
|
|
|
|
AM_saveScaleAndLoc();
|
|
|
|
AM_minOutWindowScale();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
AM_restoreScaleAndLoc();
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
// Calculates the slope and slope according to the x-axis of a line
|
|
|
|
// segment in map coordinates (with the upright y-axis n' all) so
|
|
|
|
// that it can be used with the brain-dead drawing stuff.
|
|
|
|
|
|
|
|
// Ripped out for Heretic
|
|
|
|
/*
|
|
|
|
void AM_getIslope (mline_t *ml, islope_t *is)
|
|
|
|
{
|
|
|
|
int dx, dy;
|
|
|
|
|
|
|
|
dy = ml->a.y - ml->b.y;
|
|
|
|
dx = ml->b.x - ml->a.x;
|
|
|
|
if (!dy) is->islp = (dx<0?-MAXINT:MAXINT);
|
|
|
|
else is->islp = FixedDiv(dx, dy);
|
|
|
|
if (!dx) is->slp = (dy<0?-MAXINT:MAXINT);
|
|
|
|
else is->slp = FixedDiv(dy, dx);
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
2010-10-16 22:47:18 +00:00
|
|
|
|
|
|
|
void AM_ParseArrow(TArray<mline_t> &Arrow, const char *lumpname)
|
|
|
|
{
|
|
|
|
const int R = ((8*PLAYERRADIUS)/7);
|
|
|
|
FScanner sc;
|
|
|
|
int lump = Wads.CheckNumForFullName(lumpname, true);
|
|
|
|
if (lump >= 0)
|
|
|
|
{
|
|
|
|
sc.OpenLumpNum(lump);
|
|
|
|
sc.SetCMode(true);
|
|
|
|
while (sc.GetToken())
|
|
|
|
{
|
|
|
|
mline_t line;
|
|
|
|
sc.TokenMustBe('(');
|
|
|
|
sc.MustGetFloat();
|
|
|
|
line.a.x = xs_RoundToInt(sc.Float*R);
|
|
|
|
sc.MustGetToken(',');
|
|
|
|
sc.MustGetFloat();
|
|
|
|
line.a.y = xs_RoundToInt(sc.Float*R);
|
|
|
|
sc.MustGetToken(')');
|
|
|
|
sc.MustGetToken(',');
|
|
|
|
sc.MustGetToken('(');
|
|
|
|
sc.MustGetFloat();
|
|
|
|
line.b.x = xs_RoundToInt(sc.Float*R);
|
|
|
|
sc.MustGetToken(',');
|
|
|
|
sc.MustGetFloat();
|
|
|
|
line.b.y = xs_RoundToInt(sc.Float*R);
|
|
|
|
sc.MustGetToken(')');
|
|
|
|
Arrow.Push(line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:53:44 +00:00
|
|
|
void AM_StaticInit()
|
2010-10-16 22:47:18 +00:00
|
|
|
{
|
|
|
|
MapArrow.Clear();
|
|
|
|
CheatMapArrow.Clear();
|
2010-12-14 22:53:44 +00:00
|
|
|
CheatKey.Clear();
|
2010-10-16 22:47:18 +00:00
|
|
|
|
|
|
|
if (gameinfo.mMapArrow.IsNotEmpty()) AM_ParseArrow(MapArrow, gameinfo.mMapArrow);
|
|
|
|
if (gameinfo.mCheatMapArrow.IsNotEmpty()) AM_ParseArrow(CheatMapArrow, gameinfo.mCheatMapArrow);
|
|
|
|
AM_ParseArrow(CheatKey, "maparrows/key.txt");
|
|
|
|
if (MapArrow.Size() == 0) I_FatalError("No automap arrow defined");
|
2010-12-14 22:53:44 +00:00
|
|
|
|
|
|
|
char namebuf[9];
|
|
|
|
|
|
|
|
for (int i = 0; i < 10; i++)
|
|
|
|
{
|
|
|
|
mysnprintf (namebuf, countof(namebuf), "AMMNUM%d", i);
|
|
|
|
marknums[i] = TexMan.CheckForTexture (namebuf, FTexture::TEX_MiscPatch);
|
|
|
|
}
|
|
|
|
markpointnum = 0;
|
|
|
|
mapback.SetInvalid();
|
|
|
|
|
|
|
|
static DWORD *lastpal = NULL;
|
|
|
|
//static int lastback = -1;
|
|
|
|
DWORD *palette;
|
|
|
|
|
|
|
|
palette = (DWORD *)GPalette.BaseColors;
|
|
|
|
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = j = 0; i < 11; i++, j += 3)
|
|
|
|
{
|
|
|
|
DoomColors[i].FromRGB(DoomPaletteVals[j], DoomPaletteVals[j+1], DoomPaletteVals[j+2]);
|
|
|
|
StrifeColors[i].FromRGB(StrifePaletteVals[j], StrifePaletteVals[j+1], StrifePaletteVals[j+2]);
|
|
|
|
RavenColors[i].FromRGB(RavenPaletteVals[j], RavenPaletteVals[j+1], RavenPaletteVals[j+2]);
|
|
|
|
}
|
2010-10-16 22:47:18 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// called by the coordinate drawer
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
void AM_GetPosition(fixed_t &x, fixed_t &y)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
x = (m_x + m_w/2) << FRACTOMAPBITS;
|
|
|
|
y = (m_y + m_h/2) << FRACTOMAPBITS;
|
|
|
|
}
|
2009-10-11 20:05:18 +00:00
|
|
|
|
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_activateNewScale ()
|
|
|
|
{
|
|
|
|
m_x += m_w/2;
|
|
|
|
m_y += m_h/2;
|
|
|
|
m_w = FTOM(f_w);
|
|
|
|
m_h = FTOM(f_h);
|
|
|
|
m_x -= m_w/2;
|
|
|
|
m_y -= m_h/2;
|
|
|
|
m_x2 = m_x + m_w;
|
|
|
|
m_y2 = m_y + m_h;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_saveScaleAndLoc ()
|
|
|
|
{
|
|
|
|
old_m_x = m_x;
|
|
|
|
old_m_y = m_y;
|
|
|
|
old_m_w = m_w;
|
|
|
|
old_m_h = m_h;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_restoreScaleAndLoc ()
|
|
|
|
{
|
|
|
|
m_w = old_m_w;
|
|
|
|
m_h = old_m_h;
|
2010-10-24 08:40:22 +00:00
|
|
|
if (!am_followplayer)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
m_x = old_m_x;
|
|
|
|
m_y = old_m_y;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_x = (players[consoleplayer].camera->x >> FRACTOMAPBITS) - m_w/2;
|
|
|
|
m_y = (players[consoleplayer].camera->y >> FRACTOMAPBITS)- m_h/2;
|
|
|
|
}
|
|
|
|
m_x2 = m_x + m_w;
|
|
|
|
m_y2 = m_y + m_h;
|
|
|
|
|
|
|
|
// Change the scaling multipliers
|
|
|
|
scale_mtof = MapDiv(f_w<<MAPBITS, m_w);
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// adds a marker at the current location
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
bool AM_addMark ()
|
|
|
|
{
|
2008-06-28 13:29:59 +00:00
|
|
|
if (marknums[0].isValid())
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
markpoints[markpointnum].x = m_x + m_w/2;
|
|
|
|
markpoints[markpointnum].y = m_y + m_h/2;
|
|
|
|
markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Determines bounding box of all vertices,
|
|
|
|
// sets global variables controlling zoom range.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static void AM_findMinMaxBoundaries ()
|
|
|
|
{
|
|
|
|
min_x = min_y = FIXED_MAX;
|
|
|
|
max_x = max_y = FIXED_MIN;
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
for (int i = 0; i < numvertexes; i++)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
if (vertexes[i].x < min_x)
|
|
|
|
min_x = vertexes[i].x;
|
|
|
|
else if (vertexes[i].x > max_x)
|
|
|
|
max_x = vertexes[i].x;
|
|
|
|
|
|
|
|
if (vertexes[i].y < min_y)
|
|
|
|
min_y = vertexes[i].y;
|
|
|
|
else if (vertexes[i].y > max_y)
|
|
|
|
max_y = vertexes[i].y;
|
|
|
|
}
|
|
|
|
|
|
|
|
max_w = (max_x >>= FRACTOMAPBITS) - (min_x >>= FRACTOMAPBITS);
|
|
|
|
max_h = (max_y >>= FRACTOMAPBITS) - (min_y >>= FRACTOMAPBITS);
|
|
|
|
|
|
|
|
min_w = 2*PLAYERRADIUS; // const? never changed?
|
|
|
|
min_h = 2*PLAYERRADIUS;
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
AM_calcMinMaxMtoF();
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
static void AM_calcMinMaxMtoF()
|
|
|
|
{
|
|
|
|
fixed_t a = MapDiv (SCREENWIDTH << MAPBITS, max_w);
|
|
|
|
fixed_t b = MapDiv (::ST_Y << MAPBITS, max_h);
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
min_scale_mtof = a < b ? a : b;
|
|
|
|
max_scale_mtof = MapDiv (SCREENHEIGHT << MAPBITS, 2*PLAYERRADIUS);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-02-14 13:07:19 +00:00
|
|
|
static void AM_ClipRotatedExtents (fixed_t pivotx, fixed_t pivoty)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
if (am_rotate == 0 || (am_rotate == 2 && !viewactive))
|
|
|
|
{
|
2009-02-08 23:01:13 +00:00
|
|
|
if (m_x + m_w/2 > max_x)
|
|
|
|
m_x = max_x - m_w/2;
|
|
|
|
else if (m_x + m_w/2 < min_x)
|
|
|
|
m_x = min_x - m_w/2;
|
|
|
|
|
|
|
|
if (m_y + m_h/2 > max_y)
|
|
|
|
m_y = max_y - m_h/2;
|
|
|
|
else if (m_y + m_h/2 < min_y)
|
|
|
|
m_y = min_y - m_h/2;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-02-08 23:01:13 +00:00
|
|
|
#if 0
|
|
|
|
fixed_t rmin_x, rmin_y, rmax_x, rmax_y;
|
|
|
|
fixed_t xs[5], ys[5];
|
2008-01-27 11:25:03 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
xs[0] = min_x; ys[0] = min_y;
|
|
|
|
xs[1] = max_x; ys[1] = min_y;
|
|
|
|
xs[2] = max_x; ys[2] = max_y;
|
|
|
|
xs[3] = min_x; ys[3] = max_y;
|
2009-02-08 23:01:13 +00:00
|
|
|
xs[4] = m_x + m_w/2; ys[4] = m_y + m_h/2;
|
2008-01-27 11:25:03 +00:00
|
|
|
rmin_x = rmin_y = FIXED_MAX;
|
|
|
|
rmax_x = rmax_y = FIXED_MIN;
|
2008-02-14 13:07:19 +00:00
|
|
|
|
2009-02-08 23:01:13 +00:00
|
|
|
for (i = 0; i < 5; ++i)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-02-14 13:07:19 +00:00
|
|
|
xs[i] -= pivotx;
|
|
|
|
ys[i] -= pivoty;
|
|
|
|
AM_rotate (&xs[i], &ys[i], ANG90 - players[consoleplayer].camera->angle);
|
2009-02-08 23:01:13 +00:00
|
|
|
|
|
|
|
if (i == 5)
|
|
|
|
break;
|
|
|
|
// xs[i] += pivotx;
|
|
|
|
// ys[i] += pivoty;
|
2008-02-14 13:07:19 +00:00
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
if (xs[i] < rmin_x) rmin_x = xs[i];
|
|
|
|
if (xs[i] > rmax_x) rmax_x = xs[i];
|
|
|
|
if (ys[i] < rmin_y) rmin_y = ys[i];
|
|
|
|
if (ys[i] > rmax_y) rmax_y = ys[i];
|
|
|
|
}
|
2009-02-08 23:01:13 +00:00
|
|
|
if (rmax_x < 0)
|
|
|
|
xs[4] = -rmax_x;
|
|
|
|
else if (rmin_x > 0)
|
|
|
|
xs[4] = -rmin_x;
|
|
|
|
|
|
|
|
// if (ys[4] > rmax_y)
|
|
|
|
// ys[4] = rmax_y;
|
|
|
|
// else if (ys[4] < rmin_y)
|
|
|
|
// ys[4] = rmin_y;
|
|
|
|
AM_rotate (&xs[4], &ys[4], ANG270 - players[consoleplayer].camera->angle);
|
|
|
|
m_x = xs[4] + pivotx - m_w/2;
|
|
|
|
m_y = ys[4] + pivoty - m_h/2;
|
|
|
|
#endif
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
m_x2 = m_x + m_w;
|
|
|
|
m_y2 = m_y + m_h;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static void AM_ScrollParchment (fixed_t dmapx, fixed_t dmapy)
|
|
|
|
{
|
|
|
|
mapxstart -= MulScale12 (dmapx, scale_mtof);
|
|
|
|
mapystart -= MulScale12 (dmapy, scale_mtof);
|
|
|
|
|
2008-08-12 23:22:08 +00:00
|
|
|
if (mapback.isValid())
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-08-12 23:22:08 +00:00
|
|
|
FTexture *backtex = TexMan[mapback];
|
|
|
|
|
|
|
|
if (backtex != NULL)
|
|
|
|
{
|
|
|
|
int pwidth = backtex->GetWidth() << MAPBITS;
|
|
|
|
int pheight = backtex->GetHeight() << MAPBITS;
|
|
|
|
|
|
|
|
while(mapxstart > 0)
|
|
|
|
mapxstart -= pwidth;
|
|
|
|
while(mapxstart <= -pwidth)
|
|
|
|
mapxstart += pwidth;
|
|
|
|
while(mapystart > 0)
|
|
|
|
mapystart -= pheight;
|
|
|
|
while(mapystart <= -pheight)
|
|
|
|
mapystart += pheight;
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_changeWindowLoc ()
|
|
|
|
{
|
|
|
|
if (0 != (m_paninc.x | m_paninc.y))
|
|
|
|
{
|
2010-10-24 08:40:22 +00:00
|
|
|
am_followplayer = false;
|
2008-01-27 11:25:03 +00:00
|
|
|
f_oldloc.x = FIXED_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
int oldmx = m_x, oldmy = m_y;
|
2009-02-08 23:01:13 +00:00
|
|
|
fixed_t incx, incy, oincx, oincy;
|
|
|
|
|
|
|
|
incx = m_paninc.x;
|
|
|
|
incy = m_paninc.y;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-02-08 23:01:13 +00:00
|
|
|
oincx = incx = Scale(m_paninc.x, SCREENWIDTH, 320);
|
|
|
|
oincy = incy = Scale(m_paninc.y, SCREENHEIGHT, 200);
|
2008-02-14 13:07:19 +00:00
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotate(&incx, &incy, players[consoleplayer].camera->angle - ANG90);
|
|
|
|
}
|
|
|
|
|
|
|
|
m_x += incx;
|
|
|
|
m_y += incy;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2008-02-14 13:07:19 +00:00
|
|
|
AM_ClipRotatedExtents (oldmx + m_w/2, oldmy + m_h/2);
|
2009-02-08 23:01:13 +00:00
|
|
|
AM_ScrollParchment (m_x != oldmx ? oincx : 0, m_y != oldmy ? -oincy : 0);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_initVariables ()
|
|
|
|
{
|
|
|
|
int pnum;
|
|
|
|
|
|
|
|
automapactive = true;
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
// Reset AM buttons
|
|
|
|
Button_AM_PanLeft.Reset();
|
|
|
|
Button_AM_PanRight.Reset();
|
|
|
|
Button_AM_PanUp.Reset();
|
|
|
|
Button_AM_PanDown.Reset();
|
|
|
|
Button_AM_ZoomIn.Reset();
|
|
|
|
Button_AM_ZoomOut.Reset();
|
|
|
|
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
f_oldloc.x = FIXED_MAX;
|
|
|
|
amclock = 0;
|
|
|
|
|
|
|
|
m_paninc.x = m_paninc.y = 0;
|
|
|
|
mtof_zoommul = MAPUNIT;
|
|
|
|
|
|
|
|
m_w = FTOM(SCREENWIDTH);
|
|
|
|
m_h = FTOM(SCREENHEIGHT);
|
|
|
|
|
|
|
|
// find player to center on initially
|
|
|
|
if (!playeringame[pnum = consoleplayer])
|
|
|
|
for (pnum=0;pnum<MAXPLAYERS;pnum++)
|
|
|
|
if (playeringame[pnum])
|
|
|
|
break;
|
|
|
|
|
|
|
|
m_x = (players[pnum].camera->x >> FRACTOMAPBITS) - m_w/2;
|
|
|
|
m_y = (players[pnum].camera->y >> FRACTOMAPBITS) - m_h/2;
|
|
|
|
AM_changeWindowLoc();
|
|
|
|
|
|
|
|
// for saving & restoring
|
|
|
|
old_m_x = m_x;
|
|
|
|
old_m_y = m_y;
|
|
|
|
old_m_w = m_w;
|
|
|
|
old_m_h = m_h;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
static void AM_initColors (bool overlayed)
|
|
|
|
{
|
|
|
|
if (overlayed)
|
|
|
|
{
|
|
|
|
YourColor.FromCVar (am_ovyourcolor);
|
|
|
|
WallColor.FromCVar (am_ovwallcolor);
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor.FromCVar(am_ovspecialwallcolor);
|
2010-01-30 09:26:44 +00:00
|
|
|
SecretWallColor = WallColor;
|
|
|
|
SecretSectorColor.FromCVar (am_ovsecretsectorcolor);
|
2008-01-27 11:25:03 +00:00
|
|
|
ThingColor_Item.FromCVar (am_ovthingcolor_item);
|
2010-07-25 22:56:01 +00:00
|
|
|
ThingColor_CountItem.FromCVar (am_ovthingcolor_citem);
|
2008-01-27 11:25:03 +00:00
|
|
|
ThingColor_Friend.FromCVar (am_ovthingcolor_friend);
|
|
|
|
ThingColor_Monster.FromCVar (am_ovthingcolor_monster);
|
|
|
|
ThingColor.FromCVar (am_ovthingcolor);
|
|
|
|
LockedColor.FromCVar (am_ovotherwallscolor);
|
2011-01-09 11:50:35 +00:00
|
|
|
EFWallColor = FDWallColor = CDWallColor = LockedColor;
|
2008-01-27 11:25:03 +00:00
|
|
|
TSWallColor.FromCVar (am_ovunseencolor);
|
|
|
|
NotSeenColor = TSWallColor;
|
|
|
|
InterTeleportColor.FromCVar (am_ovtelecolor);
|
|
|
|
IntraTeleportColor = InterTeleportColor;
|
|
|
|
}
|
2008-08-23 21:48:24 +00:00
|
|
|
else switch(am_colorset)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-08-23 21:48:24 +00:00
|
|
|
default:
|
|
|
|
{
|
|
|
|
/* Use the custom colors in the am_* cvars */
|
|
|
|
Background.FromCVar (am_backcolor);
|
|
|
|
YourColor.FromCVar (am_yourcolor);
|
|
|
|
SecretWallColor.FromCVar (am_secretwallcolor);
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor.FromCVar (am_specialwallcolor);
|
2008-08-23 21:48:24 +00:00
|
|
|
WallColor.FromCVar (am_wallcolor);
|
|
|
|
TSWallColor.FromCVar (am_tswallcolor);
|
|
|
|
FDWallColor.FromCVar (am_fdwallcolor);
|
|
|
|
CDWallColor.FromCVar (am_cdwallcolor);
|
2011-01-09 11:50:35 +00:00
|
|
|
EFWallColor.FromCVar (am_efwallcolor);
|
2008-08-23 21:48:24 +00:00
|
|
|
ThingColor_Item.FromCVar (am_thingcolor_item);
|
2010-07-25 22:56:01 +00:00
|
|
|
ThingColor_CountItem.FromCVar (am_thingcolor_citem);
|
2008-08-23 21:48:24 +00:00
|
|
|
ThingColor_Friend.FromCVar (am_thingcolor_friend);
|
|
|
|
ThingColor_Monster.FromCVar (am_thingcolor_monster);
|
|
|
|
ThingColor.FromCVar (am_thingcolor);
|
|
|
|
GridColor.FromCVar (am_gridcolor);
|
|
|
|
XHairColor.FromCVar (am_xhaircolor);
|
|
|
|
NotSeenColor.FromCVar (am_notseencolor);
|
|
|
|
LockedColor.FromCVar (am_lockedcolor);
|
|
|
|
InterTeleportColor.FromCVar (am_interlevelcolor);
|
|
|
|
IntraTeleportColor.FromCVar (am_intralevelcolor);
|
|
|
|
SecretSectorColor.FromCVar (am_secretsectorcolor);
|
|
|
|
|
|
|
|
DWORD ba = am_backcolor;
|
|
|
|
|
|
|
|
int r = RPART(ba) - 16;
|
|
|
|
int g = GPART(ba) - 16;
|
|
|
|
int b = BPART(ba) - 16;
|
|
|
|
|
|
|
|
if (r < 0)
|
|
|
|
r += 32;
|
|
|
|
if (g < 0)
|
|
|
|
g += 32;
|
|
|
|
if (b < 0)
|
|
|
|
b += 32;
|
|
|
|
|
|
|
|
AlmostBackground.FromRGB(r, g, b);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case 1: // Doom
|
|
|
|
// Use colors corresponding to the original Doom's
|
|
|
|
Background = DoomColors[0];
|
|
|
|
YourColor = DoomColors[1];
|
|
|
|
AlmostBackground = DoomColors[2];
|
|
|
|
SecretSectorColor =
|
|
|
|
SecretWallColor =
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor =
|
2008-08-23 21:48:24 +00:00
|
|
|
WallColor = DoomColors[3];
|
|
|
|
TSWallColor = DoomColors[4];
|
2011-01-09 11:50:35 +00:00
|
|
|
EFWallColor = FDWallColor = DoomColors[5];
|
2008-08-23 21:48:24 +00:00
|
|
|
LockedColor =
|
|
|
|
CDWallColor = DoomColors[6];
|
|
|
|
ThingColor_Item =
|
|
|
|
ThingColor_Friend =
|
|
|
|
ThingColor_Monster =
|
|
|
|
ThingColor = DoomColors[7];
|
|
|
|
GridColor = DoomColors[8];
|
|
|
|
XHairColor = DoomColors[9];
|
|
|
|
NotSeenColor = DoomColors[10];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: // Strife
|
|
|
|
// Use colors corresponding to the original Strife's
|
|
|
|
Background = StrifeColors[0];
|
|
|
|
YourColor = StrifeColors[1];
|
|
|
|
AlmostBackground = DoomColors[2];
|
|
|
|
SecretSectorColor =
|
|
|
|
SecretWallColor =
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor =
|
2008-08-23 21:48:24 +00:00
|
|
|
WallColor = StrifeColors[3];
|
|
|
|
TSWallColor = StrifeColors[4];
|
2011-01-09 11:50:35 +00:00
|
|
|
EFWallColor = FDWallColor = StrifeColors[5];
|
2008-08-23 21:48:24 +00:00
|
|
|
LockedColor =
|
|
|
|
CDWallColor = StrifeColors[6];
|
Update to ZDoom r1222
- Moved IF_ALWAYSPICKUP and GiveQuest into CallTryPickup so that they are
automatically used by all inventory classes.
- The previous change made it necessary to replace all TryPickup calls with
another function that just calls TryPickup.
- Fixed: AInventory::TryPickup can change the toucher so this must be reported
to subclasses calling the super function. Changed TryPickup to pass the
toucher pointer by reference.
- Prefixed all names of CQ decorations with Chex after seeing some conflicts
with PWADs.
- Removed Chex Quest actors that were just unaltered duplicates of Doom's.
- Added detection for Chex Quest 3 IWAD.
- Cleaned up M_QuitGame because the code was almost incomprehensible and I
wanted to add CQ3's new quit messages.
- Added Chex Quest obituaries and a few other messages from CQ3.
- Fixed: drawbar improperly clipped images when not in the top left quadrant.
- Fixed: Crouching no longer worked due to a bug introduced by the
player input code.
- Added GetPlayerInput() for examining a player's inputs from ACS. Most
buttons are now passed across the network, and there are four new user
buttons specifically for use with this command. Also defined +zoom
and +reload for future implementation.
- Fixed: Hexen's fourth weapon pieces did not play the correct pickup sound,
and when they were fully assembled, they did not play the sound across the
entire level.
- Antialiasing of lines is now controlled solely by the vid_hwaalines cvar,
ignoring what the driver reports, since ATI is apparently just as bad as
NVidia.
- Added a check for D3DLINECAPS_ANTIALIAS, but this is complicated by the
fact that NVidia's don't report it, even though they support it. If there
are any cards that no longer have antialised lines on the automap, please
let me know.
- Added vid_hwaalines cvar to force antialiased lines off for the
Direct3D renderer, in case it doesn't really support them.
- Fixed: The new rolloff values being stored in FSoundChan need to be serialized
for savegames.
- Since loading of the sound lump is now done in S_LoadSound I added an IsNull
method to the SoundRenderer class so that this function doesn't need to
load the sound for the NullSoundRenderer.
- Took some more non-FMOD related code out of fmodsound.cpp, including the
code that checks for raw and Doom sounds. This means that sfxinfo_t is no
longer needed in the SoundRenderer class so I took out all references to it.
- Fixed: FMODSoundRenderer::StartSound3D must set the static variable pointing
to the rolloff information back to NULL when starting the sound fails.
- Fixed: Rolloff information was taken from the sfxinfo that contained the
actual sound data, not the one that was used for starting the sound.
- Fixed: Chex Quest's Super Bootspork was missing the pickup message.
- Added missing Strife automap colors for items and non-monsters.
- Fixed: GetMSLength didn't resolve random and player sounds.
- Moved sound aliasing code out of fmodsound.cpp into S_LoadSound.
- Fixed: The tagged version of TranslucentLine took the information for additive
translucency from the tagged linedef, not the control linedef.
- Added check for additive translucency to TRANMAP checking.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@175 b0f79afe-0144-0410-b225-9a4edf0717df
2008-09-14 07:03:28 +00:00
|
|
|
ThingColor_Item = StrifeColors[10];
|
|
|
|
ThingColor_Friend =
|
|
|
|
ThingColor_Monster = StrifeColors[7];
|
|
|
|
ThingColor = StrifeColors[9];
|
2008-08-23 21:48:24 +00:00
|
|
|
GridColor = StrifeColors[8];
|
Update to ZDoom r1222
- Moved IF_ALWAYSPICKUP and GiveQuest into CallTryPickup so that they are
automatically used by all inventory classes.
- The previous change made it necessary to replace all TryPickup calls with
another function that just calls TryPickup.
- Fixed: AInventory::TryPickup can change the toucher so this must be reported
to subclasses calling the super function. Changed TryPickup to pass the
toucher pointer by reference.
- Prefixed all names of CQ decorations with Chex after seeing some conflicts
with PWADs.
- Removed Chex Quest actors that were just unaltered duplicates of Doom's.
- Added detection for Chex Quest 3 IWAD.
- Cleaned up M_QuitGame because the code was almost incomprehensible and I
wanted to add CQ3's new quit messages.
- Added Chex Quest obituaries and a few other messages from CQ3.
- Fixed: drawbar improperly clipped images when not in the top left quadrant.
- Fixed: Crouching no longer worked due to a bug introduced by the
player input code.
- Added GetPlayerInput() for examining a player's inputs from ACS. Most
buttons are now passed across the network, and there are four new user
buttons specifically for use with this command. Also defined +zoom
and +reload for future implementation.
- Fixed: Hexen's fourth weapon pieces did not play the correct pickup sound,
and when they were fully assembled, they did not play the sound across the
entire level.
- Antialiasing of lines is now controlled solely by the vid_hwaalines cvar,
ignoring what the driver reports, since ATI is apparently just as bad as
NVidia.
- Added a check for D3DLINECAPS_ANTIALIAS, but this is complicated by the
fact that NVidia's don't report it, even though they support it. If there
are any cards that no longer have antialised lines on the automap, please
let me know.
- Added vid_hwaalines cvar to force antialiased lines off for the
Direct3D renderer, in case it doesn't really support them.
- Fixed: The new rolloff values being stored in FSoundChan need to be serialized
for savegames.
- Since loading of the sound lump is now done in S_LoadSound I added an IsNull
method to the SoundRenderer class so that this function doesn't need to
load the sound for the NullSoundRenderer.
- Took some more non-FMOD related code out of fmodsound.cpp, including the
code that checks for raw and Doom sounds. This means that sfxinfo_t is no
longer needed in the SoundRenderer class so I took out all references to it.
- Fixed: FMODSoundRenderer::StartSound3D must set the static variable pointing
to the rolloff information back to NULL when starting the sound fails.
- Fixed: Rolloff information was taken from the sfxinfo that contained the
actual sound data, not the one that was used for starting the sound.
- Fixed: Chex Quest's Super Bootspork was missing the pickup message.
- Added missing Strife automap colors for items and non-monsters.
- Fixed: GetMSLength didn't resolve random and player sounds.
- Moved sound aliasing code out of fmodsound.cpp into S_LoadSound.
- Fixed: The tagged version of TranslucentLine took the information for additive
translucency from the tagged linedef, not the control linedef.
- Added check for additive translucency to TRANMAP checking.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@175 b0f79afe-0144-0410-b225-9a4edf0717df
2008-09-14 07:03:28 +00:00
|
|
|
XHairColor = DoomColors[9];
|
|
|
|
NotSeenColor = DoomColors[10];
|
2008-08-23 21:48:24 +00:00
|
|
|
break;
|
2009-04-19 06:46:53 +00:00
|
|
|
|
|
|
|
case 3: // Raven
|
|
|
|
// Use colors corresponding to the original Raven's
|
|
|
|
Background = RavenColors[0];
|
|
|
|
YourColor = RavenColors[1];
|
|
|
|
AlmostBackground = DoomColors[2];
|
|
|
|
SecretSectorColor =
|
|
|
|
SecretWallColor =
|
2010-12-15 16:32:37 +00:00
|
|
|
SpecialWallColor =
|
2009-04-19 06:46:53 +00:00
|
|
|
WallColor = RavenColors[3];
|
|
|
|
TSWallColor = RavenColors[4];
|
2011-01-09 11:50:35 +00:00
|
|
|
EFWallColor = FDWallColor = RavenColors[5];
|
2009-04-19 06:46:53 +00:00
|
|
|
LockedColor =
|
|
|
|
CDWallColor = RavenColors[6];
|
|
|
|
ThingColor =
|
|
|
|
ThingColor_Item =
|
|
|
|
ThingColor_Friend =
|
|
|
|
ThingColor_Monster = RavenColors[7];
|
|
|
|
GridColor = RavenColors[4];
|
|
|
|
XHairColor = RavenColors[9];
|
|
|
|
NotSeenColor = RavenColors[10];
|
|
|
|
break;
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
bool AM_clearMarks ()
|
|
|
|
{
|
|
|
|
for (int i = AM_NUMMARKPOINTS-1; i >= 0; i--)
|
|
|
|
markpoints[i].x = -1; // means empty
|
|
|
|
markpointnum = 0;
|
2008-06-28 13:29:59 +00:00
|
|
|
return marknums[0].isValid();
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// called right after the level has been loaded
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_LevelInit ()
|
|
|
|
{
|
2010-12-14 22:53:44 +00:00
|
|
|
const char *autopage = level.info->mapbg[0] == 0? "AUTOPAGE" : (const char*)&level.info->mapbg[0];
|
|
|
|
mapback = TexMan.CheckForTexture(autopage, FTexture::TEX_MiscPatch);
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
AM_clearMarks();
|
|
|
|
|
|
|
|
AM_findMinMaxBoundaries();
|
|
|
|
scale_mtof = MapDiv(min_scale_mtof, (int) (0.7*MAPUNIT));
|
|
|
|
if (scale_mtof > max_scale_mtof)
|
|
|
|
scale_mtof = min_scale_mtof;
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
2010-05-01 17:31:45 +00:00
|
|
|
|
|
|
|
am_showalllines.Callback();
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_Stop ()
|
|
|
|
{
|
|
|
|
automapactive = false;
|
|
|
|
stopped = true;
|
|
|
|
BorderNeedRefresh = screen->GetPageCount ();
|
|
|
|
viewactive = true;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_Start ()
|
|
|
|
{
|
|
|
|
if (!stopped) AM_Stop();
|
|
|
|
stopped = false;
|
|
|
|
AM_initVariables();
|
|
|
|
}
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// set the window scale to the maximum size
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_minOutWindowScale ()
|
|
|
|
{
|
|
|
|
scale_mtof = min_scale_mtof;
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// set the window scale to the minimum size
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_maxOutWindowScale ()
|
|
|
|
{
|
|
|
|
scale_mtof = max_scale_mtof;
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2009-04-19 06:46:53 +00:00
|
|
|
//
|
|
|
|
// Called right after the resolution has changed
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2009-04-19 06:46:53 +00:00
|
|
|
void AM_NewResolution()
|
|
|
|
{
|
|
|
|
fixed_t oldmin = min_scale_mtof;
|
2009-04-28 21:31:02 +00:00
|
|
|
|
|
|
|
if ( oldmin == 0 )
|
|
|
|
{
|
|
|
|
return; // [SP] Not in a game, exit!
|
|
|
|
}
|
2009-04-19 06:46:53 +00:00
|
|
|
AM_calcMinMaxMtoF();
|
|
|
|
scale_mtof = Scale(scale_mtof, min_scale_mtof, oldmin);
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
|
|
|
if (scale_mtof < min_scale_mtof)
|
|
|
|
AM_minOutWindowScale();
|
|
|
|
else if (scale_mtof > max_scale_mtof)
|
|
|
|
AM_maxOutWindowScale();
|
|
|
|
f_w = screen->GetWidth();
|
|
|
|
f_h = ST_Y;
|
|
|
|
AM_activateNewScale();
|
|
|
|
}
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
CCMD (togglemap)
|
|
|
|
{
|
|
|
|
gameaction = ga_togglemap;
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_ToggleMap ()
|
|
|
|
{
|
|
|
|
if (gamestate != GS_LEVEL)
|
|
|
|
return;
|
|
|
|
|
2008-12-28 13:27:13 +00:00
|
|
|
// Don't activate the automap if we're not allowed to use it.
|
|
|
|
if (dmflags2 & DF2_NO_AUTOMAP)
|
|
|
|
return;
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
SB_state = screen->GetPageCount ();
|
|
|
|
if (!automapactive)
|
|
|
|
{
|
|
|
|
AM_Start ();
|
|
|
|
viewactive = (am_overlay != 0.f);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (am_overlay==1 && viewactive)
|
|
|
|
{
|
|
|
|
viewactive = false;
|
|
|
|
SB_state = screen->GetPageCount ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
AM_Stop ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Handle events (user inputs) in automap mode
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
bool AM_Responder (event_t *ev, bool last)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-08-27 17:42:01 +00:00
|
|
|
if (automapactive && (ev->type == EV_KeyDown || ev->type == EV_KeyUp))
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-10-24 08:40:22 +00:00
|
|
|
if (am_followplayer)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-08-27 17:42:01 +00:00
|
|
|
// check for am_pan* and ignore in follow mode
|
|
|
|
const char *defbind = AutomapBindings.GetBind(ev->data1);
|
|
|
|
if (!strnicmp(defbind, "+am_pan", 7)) return false;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
2010-08-27 17:42:01 +00:00
|
|
|
|
|
|
|
bool res = C_DoKey(ev, &AutomapBindings, NULL);
|
|
|
|
if (res && ev->type == EV_KeyUp && !last)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-08-27 17:42:01 +00:00
|
|
|
// If this is a release event we also need to check if it released a button in the main Bindings
|
|
|
|
// so that that button does not get stuck.
|
|
|
|
const char *defbind = Bindings.GetBind(ev->data1);
|
|
|
|
return (defbind[0] != '+'); // Let G_Responder handle button releases
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
2010-08-27 17:42:01 +00:00
|
|
|
return res;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
2010-08-27 17:42:01 +00:00
|
|
|
return false;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Zooming
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_changeWindowScale ()
|
|
|
|
{
|
2010-08-27 17:42:01 +00:00
|
|
|
int mtof_zoommul;
|
|
|
|
|
2010-09-01 06:57:40 +00:00
|
|
|
if (am_zoomdir > 0)
|
|
|
|
{
|
|
|
|
mtof_zoommul = int(M_ZOOMIN * am_zoomdir);
|
|
|
|
}
|
|
|
|
else if (am_zoomdir < 0)
|
|
|
|
{
|
|
|
|
mtof_zoommul = int(M_ZOOMOUT / -am_zoomdir);
|
|
|
|
}
|
|
|
|
else if (Button_AM_ZoomIn.bDown)
|
|
|
|
{
|
|
|
|
mtof_zoommul = int(M_ZOOMIN);
|
|
|
|
}
|
|
|
|
else if (Button_AM_ZoomOut.bDown)
|
|
|
|
{
|
|
|
|
mtof_zoommul = int(M_ZOOMOUT);
|
|
|
|
}
|
2011-03-30 13:06:11 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
mtof_zoommul = MAPUNIT;
|
|
|
|
}
|
2010-09-01 06:57:40 +00:00
|
|
|
am_zoomdir = 0;
|
2010-08-27 17:42:01 +00:00
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
// Change the scaling multipliers
|
|
|
|
scale_mtof = MapMul(scale_mtof, mtof_zoommul);
|
|
|
|
scale_ftom = MapDiv(MAPUNIT, scale_mtof);
|
|
|
|
|
|
|
|
if (scale_mtof < min_scale_mtof)
|
|
|
|
AM_minOutWindowScale();
|
|
|
|
else if (scale_mtof > max_scale_mtof)
|
|
|
|
AM_maxOutWindowScale();
|
|
|
|
}
|
|
|
|
|
2010-09-01 06:57:40 +00:00
|
|
|
CCMD(am_zoom)
|
|
|
|
{
|
|
|
|
if (argv.argc() >= 2)
|
|
|
|
{
|
|
|
|
am_zoomdir = (float)atof(argv[1]);
|
|
|
|
}
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_doFollowPlayer ()
|
|
|
|
{
|
|
|
|
fixed_t sx, sy;
|
|
|
|
|
|
|
|
if (players[consoleplayer].camera != NULL &&
|
|
|
|
(f_oldloc.x != players[consoleplayer].camera->x ||
|
|
|
|
f_oldloc.y != players[consoleplayer].camera->y))
|
|
|
|
{
|
|
|
|
m_x = (players[consoleplayer].camera->x >> FRACTOMAPBITS) - m_w/2;
|
|
|
|
m_y = (players[consoleplayer].camera->y >> FRACTOMAPBITS) - m_h/2;
|
|
|
|
m_x2 = m_x + m_w;
|
|
|
|
m_y2 = m_y + m_h;
|
|
|
|
|
|
|
|
// do the parallax parchment scrolling.
|
|
|
|
sx = (players[consoleplayer].camera->x - f_oldloc.x) >> FRACTOMAPBITS;
|
|
|
|
sy = (f_oldloc.y - players[consoleplayer].camera->y) >> FRACTOMAPBITS;
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotate (&sx, &sy, players[consoleplayer].camera->angle - ANG90);
|
|
|
|
}
|
|
|
|
AM_ScrollParchment (sx, sy);
|
|
|
|
|
|
|
|
f_oldloc.x = players[consoleplayer].camera->x;
|
|
|
|
f_oldloc.y = players[consoleplayer].camera->y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Updates on Game Tick
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_Ticker ()
|
|
|
|
{
|
|
|
|
if (!automapactive)
|
|
|
|
return;
|
|
|
|
|
|
|
|
amclock++;
|
|
|
|
|
2010-10-24 08:40:22 +00:00
|
|
|
if (am_followplayer)
|
2010-08-27 17:42:01 +00:00
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
AM_doFollowPlayer();
|
2010-08-27 17:42:01 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_paninc.x = m_paninc.y = 0;
|
|
|
|
if (Button_AM_PanLeft.bDown) m_paninc.x -= FTOM(F_PANINC);
|
|
|
|
if (Button_AM_PanRight.bDown) m_paninc.x += FTOM(F_PANINC);
|
|
|
|
if (Button_AM_PanUp.bDown) m_paninc.y += FTOM(F_PANINC);
|
|
|
|
if (Button_AM_PanDown.bDown) m_paninc.y -= FTOM(F_PANINC);
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
// Change the zoom if necessary
|
2010-09-01 06:57:40 +00:00
|
|
|
if (Button_AM_ZoomIn.bDown || Button_AM_ZoomOut.bDown || am_zoomdir != 0)
|
2008-01-27 11:25:03 +00:00
|
|
|
AM_changeWindowScale();
|
|
|
|
|
|
|
|
// Change x,y location
|
|
|
|
//if (m_paninc.x || m_paninc.y)
|
|
|
|
AM_changeWindowLoc();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Clear automap frame buffer.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_clearFB (const AMColor &color)
|
|
|
|
{
|
2008-08-12 23:22:08 +00:00
|
|
|
if (!mapback.isValid() || !am_drawmapback)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
screen->Clear (0, 0, f_w, f_h, color.Index, color.RGB);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-08-12 23:22:08 +00:00
|
|
|
FTexture *backtex = TexMan[mapback];
|
|
|
|
if (backtex != NULL)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-08-12 23:22:08 +00:00
|
|
|
int pwidth = backtex->GetWidth();
|
|
|
|
int pheight = backtex->GetHeight();
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
//blit the automap background to the screen.
|
|
|
|
for (y = mapystart >> MAPBITS; y < f_h; y += pheight)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-08-12 23:22:08 +00:00
|
|
|
for (x = mapxstart >> MAPBITS; x < f_w; x += pwidth)
|
|
|
|
{
|
|
|
|
screen->DrawTexture (backtex, x, y, DTA_ClipBottom, f_h, DTA_TopOffset, 0, DTA_LeftOffset, 0, TAG_DONE);
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Automap clipping of lines.
|
|
|
|
//
|
|
|
|
// Based on Cohen-Sutherland clipping algorithm but with a slightly
|
|
|
|
// faster reject and precalculated slopes. If the speed is needed,
|
|
|
|
// use a hash algorithm to handle the common cases.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
bool AM_clipMline (mline_t *ml, fline_t *fl)
|
|
|
|
{
|
|
|
|
enum {
|
|
|
|
LEFT =1,
|
|
|
|
RIGHT =2,
|
|
|
|
BOTTOM =4,
|
|
|
|
TOP =8
|
|
|
|
};
|
|
|
|
|
|
|
|
register int outcode1 = 0;
|
|
|
|
register int outcode2 = 0;
|
|
|
|
register int outside;
|
|
|
|
|
|
|
|
fpoint_t tmp = { 0, 0 };
|
|
|
|
int dx;
|
|
|
|
int dy;
|
|
|
|
|
|
|
|
#define DOOUTCODE(oc, mx, my) \
|
|
|
|
(oc) = 0; \
|
|
|
|
if ((my) < 0) (oc) |= TOP; \
|
|
|
|
else if ((my) >= f_h) (oc) |= BOTTOM; \
|
|
|
|
if ((mx) < 0) (oc) |= LEFT; \
|
|
|
|
else if ((mx) >= f_w) (oc) |= RIGHT;
|
|
|
|
|
|
|
|
// do trivial rejects and outcodes
|
|
|
|
if (ml->a.y > m_y2)
|
|
|
|
outcode1 = TOP;
|
|
|
|
else if (ml->a.y < m_y)
|
|
|
|
outcode1 = BOTTOM;
|
|
|
|
|
|
|
|
if (ml->b.y > m_y2)
|
|
|
|
outcode2 = TOP;
|
|
|
|
else if (ml->b.y < m_y)
|
|
|
|
outcode2 = BOTTOM;
|
|
|
|
|
|
|
|
if (outcode1 & outcode2)
|
|
|
|
return false; // trivially outside
|
|
|
|
|
|
|
|
if (ml->a.x < m_x)
|
|
|
|
outcode1 |= LEFT;
|
|
|
|
else if (ml->a.x > m_x2)
|
|
|
|
outcode1 |= RIGHT;
|
|
|
|
|
|
|
|
if (ml->b.x < m_x)
|
|
|
|
outcode2 |= LEFT;
|
|
|
|
else if (ml->b.x > m_x2)
|
|
|
|
outcode2 |= RIGHT;
|
|
|
|
|
|
|
|
if (outcode1 & outcode2)
|
|
|
|
return false; // trivially outside
|
|
|
|
|
|
|
|
// transform to frame-buffer coordinates.
|
|
|
|
fl->a.x = CXMTOF(ml->a.x);
|
|
|
|
fl->a.y = CYMTOF(ml->a.y);
|
|
|
|
fl->b.x = CXMTOF(ml->b.x);
|
|
|
|
fl->b.y = CYMTOF(ml->b.y);
|
|
|
|
|
|
|
|
DOOUTCODE(outcode1, fl->a.x, fl->a.y);
|
|
|
|
DOOUTCODE(outcode2, fl->b.x, fl->b.y);
|
|
|
|
|
|
|
|
if (outcode1 & outcode2)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
while (outcode1 | outcode2) {
|
|
|
|
// may be partially inside box
|
|
|
|
// find an outside point
|
|
|
|
if (outcode1)
|
|
|
|
outside = outcode1;
|
|
|
|
else
|
|
|
|
outside = outcode2;
|
|
|
|
|
|
|
|
// clip to each side
|
|
|
|
if (outside & TOP)
|
|
|
|
{
|
|
|
|
dy = fl->a.y - fl->b.y;
|
|
|
|
dx = fl->b.x - fl->a.x;
|
2011-04-17 19:31:37 +00:00
|
|
|
tmp.x = fl->a.x + Scale(dx, fl->a.y, dy);
|
2008-01-27 11:25:03 +00:00
|
|
|
tmp.y = 0;
|
|
|
|
}
|
|
|
|
else if (outside & BOTTOM)
|
|
|
|
{
|
|
|
|
dy = fl->a.y - fl->b.y;
|
|
|
|
dx = fl->b.x - fl->a.x;
|
2011-04-17 19:31:37 +00:00
|
|
|
tmp.x = fl->a.x + Scale(dx, fl->a.y - f_h, dy);
|
2008-01-27 11:25:03 +00:00
|
|
|
tmp.y = f_h-1;
|
|
|
|
}
|
|
|
|
else if (outside & RIGHT)
|
|
|
|
{
|
|
|
|
dy = fl->b.y - fl->a.y;
|
|
|
|
dx = fl->b.x - fl->a.x;
|
2011-04-17 19:31:37 +00:00
|
|
|
tmp.y = fl->a.y + Scale(dy, f_w-1 - fl->a.x, dx);
|
2008-01-27 11:25:03 +00:00
|
|
|
tmp.x = f_w-1;
|
|
|
|
}
|
|
|
|
else if (outside & LEFT)
|
|
|
|
{
|
|
|
|
dy = fl->b.y - fl->a.y;
|
|
|
|
dx = fl->b.x - fl->a.x;
|
2011-04-17 19:31:37 +00:00
|
|
|
tmp.y = fl->a.y + Scale(dy, -fl->a.x, dx);
|
2008-01-27 11:25:03 +00:00
|
|
|
tmp.x = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (outside == outcode1)
|
|
|
|
{
|
|
|
|
fl->a = tmp;
|
|
|
|
DOOUTCODE(outcode1, fl->a.x, fl->a.y);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fl->b = tmp;
|
|
|
|
DOOUTCODE(outcode2, fl->b.x, fl->b.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (outcode1 & outcode2)
|
|
|
|
return false; // trivially outside
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#undef DOOUTCODE
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Clip lines, draw visible parts of lines.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawMline (mline_t *ml, const AMColor &color)
|
|
|
|
{
|
|
|
|
fline_t fl;
|
|
|
|
|
|
|
|
if (AM_clipMline (ml, &fl))
|
|
|
|
{
|
|
|
|
screen->DrawLine (f_x + fl.a.x, f_y + fl.a.y, f_x + fl.b.x, f_y + fl.b.y, color.Index, color.RGB);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Draws flat (floor/ceiling tile) aligned grid lines.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawGrid (const AMColor &color)
|
|
|
|
{
|
|
|
|
fixed_t x, y;
|
|
|
|
fixed_t start, end;
|
|
|
|
mline_t ml;
|
|
|
|
fixed_t minlen, extx, exty;
|
|
|
|
fixed_t minx, miny;
|
|
|
|
|
|
|
|
// [RH] Calculate a minimum for how long the grid lines should be so that
|
|
|
|
// they cover the screen at any rotation.
|
2010-11-07 17:18:15 +00:00
|
|
|
minlen = (fixed_t)sqrt ((double)m_w*(double)m_w + (double)m_h*(double)m_h);
|
2008-01-27 11:25:03 +00:00
|
|
|
extx = (minlen - m_w) / 2;
|
|
|
|
exty = (minlen - m_h) / 2;
|
|
|
|
|
|
|
|
minx = m_x;
|
|
|
|
miny = m_y;
|
|
|
|
|
|
|
|
// Figure out start of vertical gridlines
|
|
|
|
start = minx - extx;
|
|
|
|
if ((start-bmaporgx)%(MAPBLOCKUNITS<<MAPBITS))
|
|
|
|
start += (MAPBLOCKUNITS<<MAPBITS)
|
|
|
|
- ((start-bmaporgx)%(MAPBLOCKUNITS<<MAPBITS));
|
|
|
|
end = minx + minlen - extx;
|
|
|
|
|
|
|
|
// draw vertical gridlines
|
|
|
|
for (x = start; x < end; x += (MAPBLOCKUNITS<<MAPBITS))
|
|
|
|
{
|
|
|
|
ml.a.x = x;
|
|
|
|
ml.b.x = x;
|
|
|
|
ml.a.y = miny - exty;
|
|
|
|
ml.b.y = ml.a.y + minlen;
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&ml.a.x, &ml.a.y);
|
|
|
|
AM_rotatePoint (&ml.b.x, &ml.b.y);
|
|
|
|
}
|
|
|
|
AM_drawMline(&ml, color);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Figure out start of horizontal gridlines
|
|
|
|
start = miny - exty;
|
|
|
|
if ((start-bmaporgy)%(MAPBLOCKUNITS<<MAPBITS))
|
|
|
|
start += (MAPBLOCKUNITS<<MAPBITS)
|
|
|
|
- ((start-bmaporgy)%(MAPBLOCKUNITS<<MAPBITS));
|
|
|
|
end = miny + minlen - exty;
|
|
|
|
|
|
|
|
// draw horizontal gridlines
|
|
|
|
for (y=start; y<end; y+=(MAPBLOCKUNITS<<MAPBITS))
|
|
|
|
{
|
|
|
|
ml.a.x = minx - extx;
|
|
|
|
ml.b.x = ml.a.x + minlen;
|
|
|
|
ml.a.y = y;
|
|
|
|
ml.b.y = y;
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&ml.a.x, &ml.a.y);
|
|
|
|
AM_rotatePoint (&ml.b.x, &ml.b.y);
|
|
|
|
}
|
|
|
|
AM_drawMline (&ml, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// AM_drawSubsectors
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
void AM_drawSubsectors()
|
|
|
|
{
|
|
|
|
static TArray<FVector2> points;
|
|
|
|
float scale = float(scale_mtof);
|
|
|
|
angle_t rotation;
|
|
|
|
sector_t tempsec;
|
|
|
|
int floorlight, ceilinglight;
|
|
|
|
double originx, originy;
|
|
|
|
FDynamicColormap *colormap;
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < numsubsectors; ++i)
|
|
|
|
{
|
2010-08-28 17:41:51 +00:00
|
|
|
if (subsectors[i].flags & SSECF_POLYORG)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
if ((!(subsectors[i].flags & SSECF_DRAWN) || (subsectors[i].render_sector->MoreFlags & SECF_HIDDEN)) && am_cheat == 0)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// Fill the points array from the subsector.
|
|
|
|
points.Resize(subsectors[i].numlines);
|
|
|
|
for (DWORD j = 0; j < subsectors[i].numlines; ++j)
|
|
|
|
{
|
|
|
|
mpoint_t pt = { subsectors[i].firstline[j].v1->x >> FRACTOMAPBITS,
|
|
|
|
subsectors[i].firstline[j].v1->y >> FRACTOMAPBITS };
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint(&pt.x, &pt.y);
|
|
|
|
}
|
|
|
|
points[j].X = f_x + ((pt.x - m_x) * scale / float(1 << 24));
|
|
|
|
points[j].Y = f_y + (f_h - (pt.y - m_y) * scale / float(1 << 24));
|
|
|
|
}
|
|
|
|
// For lighting and texture determination
|
|
|
|
sector_t *sec = R_FakeFlat (subsectors[i].render_sector, &tempsec, &floorlight,
|
|
|
|
&ceilinglight, false);
|
|
|
|
// Find texture origin.
|
|
|
|
mpoint_t originpt = { -sec->GetXOffset(sector_t::floor) >> FRACTOMAPBITS,
|
|
|
|
sec->GetYOffset(sector_t::floor) >> FRACTOMAPBITS };
|
|
|
|
rotation = 0 - sec->GetAngle(sector_t::floor);
|
|
|
|
// Apply the floor's rotation to the texture origin.
|
|
|
|
if (rotation != 0)
|
|
|
|
{
|
|
|
|
AM_rotate(&originpt.x, &originpt.y, rotation);
|
|
|
|
}
|
|
|
|
// Apply the automap's rotation to the texture origin.
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
rotation += ANG90 - players[consoleplayer].camera->angle;
|
|
|
|
AM_rotatePoint(&originpt.x, &originpt.y);
|
|
|
|
}
|
|
|
|
originx = f_x + ((originpt.x - m_x) * scale / float(1 << 24));
|
|
|
|
originy = f_y + (f_h - (originpt.y - m_y) * scale / float(1 << 24));
|
|
|
|
// Coloring for the polygon
|
|
|
|
colormap = sec->ColorMap;
|
2011-01-09 11:50:35 +00:00
|
|
|
|
|
|
|
FTextureID maptex = sec->GetTexture(sector_t::floor);
|
|
|
|
|
|
|
|
#ifdef _3DFLOORS
|
|
|
|
|
|
|
|
if (sec->e->XFloor.ffloors.Size())
|
|
|
|
{
|
|
|
|
secplane_t *floorplane = &sec->floorplane;
|
|
|
|
|
|
|
|
// Look for the highest floor below the camera viewpoint.
|
|
|
|
// Check the center of the subsector's sector. Do not check each
|
|
|
|
// subsector separately because that might result in different planes for
|
|
|
|
// different subsectors of the same sector which is not wanted here.
|
|
|
|
// (Make the comparison in floating point to avoid overflows and improve performance.)
|
|
|
|
double secx;
|
|
|
|
double secy;
|
|
|
|
double cmpz = FIXED2DBL(viewz);
|
|
|
|
|
|
|
|
if (players[consoleplayer].camera && sec == players[consoleplayer].camera->Sector)
|
|
|
|
{
|
|
|
|
// For the actual camera sector use the current viewpoint as reference.
|
|
|
|
secx = FIXED2DBL(viewx);
|
|
|
|
secy = FIXED2DBL(viewy);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
secx = FIXED2DBL(sec->soundorg[0]);
|
|
|
|
secy = FIXED2DBL(sec->soundorg[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < sec->e->XFloor.ffloors.Size(); ++i)
|
|
|
|
{
|
|
|
|
F3DFloor *rover = sec->e->XFloor.ffloors[i];
|
|
|
|
if (!(rover->flags & FF_EXISTS)) continue;
|
|
|
|
if (rover->flags & FF_FOG) continue;
|
|
|
|
if (rover->alpha == 0) continue;
|
|
|
|
if (rover->top.plane->ZatPoint(secx, secy) < cmpz)
|
|
|
|
{
|
|
|
|
maptex = *(rover->top.texture);
|
|
|
|
floorplane = rover->top.plane;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lightlist_t *light = P_GetPlaneLight(sec, floorplane, false);
|
|
|
|
floorlight = *light->p_lightlevel;
|
2011-01-29 13:14:31 +00:00
|
|
|
colormap = light->extra_colormap;
|
2011-01-09 11:50:35 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-08-27 17:42:01 +00:00
|
|
|
// If this subsector has not actually been seen yet (because you are cheating
|
|
|
|
// to see it on the map), tint and desaturate it.
|
|
|
|
if (!(subsectors[i].flags & SSECF_DRAWN))
|
|
|
|
{
|
|
|
|
colormap = GetSpecialLights(
|
|
|
|
MAKERGB(
|
|
|
|
(colormap->Color.r + 255) / 2,
|
|
|
|
(colormap->Color.g + 200) / 2,
|
|
|
|
(colormap->Color.b + 160) / 2),
|
|
|
|
colormap->Fade,
|
|
|
|
255 - (255 - colormap->Desaturate) / 4);
|
|
|
|
floorlight = (floorlight + 200*15) / 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Draw the polygon.
|
2011-01-09 11:50:35 +00:00
|
|
|
screen->FillSimplePoly(TexMan(maptex),
|
2010-08-27 17:42:01 +00:00
|
|
|
&points[0], points.Size(),
|
|
|
|
originx, originy,
|
|
|
|
scale / (FIXED2FLOAT(sec->GetXScale(sector_t::floor)) * float(1 << MAPBITS)),
|
|
|
|
scale / (FIXED2FLOAT(sec->GetYScale(sector_t::floor)) * float(1 << MAPBITS)),
|
|
|
|
rotation,
|
|
|
|
colormap,
|
|
|
|
floorlight
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
static bool AM_CheckSecret(line_t *line)
|
|
|
|
{
|
|
|
|
if (line->frontsector != NULL)
|
|
|
|
{
|
2009-08-30 19:31:59 +00:00
|
|
|
if (line->frontsector->secretsector)
|
2008-04-08 22:32:52 +00:00
|
|
|
{
|
|
|
|
if (am_map_secrets!=0 && !(line->frontsector->special&SECRET_MASK)) return true;
|
|
|
|
if (am_map_secrets==2 && !(line->flags & ML_SECRET)) return true;
|
|
|
|
}
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
}
|
|
|
|
if (line->backsector != NULL)
|
|
|
|
{
|
2009-08-30 19:31:59 +00:00
|
|
|
if (line->backsector->secretsector)
|
2008-04-08 22:32:52 +00:00
|
|
|
{
|
|
|
|
if (am_map_secrets!=0 && !(line->backsector->special&SECRET_MASK)) return true;
|
|
|
|
if (am_map_secrets==2 && !(line->flags & ML_SECRET)) return true;
|
|
|
|
}
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2009-10-11 20:05:18 +00:00
|
|
|
|
|
|
|
|
2010-07-23 14:32:07 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// Polyobject debug stuff
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
void AM_drawSeg(seg_t *seg, const AMColor &color)
|
|
|
|
{
|
|
|
|
mline_t l;
|
|
|
|
l.a.x = seg->v1->x >> FRACTOMAPBITS;
|
|
|
|
l.a.y = seg->v1->y >> FRACTOMAPBITS;
|
|
|
|
l.b.x = seg->v2->x >> FRACTOMAPBITS;
|
|
|
|
l.b.y = seg->v2->y >> FRACTOMAPBITS;
|
|
|
|
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&l.a.x, &l.a.y);
|
|
|
|
AM_rotatePoint (&l.b.x, &l.b.y);
|
|
|
|
}
|
|
|
|
AM_drawMline(&l, color);
|
|
|
|
}
|
|
|
|
|
2010-08-10 08:43:34 +00:00
|
|
|
void AM_drawPolySeg(FPolySeg *seg, const AMColor &color)
|
|
|
|
{
|
|
|
|
mline_t l;
|
|
|
|
l.a.x = seg->v1.x >> FRACTOMAPBITS;
|
|
|
|
l.a.y = seg->v1.y >> FRACTOMAPBITS;
|
|
|
|
l.b.x = seg->v2.x >> FRACTOMAPBITS;
|
|
|
|
l.b.y = seg->v2.y >> FRACTOMAPBITS;
|
|
|
|
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&l.a.x, &l.a.y);
|
|
|
|
AM_rotatePoint (&l.b.x, &l.b.y);
|
|
|
|
}
|
|
|
|
AM_drawMline(&l, color);
|
|
|
|
}
|
|
|
|
|
2010-07-23 14:32:07 +00:00
|
|
|
void AM_showSS()
|
|
|
|
{
|
|
|
|
if (am_showsubsector >= 0 && am_showsubsector < numsubsectors)
|
|
|
|
{
|
|
|
|
AMColor yellow;
|
|
|
|
yellow.FromRGB(255,255,0);
|
|
|
|
AMColor red;
|
|
|
|
red.FromRGB(255,0,0);
|
|
|
|
|
|
|
|
subsector_t *sub = &subsectors[am_showsubsector];
|
2010-08-10 08:43:34 +00:00
|
|
|
for (unsigned int i = 0; i < sub->numlines; i++)
|
2010-07-23 14:32:07 +00:00
|
|
|
{
|
2010-08-10 08:43:34 +00:00
|
|
|
AM_drawSeg(sub->firstline + i, yellow);
|
2010-07-23 14:32:07 +00:00
|
|
|
}
|
|
|
|
PO_LinkToSubsectors();
|
|
|
|
|
2010-08-10 08:43:34 +00:00
|
|
|
for (int i = 0; i <po_NumPolyobjs; i++)
|
2010-07-23 14:32:07 +00:00
|
|
|
{
|
|
|
|
FPolyObj *po = &polyobjs[i];
|
|
|
|
FPolyNode *pnode = po->subsectorlinks;
|
|
|
|
|
|
|
|
while (pnode != NULL)
|
|
|
|
{
|
|
|
|
if (pnode->subsector == sub)
|
|
|
|
{
|
2010-08-10 08:43:34 +00:00
|
|
|
for (unsigned j = 0; j < pnode->segs.Size(); j++)
|
2010-07-23 14:32:07 +00:00
|
|
|
{
|
2010-08-10 08:43:34 +00:00
|
|
|
AM_drawPolySeg(&pnode->segs[j], red);
|
2010-07-23 14:32:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
pnode = pnode->snext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-09 11:50:35 +00:00
|
|
|
#ifdef _3DFLOORS
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
// Determines if a 3D floor boundary should be drawn
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
bool AM_Check3DFloors(line_t *line)
|
|
|
|
{
|
|
|
|
TArray<F3DFloor*> &ff_front = line->frontsector->e->XFloor.ffloors;
|
|
|
|
TArray<F3DFloor*> &ff_back = line->backsector->e->XFloor.ffloors;
|
|
|
|
|
|
|
|
// No 3D floors so there's no boundary
|
|
|
|
if (ff_back.Size() == 0 && ff_front.Size() == 0) return false;
|
|
|
|
|
|
|
|
int realfrontcount = 0;
|
|
|
|
int realbackcount = 0;
|
|
|
|
|
|
|
|
for(unsigned i=0;i<ff_front.Size();i++)
|
|
|
|
{
|
|
|
|
F3DFloor *rover = ff_front[i];
|
|
|
|
if (!(rover->flags & FF_EXISTS)) continue;
|
|
|
|
if (rover->alpha == 0) continue;
|
|
|
|
realfrontcount++;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(unsigned i=0;i<ff_back.Size();i++)
|
|
|
|
{
|
|
|
|
F3DFloor *rover = ff_back[i];
|
|
|
|
if (!(rover->flags & FF_EXISTS)) continue;
|
|
|
|
if (rover->alpha == 0) continue;
|
|
|
|
realbackcount++;
|
|
|
|
}
|
|
|
|
// if the amount of 3D floors does not match there is a boundary
|
|
|
|
if (realfrontcount != realbackcount) return true;
|
|
|
|
|
|
|
|
for(unsigned i=0;i<ff_front.Size();i++)
|
|
|
|
{
|
|
|
|
F3DFloor *rover = ff_front[i];
|
|
|
|
if (!(rover->flags & FF_EXISTS)) continue;
|
|
|
|
if (rover->alpha == 0) continue;
|
|
|
|
|
|
|
|
bool found = false;
|
|
|
|
for(unsigned j=0;j<ff_back.Size();j++)
|
|
|
|
{
|
|
|
|
F3DFloor *rover2 = ff_back[j];
|
|
|
|
if (!(rover2->flags & FF_EXISTS)) continue;
|
|
|
|
if (rover2->alpha == 0) continue;
|
|
|
|
if (rover->model == rover2->model && rover->flags == rover2->flags)
|
|
|
|
{
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// At least one 3D floor in the front sector didn't have a match in the back sector so there is a boundary.
|
|
|
|
if (!found) return true;
|
|
|
|
}
|
|
|
|
// All 3D floors could be matched so let's not draw a boundary.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Determines visible lines, draws them.
|
|
|
|
// This is LineDef based, not LineSeg based.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawWalls (bool allmap)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
static mline_t l;
|
|
|
|
|
|
|
|
for (i = 0; i < numlines; i++)
|
|
|
|
{
|
|
|
|
l.a.x = lines[i].v1->x >> FRACTOMAPBITS;
|
|
|
|
l.a.y = lines[i].v1->y >> FRACTOMAPBITS;
|
|
|
|
l.b.x = lines[i].v2->x >> FRACTOMAPBITS;
|
|
|
|
l.b.y = lines[i].v2->y >> FRACTOMAPBITS;
|
|
|
|
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&l.a.x, &l.a.y);
|
|
|
|
AM_rotatePoint (&l.b.x, &l.b.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (am_cheat != 0 || (lines[i].flags & ML_MAPPED))
|
|
|
|
{
|
|
|
|
if ((lines[i].flags & ML_DONTDRAW) && am_cheat == 0)
|
2010-05-01 17:31:45 +00:00
|
|
|
{
|
|
|
|
if (!am_showallenabled || CheckCheatmode(false))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
if (AM_CheckSecret(&lines[i]))
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
- Fixed: The players were not added to FS's list of spawned things.
- Update to ZDoom r882
- Added the option to use $ as a prefix to a string table name everywhere in
MAPINFO where 'lookup' could be specified so that there is one consistent
way to do it.
- Externalized all default episode definitions. Added an 'optional' keyword
to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData function and replaced all calls to P_OpenMapData that
only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
but keeps all existing information in the default and just adds to it. This
is needed because Hexen and Strife set some information in their base
MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
* Finale texts loaded from a text lump
* Demos
* Local SNDINFOs
* Local SNDSEQs
* Image names in FONTDEFS
* intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in
the map and the actor type they spawned.
SBarInfo Update #16
- Added: fillzeros flag for drawnumber. When set the string will always have
a length of the specified size and zeros will fill in for the missing places.
If the number is negative the negative sign will take the place of the last
digit.
- Added: globalarray type to drawnumber which will display the value in a
global array with the index set to the player's number. Untested.
- Added: isselected command to SBarInfo.
- Fixed: Bi and Tri colored numbers didn't work.
- Fixed: Crash when using nullimage as the last image in drawswitchableimage.
- Applied Graf suggestion to include the y coord when calulating heights to fix
most of the gaps caused by round off errors. At least for now anyways and it
is only applied for drawimage.
- SBarInfo inventory bars have been converted to use screen->DrawTexture()
- Increased limit for demon/melee to 4.
- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
(MELEERANGE) and didn't set the puff to its melee state if the range
was different. Even worse, it checked a global variable for this so
the behavior was undefined when P_SpawnPuff was called from anywhere
else but P_LineAttack. To reduce the amount of parameters I combined
this information with the hitthing and temporary parameters into one
flags parameter. Also changed P_LineAttack so that it gets passed
an additional parameter that specifies whether the attack is a melee
attack or not and set this to true in all calls that are to be considered
melee attacks. I couldn't use the damage type because A_CustomPunch
and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET
and FX_GRENADE.
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.)
- Changed: Hexen set every cluster to be a hub if it hadn't been defined before
a level using this cluster. Now it will only do that if HexenHack is true,
i.e. when original Hexen format MAPINFOs are parsed. For ZDoom format
MAPINFOs it will now be the same as for the other games which means that
'hub' has to be declared explicitly.
- Added an Idle state that is entered in place of the spawn state if a monster
has to return to its inactive state if it can't find any more targets.
- Added MF5_NOINTERACTION flag which completely disables all physics related
code for any actor with this flag. Mostly useful for particle effects where
the actors just move a certain distance and then disappear.
- Removed the last remains of the antialias precalculation code from
am_map.cpp because it was no longer used.
- Fixed: Two-sided lines bordering a secret sector were not drawn in the
proper color
- Fixed: The automap didn't check ACS_LockedExecuteDoor for its lock color.
- Switched sounds local to the listener from head-relative 3D sounds to 2D
sounds so stereo sounds have full separation. I tried using set3DSpread,
but that still caused some blending of the channels.
- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have
the same lump name no longer involves any degree of guesswork in
determining exactly which file the error occurred in.
- Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final
sequences.
- Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL
pointer checks, in case an improper sequence was encountered during
parsing but not early enough to avoid creating a slot for it in the array.
- Added support for dumping from RAW/DRO/IMF files, so now anything that
can be played as OPL can also be dumped.
- Removed the opl_enable cvar, since OPL playback is now selectable as just
another MIDI device.
- Added support for DRO playback and dual-chip RAW playback.
- Removed MUS support from OPLMUSSong, since using the OPLMIDIDevice with
MUSSong2 works just as well. There are still lots of leftover bits in
the class that should probably be removed at some point, too.
- Added dual-chip dumping support for the RAW format.
- Added DosBox Raw OPL (.DRO) dumping support. For whatever reason,
in_adlib calculates the song length for this format wrong, even though
the exact length is stored right in the header. (But in_adlib seems buggy
in general; too bad it's the only Windows version of Adplug that seems to
exist.)
- Rewrote the OPL dumper to work with MIDI as well as MUS.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@86 b0f79afe-0144-0410-b225-9a4edf0717df
2008-04-05 13:28:48 +00:00
|
|
|
// map secret sectors like Boom
|
|
|
|
AM_drawMline(&l, SecretSectorColor);
|
|
|
|
}
|
2008-12-21 08:31:23 +00:00
|
|
|
else if (lines[i].flags & ML_SECRET)
|
|
|
|
{ // secret door
|
|
|
|
if (am_cheat != 0 && lines[i].backsector != NULL)
|
|
|
|
AM_drawMline(&l, SecretWallColor);
|
|
|
|
else
|
|
|
|
AM_drawMline(&l, WallColor);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
2008-12-21 08:31:23 +00:00
|
|
|
else if ((lines[i].special == Teleport ||
|
|
|
|
lines[i].special == Teleport_NoFog ||
|
|
|
|
lines[i].special == Teleport_ZombieChanger ||
|
|
|
|
lines[i].special == Teleport_Line) &&
|
|
|
|
(lines[i].activation & SPAC_PlayerActivate) &&
|
|
|
|
am_colorset == 0)
|
|
|
|
{ // intra-level teleporters
|
|
|
|
AM_drawMline(&l, IntraTeleportColor);
|
|
|
|
}
|
|
|
|
else if ((lines[i].special == Teleport_NewMap ||
|
|
|
|
lines[i].special == Teleport_EndGame ||
|
|
|
|
lines[i].special == Exit_Normal ||
|
|
|
|
lines[i].special == Exit_Secret) &&
|
2008-08-23 21:48:24 +00:00
|
|
|
am_colorset == 0)
|
2008-12-21 08:31:23 +00:00
|
|
|
{ // inter-level/game-ending teleporters
|
|
|
|
AM_drawMline(&l, InterTeleportColor);
|
|
|
|
}
|
|
|
|
else if (lines[i].special == Door_LockedRaise ||
|
|
|
|
lines[i].special == ACS_LockedExecute ||
|
|
|
|
lines[i].special == ACS_LockedExecuteDoor ||
|
2010-12-15 16:32:37 +00:00
|
|
|
(lines[i].special == Door_Animated && lines[i].args[3] != 0) ||
|
|
|
|
(lines[i].special == Generic_Door && lines[i].args[4] != 0))
|
2008-12-21 08:31:23 +00:00
|
|
|
{
|
2009-04-19 06:46:53 +00:00
|
|
|
if (am_colorset == 0 || am_colorset == 3) // Raven games show door colors
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-12-21 08:31:23 +00:00
|
|
|
int P_GetMapColorForLock(int lock);
|
|
|
|
int lock;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2010-12-15 16:32:37 +00:00
|
|
|
if (lines[i].special==Door_LockedRaise || lines[i].special==Door_Animated)
|
|
|
|
lock=lines[i].args[3];
|
2008-12-21 08:31:23 +00:00
|
|
|
else lock=lines[i].args[4];
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2008-12-21 08:31:23 +00:00
|
|
|
int color = P_GetMapColorForLock(lock);
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2008-12-21 08:31:23 +00:00
|
|
|
AMColor c;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2008-12-21 08:31:23 +00:00
|
|
|
if (color >= 0) c.FromRGB(RPART(color), GPART(color), BPART(color));
|
|
|
|
else c = LockedColor;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2008-12-21 08:31:23 +00:00
|
|
|
AM_drawMline (&l, c);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
2008-12-21 08:31:23 +00:00
|
|
|
else
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2008-12-21 08:31:23 +00:00
|
|
|
AM_drawMline (&l, LockedColor); // locked special
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
2010-12-15 16:32:37 +00:00
|
|
|
else if (am_showtriggerlines && am_colorset == 0 && lines[i].special != 0
|
|
|
|
&& lines[i].special != Door_Open
|
|
|
|
&& lines[i].special != Door_Close
|
|
|
|
&& lines[i].special != Door_CloseWaitOpen
|
|
|
|
&& lines[i].special != Door_Raise
|
|
|
|
&& lines[i].special != Door_Animated
|
|
|
|
&& lines[i].special != Generic_Door
|
|
|
|
&& (lines[i].activation & SPAC_PlayerActivate))
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, SpecialWallColor); // wall with special non-door action the player can do
|
|
|
|
}
|
2008-12-21 08:31:23 +00:00
|
|
|
else if (lines[i].backsector == NULL)
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, WallColor); // one-sided wall
|
|
|
|
}
|
|
|
|
else if (lines[i].backsector->floorplane
|
|
|
|
!= lines[i].frontsector->floorplane)
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, FDWallColor); // floor level change
|
|
|
|
}
|
|
|
|
else if (lines[i].backsector->ceilingplane
|
|
|
|
!= lines[i].frontsector->ceilingplane)
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, CDWallColor); // ceiling level change
|
|
|
|
}
|
2011-01-09 11:50:35 +00:00
|
|
|
#ifdef _3DFLOORS
|
|
|
|
else if (AM_Check3DFloors(&lines[i]))
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, EFWallColor); // Extra floor border
|
|
|
|
}
|
|
|
|
#endif
|
2008-12-21 08:31:23 +00:00
|
|
|
else if (am_cheat != 0)
|
|
|
|
{
|
|
|
|
AM_drawMline(&l, TSWallColor);
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
else if (allmap)
|
|
|
|
{
|
2010-05-01 17:31:45 +00:00
|
|
|
if ((lines[i].flags & ML_DONTDRAW) && am_cheat == 0)
|
|
|
|
{
|
|
|
|
if (!am_showallenabled || CheckCheatmode(false))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
AM_drawMline(&l, NotSeenColor);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
2008-01-27 11:25:03 +00:00
|
|
|
//
|
|
|
|
// Rotation in 2D.
|
|
|
|
// Used to rotate player arrow line character.
|
|
|
|
//
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
2010-09-08 08:45:15 +00:00
|
|
|
void AM_rotate(fixed_t *xp, fixed_t *yp, angle_t a)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-09-11 12:48:38 +00:00
|
|
|
static angle_t angle_saved = 0;
|
|
|
|
static double sinrot = 0;
|
|
|
|
static double cosrot = 1;
|
|
|
|
|
|
|
|
if (angle_saved != a)
|
|
|
|
{
|
|
|
|
angle_saved = a;
|
|
|
|
double rot = (double)a / (double)(1u << 31) * (double)M_PI;
|
|
|
|
sinrot = sin(rot);
|
|
|
|
cosrot = cos(rot);
|
|
|
|
}
|
|
|
|
|
2010-09-08 08:45:15 +00:00
|
|
|
double x = FIXED2FLOAT(*xp);
|
|
|
|
double y = FIXED2FLOAT(*yp);
|
|
|
|
double tmpx = (x * cosrot) - (y * sinrot);
|
|
|
|
y = (x * sinrot) + (y * cosrot);
|
|
|
|
x = tmpx;
|
|
|
|
*xp = FLOAT2FIXED(x);
|
|
|
|
*yp = FLOAT2FIXED(y);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_rotatePoint (fixed_t *x, fixed_t *y)
|
|
|
|
{
|
2008-02-14 13:07:19 +00:00
|
|
|
fixed_t pivotx = m_x + m_w/2;
|
|
|
|
fixed_t pivoty = m_y + m_h/2;
|
|
|
|
*x -= pivotx;
|
|
|
|
*y -= pivoty;
|
2008-01-27 11:25:03 +00:00
|
|
|
AM_rotate (x, y, ANG90 - players[consoleplayer].camera->angle);
|
2008-02-14 13:07:19 +00:00
|
|
|
*x += pivotx;
|
|
|
|
*y += pivoty;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void
|
|
|
|
AM_drawLineCharacter
|
|
|
|
( const mline_t *lineguy,
|
|
|
|
int lineguylines,
|
|
|
|
fixed_t scale,
|
|
|
|
angle_t angle,
|
|
|
|
const AMColor &color,
|
|
|
|
fixed_t x,
|
|
|
|
fixed_t y )
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
mline_t l;
|
|
|
|
|
|
|
|
for (i=0;i<lineguylines;i++) {
|
|
|
|
l.a.x = lineguy[i].a.x;
|
|
|
|
l.a.y = lineguy[i].a.y;
|
|
|
|
|
|
|
|
if (scale) {
|
|
|
|
l.a.x = MapMul(scale, l.a.x);
|
|
|
|
l.a.y = MapMul(scale, l.a.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (angle)
|
|
|
|
AM_rotate(&l.a.x, &l.a.y, angle);
|
|
|
|
|
|
|
|
l.a.x += x;
|
|
|
|
l.a.y += y;
|
|
|
|
|
|
|
|
l.b.x = lineguy[i].b.x;
|
|
|
|
l.b.y = lineguy[i].b.y;
|
|
|
|
|
|
|
|
if (scale) {
|
|
|
|
l.b.x = MapMul(scale, l.b.x);
|
|
|
|
l.b.y = MapMul(scale, l.b.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (angle)
|
|
|
|
AM_rotate(&l.b.x, &l.b.y, angle);
|
|
|
|
|
|
|
|
l.b.x += x;
|
|
|
|
l.b.y += y;
|
|
|
|
|
|
|
|
AM_drawMline(&l, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawPlayers ()
|
|
|
|
{
|
2008-02-14 13:07:19 +00:00
|
|
|
mpoint_t pt;
|
2008-01-27 11:25:03 +00:00
|
|
|
angle_t angle;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!multiplayer)
|
|
|
|
{
|
2008-02-14 13:07:19 +00:00
|
|
|
mline_t *arrow;
|
|
|
|
int numarrowlines;
|
|
|
|
|
|
|
|
pt.x = players[consoleplayer].camera->x >> FRACTOMAPBITS;
|
|
|
|
pt.y = players[consoleplayer].camera->y >> FRACTOMAPBITS;
|
2008-01-27 11:25:03 +00:00
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
2008-02-14 13:07:19 +00:00
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
angle = ANG90;
|
2008-02-14 13:07:19 +00:00
|
|
|
AM_rotatePoint (&pt.x, &pt.y);
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
else
|
2008-02-14 13:07:19 +00:00
|
|
|
{
|
2008-01-27 11:25:03 +00:00
|
|
|
angle = players[consoleplayer].camera->angle;
|
2008-02-14 13:07:19 +00:00
|
|
|
}
|
2009-06-14 18:05:00 +00:00
|
|
|
|
2010-10-16 22:47:18 +00:00
|
|
|
if (am_cheat != 0 && CheatMapArrow.Size() > 0)
|
2008-02-14 13:07:19 +00:00
|
|
|
{
|
2010-10-16 22:47:18 +00:00
|
|
|
arrow = &CheatMapArrow[0];
|
|
|
|
numarrowlines = CheatMapArrow.Size();
|
2008-02-14 13:07:19 +00:00
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
else
|
2008-02-14 13:07:19 +00:00
|
|
|
{
|
2010-10-16 22:47:18 +00:00
|
|
|
arrow = &MapArrow[0];
|
|
|
|
numarrowlines = MapArrow.Size();
|
2008-02-14 13:07:19 +00:00
|
|
|
}
|
|
|
|
AM_drawLineCharacter(arrow, numarrowlines, 0, angle, YourColor, pt.x, pt.y);
|
2008-01-27 11:25:03 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
|
|
|
{
|
|
|
|
player_t *p = &players[i];
|
|
|
|
AMColor color;
|
|
|
|
|
|
|
|
if (!playeringame[i] || p->mo == NULL)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2008-12-28 13:27:13 +00:00
|
|
|
|
|
|
|
// We don't always want to show allies on the automap.
|
|
|
|
if (dmflags2 & DF2_NO_AUTOMAP_ALLIES && i != consoleplayer)
|
|
|
|
continue;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
if (deathmatch && !demoplayback &&
|
|
|
|
!p->mo->IsTeammate (players[consoleplayer].mo) &&
|
|
|
|
p != players[consoleplayer].camera->player)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p->mo->alpha < OPAQUE)
|
|
|
|
{
|
|
|
|
color = AlmostBackground;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
float h, s, v, r, g, b;
|
|
|
|
|
2010-03-06 11:03:55 +00:00
|
|
|
D_GetPlayerColor (i, &h, &s, &v, NULL);
|
2008-01-27 11:25:03 +00:00
|
|
|
HSVtoRGB (&r, &g, &b, h, s, v);
|
|
|
|
|
|
|
|
color.FromRGB(clamp (int(r*255.f),0,255), clamp (int(g*255.f),0,255), clamp (int(b*255.f),0,255));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p->mo != NULL)
|
|
|
|
{
|
|
|
|
pt.x = p->mo->x >> FRACTOMAPBITS;
|
|
|
|
pt.y = p->mo->y >> FRACTOMAPBITS;
|
|
|
|
angle = p->mo->angle;
|
|
|
|
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&pt.x, &pt.y);
|
|
|
|
angle -= players[consoleplayer].camera->angle - ANG90;
|
|
|
|
}
|
|
|
|
|
2010-10-16 22:47:18 +00:00
|
|
|
AM_drawLineCharacter(&MapArrow[0], MapArrow.Size(), 0, angle, color, pt.x, pt.y);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawThings ()
|
|
|
|
{
|
|
|
|
AMColor color;
|
|
|
|
int i;
|
|
|
|
AActor* t;
|
|
|
|
mpoint_t p;
|
|
|
|
angle_t angle;
|
|
|
|
|
|
|
|
for (i=0;i<numsectors;i++)
|
|
|
|
{
|
|
|
|
t = sectors[i].thinglist;
|
|
|
|
while (t)
|
|
|
|
{
|
|
|
|
p.x = t->x >> FRACTOMAPBITS;
|
|
|
|
p.y = t->y >> FRACTOMAPBITS;
|
|
|
|
angle = t->angle;
|
|
|
|
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&p.x, &p.y);
|
|
|
|
angle += ANG90 - players[consoleplayer].camera->angle;
|
|
|
|
}
|
|
|
|
|
|
|
|
color = ThingColor;
|
|
|
|
|
|
|
|
// use separate colors for special thing types
|
|
|
|
if (t->flags3&MF3_ISMONSTER && !(t->flags&MF_CORPSE))
|
|
|
|
{
|
|
|
|
if (t->flags & MF_FRIENDLY || !(t->flags & MF_COUNTKILL)) color = ThingColor_Friend;
|
|
|
|
else color = ThingColor_Monster;
|
|
|
|
}
|
2010-07-25 22:56:01 +00:00
|
|
|
else if (t->flags&MF_SPECIAL)
|
|
|
|
{
|
|
|
|
// Find the key's own color.
|
|
|
|
// Only works correctly if single-key locks have lower numbers than any-key locks.
|
|
|
|
// That is the case for all default keys, however.
|
|
|
|
if (t->IsKindOf(RUNTIME_CLASS(AKey)))
|
|
|
|
{
|
|
|
|
if (am_showkeys)
|
|
|
|
{
|
|
|
|
int P_GetMapColorForKey (AInventory * key);
|
|
|
|
int c = P_GetMapColorForKey(static_cast<AKey *>(t));
|
2008-01-27 11:25:03 +00:00
|
|
|
|
2010-07-25 22:56:01 +00:00
|
|
|
if (c >= 0) color.FromRGB(RPART(c), GPART(c), BPART(c));
|
|
|
|
else color = ThingColor_CountItem;
|
2010-10-16 22:47:18 +00:00
|
|
|
AM_drawLineCharacter(&CheatKey[0], CheatKey.Size(), 0, 0, color, p.x, p.y);
|
2010-07-25 22:56:01 +00:00
|
|
|
color.Index = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
color = ThingColor_Item;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (t->flags&MF_COUNTITEM)
|
|
|
|
color = ThingColor_CountItem;
|
|
|
|
else
|
|
|
|
color = ThingColor_Item;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (color.Index != -1)
|
|
|
|
{
|
|
|
|
AM_drawLineCharacter
|
|
|
|
(thintriangle_guy, NUMTHINTRIANGLEGUYLINES,
|
|
|
|
16<<MAPBITS, angle, color, p.x, p.y);
|
|
|
|
}
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
if (am_cheat >= 3)
|
|
|
|
{
|
|
|
|
static const mline_t box[4] =
|
|
|
|
{
|
|
|
|
{ { -MAPUNIT, -MAPUNIT }, { MAPUNIT, -MAPUNIT } },
|
|
|
|
{ { MAPUNIT, -MAPUNIT }, { MAPUNIT, MAPUNIT } },
|
|
|
|
{ { MAPUNIT, MAPUNIT }, { -MAPUNIT, MAPUNIT } },
|
|
|
|
{ { -MAPUNIT, MAPUNIT }, { -MAPUNIT, -MAPUNIT } },
|
|
|
|
};
|
|
|
|
|
|
|
|
AM_drawLineCharacter (box, 4, t->radius >> FRACTOMAPBITS, angle - t->angle, color, p.x, p.y);
|
|
|
|
}
|
|
|
|
t = t->snext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
static void DrawMarker (FTexture *tex, fixed_t x, fixed_t y, int yadjust,
|
2008-01-27 15:34:47 +00:00
|
|
|
INTBOOL flip, fixed_t xscale, fixed_t yscale, int translation, fixed_t alpha, DWORD fillcolor, FRenderStyle renderstyle)
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
if (tex == NULL || tex->UseType == FTexture::TEX_Null)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
|
|
|
|
{
|
|
|
|
AM_rotatePoint (&x, &y);
|
|
|
|
}
|
|
|
|
screen->DrawTexture (tex, CXMTOF(x) + f_x, CYMTOF(y) + yadjust + f_y,
|
|
|
|
DTA_DestWidth, MulScale16 (tex->GetScaledWidth() * CleanXfac, xscale),
|
|
|
|
DTA_DestHeight, MulScale16 (tex->GetScaledHeight() * CleanYfac, yscale),
|
|
|
|
DTA_ClipTop, f_y,
|
|
|
|
DTA_ClipBottom, f_y + f_h,
|
|
|
|
DTA_ClipLeft, f_x,
|
|
|
|
DTA_ClipRight, f_x + f_w,
|
|
|
|
DTA_FlipX, flip,
|
|
|
|
DTA_Translation, TranslationToTable(translation),
|
|
|
|
DTA_Alpha, alpha,
|
2008-01-27 15:34:47 +00:00
|
|
|
DTA_FillColor, fillcolor,
|
|
|
|
DTA_RenderStyle, DWORD(renderstyle),
|
2008-01-27 11:25:03 +00:00
|
|
|
TAG_DONE);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawMarks ()
|
|
|
|
{
|
|
|
|
for (int i = 0; i < AM_NUMMARKPOINTS; i++)
|
|
|
|
{
|
|
|
|
if (markpoints[i].x != -1)
|
|
|
|
{
|
2008-01-27 15:34:47 +00:00
|
|
|
DrawMarker (TexMan(marknums[i]), markpoints[i].x, markpoints[i].y, -3, 0,
|
|
|
|
FRACUNIT, FRACUNIT, 0, FRACUNIT, 0, LegacyRenderStyles[STYLE_Normal]);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawAuthorMarkers ()
|
|
|
|
{
|
|
|
|
// [RH] Draw any actors derived from AMapMarker on the automap.
|
|
|
|
// If args[0] is 0, then the actor's sprite is drawn at its own location.
|
|
|
|
// Otherwise, its sprite is drawn at the location of any actors whose TIDs match args[0].
|
|
|
|
TThinkerIterator<AMapMarker> it (STAT_MAPMARKER);
|
|
|
|
AMapMarker *mark;
|
|
|
|
|
|
|
|
while ((mark = it.Next()) != NULL)
|
|
|
|
{
|
|
|
|
if (mark->flags2 & MF2_DORMANT)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2008-06-28 13:29:59 +00:00
|
|
|
FTextureID picnum;
|
2008-01-27 11:25:03 +00:00
|
|
|
FTexture *tex;
|
|
|
|
WORD flip = 0;
|
|
|
|
|
2008-06-28 13:29:59 +00:00
|
|
|
if (mark->picnum.isValid())
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
|
|
|
tex = TexMan(mark->picnum);
|
|
|
|
if (tex->Rotations != 0xFFFF)
|
|
|
|
{
|
|
|
|
spriteframe_t *sprframe = &SpriteFrames[tex->Rotations];
|
|
|
|
picnum = sprframe->Texture[0];
|
|
|
|
flip = sprframe->Flip & 1;
|
|
|
|
tex = TexMan[picnum];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
spritedef_t *sprdef = &sprites[mark->sprite];
|
|
|
|
if (mark->frame >= sprdef->numframes)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
spriteframe_t *sprframe = &SpriteFrames[sprdef->spriteframes + mark->frame];
|
|
|
|
picnum = sprframe->Texture[0];
|
|
|
|
flip = sprframe->Flip & 1;
|
|
|
|
tex = TexMan[picnum];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FActorIterator it (mark->args[0]);
|
|
|
|
AActor *marked = mark->args[0] == 0 ? mark : it.Next();
|
|
|
|
|
|
|
|
while (marked != NULL)
|
|
|
|
{
|
2010-08-29 09:51:24 +00:00
|
|
|
// Use more correct info if we have GL nodes available
|
|
|
|
if (mark->args[1] == 0 ||
|
|
|
|
(mark->args[1] == 1 && (hasglnodes ?
|
|
|
|
marked->subsector->flags & SSECF_DRAWN :
|
|
|
|
marked->Sector->MoreFlags & SECF_DRAWN)))
|
2008-01-27 11:25:03 +00:00
|
|
|
{
|
2010-08-29 09:51:24 +00:00
|
|
|
DrawMarker (tex, marked->x >> FRACTOMAPBITS, marked->y >> FRACTOMAPBITS, 0,
|
|
|
|
flip, mark->scaleX, mark->scaleY, mark->Translation,
|
|
|
|
mark->alpha, mark->fillcolor, mark->RenderStyle);
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
marked = mark->args[0] != 0 ? it.Next() : NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_drawCrosshair (const AMColor &color)
|
|
|
|
{
|
|
|
|
screen->DrawPixel(f_w/2, (f_h+1)/2, color.Index, color.RGB);
|
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_Drawer ()
|
|
|
|
{
|
|
|
|
if (!automapactive)
|
|
|
|
return;
|
|
|
|
|
2009-02-05 00:06:30 +00:00
|
|
|
bool allmap = (level.flags2 & LEVEL2_ALLMAP) != 0;
|
2010-06-13 13:33:27 +00:00
|
|
|
bool allthings = allmap && players[consoleplayer].mo->FindInventory(RUNTIME_CLASS(APowerScanner), true) != NULL;
|
2008-01-27 11:25:03 +00:00
|
|
|
|
|
|
|
AM_initColors (viewactive);
|
|
|
|
|
|
|
|
if (!viewactive)
|
|
|
|
{
|
|
|
|
// [RH] Set f_? here now to handle automap overlaying
|
|
|
|
// and view size adjustments.
|
|
|
|
f_x = f_y = 0;
|
|
|
|
f_w = screen->GetWidth ();
|
|
|
|
f_h = ST_Y;
|
|
|
|
f_p = screen->GetPitch ();
|
|
|
|
|
|
|
|
AM_clearFB(Background);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
f_x = viewwindowx;
|
|
|
|
f_y = viewwindowy;
|
Update to ZDoom r1146 (warning: massive changes ahead!)
- Removed DECORATE's ParseClass because it was only used to add data to fully
internal actor classes which no longer exist.
- Changed the state structure so that the Tics value doesn't need to be hacked
into misc1 with SF_BIGTIC anymore.
- Changed sprite processing so that sprite names are converted to indices
during parsing so that an additional postprocessing step is no longer needed.
- Fixed: Sprite names in DECORATE were case sensitive.
- Exported AActor's defaults to DECORATE and removed all code for the
internal property parser which is no longer needed.
- Converted the Heresiarch to DECORATE.
- Added an Active and Inactive state for monsters.
- Made the speed a parameter to A_RaiseMobj and A_SinkMobj and deleted
GetRaiseSpeed and GetSinkSpeed.
- Added some remaining DECORATE conversions for Hexen by Karate Chris.
- Changed Windows to use the performance counter instead of rdtsc.
- Changed Linux to use clock_gettime for profiling instead of rdtsc. This
avoids potential erroneous results on multicore and variable speed
processors.
- Converted the last of Hexen's inventory items to DECORATE so that I could
export AInventory.
- Removed AT_GAME_SET because it's no longer used anywhere.
- Converted the last remaining global classes to DECORATE.
- Fixed: Inventory.PickupFlash requires an class name as parameter not an
integer. Some Hexen definitions got it wrong.
- Converted Hexen's Pig to DECORATE.
- Replaced the ActorInfo definitions of all internal inventory classes with
DECORATE definitions.
- Added option to specify a powerup's duration in second by using a negative
number.
- Added Gez's Freedoom detection patch.
- SBARINFO update:
* Added: The ability to have drawkeybar auto detect spacing.
* Added: Offset parameter to drawkeybar to allow two key bars with
different keys.
* Added: Multi-row/column keybar parameters. Spacing can also be auto.
These defualt to left to right/top to bottom but can be switched.
* Added: Drawshadow flag to drawnumber. This will draw a solid color and
translucent number under the normal number.
* Added: hexenarmor to drawimage. This takes a parameter for a hexen
armor type and will fade the image like the hexen status bar.
* Added: centerbottom offset to draw(switchable)image.
* Added: translucent flag to drawinventorybar.
* Fixed: Accidentally removed flag from DrawTexture that allowed negative
coordinates to work with fullscreenoffsets. Hopefully this is the last
major bug in the fullscreenoffsets system.
- Ported vlinetallasm4 to AMD64 assembly. Even with the increased number of
registers AMD64 provides, this routine still needs to be written as self-
modifying code for maximum performance. The additional registers do allow
for further optimization over the x86 version by allowing all four pixels
to be in flight at the same time. The end result is that AMD64 ASM is about
2.18 times faster than AMD64 C and about 1.06 times faster than x86 ASM.
(For further comparison, AMD64 C and x86 C are practically the same for
this function.) Should I port any more assembly to AMD64, mvlineasm4 is the
most likely candidate, but it's not used enough at this point to bother.
Also, this may or may not work with Linux at the moment, since it doesn't
have the eh_handler metadata. Win64 is easier, since I just need to
structure the function prologue and epilogue properly and use some
assembler directives/macros to automatically generate the metadata. And
that brings up another point: You need YASM to assemble the AMD64 code,
because NASM doesn't support the Win64 metadata directives.
- Replaced the ActorInfo definitions of several internal classes with DECORATE definitions
- Converted teleport fog and destinations to DECORATE.
- AActor::PreExplode is gone now that the last item that was using it has been converted.
- Converted the Sigil and the remaining things in a_strifeitems.cpp to DECORATE.
- Exported Point pushers, CustomSprite and AmbientSound to DECORATE.
- Changed increased lightning damage for Centaurs into a damage factor.
- Changed PoisonCloud and Lightning special treatment in P_DamageMobj to use damage
types instead to keep dependencies on specific actor types out of the main engine code.
- Added Korax DECORATE conversion by Gez and a few others by Karate Chris.
- Removed FourthWeaponClass and based Hexen's fourth weapons on the generic weapon
pieces.
- Added DECORATE conversions for Hexen's Fighter weapons by Karate Chris.
- Added aWeaponGiver class to generalize the standing AssaultGun.
- converted a_Strifeweapons.cpp to DECORATE, except for the Sigil.
- Added an SSE version of DoBlending. This is strictly C intrinsics.
VC++ still throws around unneccessary register moves. GCC seems to be
pretty close to optimal, requiring only about 2 cycles/color. They're
both faster than my hand-written MMX routine, so I don't need to feel
bad about not hand-optimizing this for x64 builds.
- Removed an extra instruction from DoBlending_MMX, transposed two
instructions, and unrolled it once, shaving off about 80 cycles from the
time required to blend 256 palette entries. Why? Because I tried writing
a C version of the routine using compiler intrinsics and was appalled by
all the extra movq's VC++ added to the code. GCC was better, but still
generated extra instructions. I only wanted a C version because I can't
use inline assembly with VC++'s x64 compiler, and x64 assembly is a bit
of a pain. (It's a pain because Linux and Windows have different calling
conventions, and you need to maintain extra metadata for functions.) So,
the assembly version stays and the C version stays out.
- Converted the rest of a_strifestuff.cpp to DECORATE.
- Fixed: AStalker::CheckMeleeRange did not perform all checks of AActor::CheckMeleeRange.
I replaced this virtual override with a new flag MF5_NOVERTICALMELEERANGE so that
this feature can also be used by other actors.
- Converted Strife's Stalker to DECORATE.
- Converted ArtiTeleport to DECORATE.
- Removed the NoBlockingSet method from AActor because everything using it has been
converted to DECORATE using DropItem instead.
- Changed: Macil doesn't need the StrifeHumanoid's special death states so he might
as well inherit directly from AActor.
- Converted Strife's Coin, Oracle, Macil and StrifeHumanoid to DECORATE. Also moved
the burning hand states to StrifePlayer where they really belong.
- Added Gez's dropammofactor submission with some necessary changes. Also merged
redundant ammo multiplication code from P_DropItem and ADehackedPickup::TryPickup.
- Restricted native action function definitions to zdoom.pk3.
- Fixed. The Firedemon was missing a game filter.
- Added: disablegrin, disableouch, disablepain, and disablerampage flags to
drawmugshot.
- Fixed: LowerHealthCap did not work properly.
- Fixed: Various bugs I noticed in the fullscreenoffsets code.
- Removed all the pixel doubling r_detail modes, since the one platform they
were intended to assist (486) actually sees very little benefit from them.
- Rewrote CheckMMX in C and renamed it to CheckCPU.
- Fixed: CPUID function 0x80000005 is specified to return detailed L1 cache
only for AMD processors, so we must not use it on other architectures, or
we end up overwriting the L1 cache line size with 0 or some other number
we don't actually understand.
- The x87 precision control is now explicitly set for double precision, since
GCC defaults to extended precision instead, unlike Visual C++.
- Converted Strife's Programmer, Loremaster and Thingstoblowup to DECORATE.
- Fixed: Attacking a merchant in Strife didn't alert the enemies.
- Removed AT_GAME_SET(PowerInvulnerable) due to the problems it caused. The two
occurences in the code that depended on it were changed accordingly.
Invulnerability colormaps are now being set by the items exclusively.
- Changed many checks for the friendly Minotaur to a new flag MF5_SUMMONEDMONSTER
so that it can hopefully be generalized to be usable elsewhere later.
- Added Gez's submission for converting the Minotaur to DECORATE.
- Fixed a few minor DECORATE bugs.
- Changed coordinate storage for EntityBoss so that it works properly even
when the pod is not used to spawn it.
- Converted Strife's Spectres and Entity to DECORATE.
- Added: fullscreenoffsets flag for status bars. This changes the coordinate
system to be relative to the top left corner of the screen. This is useful
for full screen status bars.
- Changed: drawinventorybar will use the width of artibox or invcurs (strife)
to determine the spacing. Let me know if this breaks any released mods.
- Fixed: If a status bar height of 0 was specified in SBarInfo the wrong bar
would be shown.
- Fixed: If a static inventory bar was used the user still had to press invuse
in order to get rid of the "overlay".
- Fixed: forcescaled would not work if the height of the bar was 0.
- Added: keyslot to drawswitchableimage.
- Fixed: The transition effects for the log and keys popups were switched.
- Converted Strife's Crusader, Inquisitor and spectral missiles to
DECORATE.
- Converted Strife's Acolytes, Rebels, Sentinel, Reaver and Templar to
DECORATE.
- Added DECORATE conversions for Hexen's Cleric weapons by Karate Chris.
- Added a check to Zipdir that excludes files with a .orig extension. These
can be left behind by patch.exe and create problems.
- fixed: Unmorphing from chicken caused a crash when reading non-existent
meta-data strings.
- Converted the ScriptedMarines to DECORATE.
- Fixed: DLightTransfer and DWallLightTransfer were declared as actors.
- Converted the PhoenixRod and associated classes to DECORATE to make
the Heretic conversion complete.
- Converted the Minotaur's projectiles to DECORATE so that I can get
rid of the AT_SPEED_SET code.
- Converted Heretic's Blaster and SkullRod to DECORATE.
- Converted the mace and all related actors to DECORATE and generalized
the spawn function that only spawns one mace per level.
- Moved Mace respawning code into AInventory so that it works properly
for replacement actors.
- Added more DECORATE conversions by Karate Chris.
- Cleaned up the new bridge code and exported all related actors to
DECORATE so that the exported code pointers can be used.
- Separated Heretic's and Hexen's invulnerability items for stability
reasons.
- Fixed spurious warnings on 32-bit VC++ debug builds.
- Made the subsong (order) number a proper parameter to MusInfo::Play()
instead of requiring a separate SetPosition() call to do it.
- Added Gez's submission for custom bridge things.
- Fixed: ASpecialSpot must check the array's size before dividing by it.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@151 b0f79afe-0144-0410-b225-9a4edf0717df
2008-08-10 15:12:58 +00:00
|
|
|
f_w = viewwidth;
|
|
|
|
f_h = viewheight;
|
2008-01-27 11:25:03 +00:00
|
|
|
f_p = screen->GetPitch ();
|
|
|
|
}
|
|
|
|
AM_activateNewScale();
|
|
|
|
|
2010-08-27 17:50:18 +00:00
|
|
|
if (am_textured && hasglnodes && textured && !viewactive)
|
2010-08-27 17:42:01 +00:00
|
|
|
AM_drawSubsectors();
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
if (grid)
|
|
|
|
AM_drawGrid(GridColor);
|
|
|
|
|
|
|
|
AM_drawWalls(allmap);
|
|
|
|
AM_drawPlayers();
|
|
|
|
if (am_cheat >= 2 || allthings)
|
|
|
|
AM_drawThings();
|
|
|
|
|
|
|
|
AM_drawAuthorMarkers();
|
|
|
|
|
|
|
|
if (!viewactive)
|
|
|
|
AM_drawCrosshair(XHairColor);
|
|
|
|
|
|
|
|
AM_drawMarks();
|
2010-07-23 14:32:07 +00:00
|
|
|
|
|
|
|
AM_showSS();
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|
|
|
|
|
2009-10-11 20:05:18 +00:00
|
|
|
//=============================================================================
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//
|
|
|
|
//=============================================================================
|
|
|
|
|
2008-01-27 11:25:03 +00:00
|
|
|
void AM_SerializeMarkers(FArchive &arc)
|
|
|
|
{
|
|
|
|
arc << markpointnum;
|
|
|
|
for (int i=0; i<AM_NUMMARKPOINTS; i++)
|
|
|
|
{
|
|
|
|
arc << markpoints[i].x << markpoints[i].y;
|
|
|
|
}
|
2009-05-23 10:24:33 +00:00
|
|
|
arc << scale_mtof;
|
|
|
|
arc << scale_ftom;
|
2008-01-27 11:25:03 +00:00
|
|
|
}
|