- move vid_listadapters CCMD into common code.

SVN r2509 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-11 06:31:47 +00:00
parent ed5a8e597c
commit 096edb0817
5 changed files with 14 additions and 9 deletions

View file

@ -1556,7 +1556,7 @@ bool P_LookForPlayers (AActor *actor, INTBOOL allaround, FLookExParams *params)
if (actor->MissileState != NULL) if (actor->MissileState != NULL)
{ {
actor->SetStateNF(actor->SeeState); actor->SetState(actor->SeeState, true);
actor->flags &= ~MF_JUSTHIT; actor->flags &= ~MF_JUSTHIT;
} }

View file

@ -52,6 +52,7 @@ class IVideo
virtual bool SetResolution (int width, int height, int bits); virtual bool SetResolution (int width, int height, int bits);
virtual void DumpAdapters();
}; };
void I_InitGraphics (); void I_InitGraphics ();

View file

@ -1768,3 +1768,14 @@ const int BaseRatioSizes[5][4] =
{ 960, 600, 0, 48 }, { 960, 600, 0, 48 },
{ 960, 640, (int)(6.5*FRACUNIT), 48*15/16 } // 5:4 320, 213.3333, multiplied by three { 960, 640, (int)(6.5*FRACUNIT), 48*15/16 } // 5:4 320, 213.3333, multiplied by three
}; };
void IVideo::DumpAdapters ()
{
Printf("Multi-monitor support unavailable.\n");
}
CCMD(vid_listadapters)
{
if (Video != NULL)
Video->DumpAdapters();
}

View file

@ -52,6 +52,7 @@ class IVideo
virtual bool SetResolution (int width, int height, int bits); virtual bool SetResolution (int width, int height, int bits);
virtual void DumpAdapters();
}; };
void I_InitGraphics (); void I_InitGraphics ();

View file

@ -405,14 +405,6 @@ void Win32Video::DumpAdapters()
} }
} }
CCMD(vid_listadapters)
{
if (Video != NULL)
{
static_cast<Win32Video *>(Video)->DumpAdapters();
}
}
// Mode enumeration -------------------------------------------------------- // Mode enumeration --------------------------------------------------------
HRESULT WINAPI Win32Video::EnumDDModesCB (LPDDSURFACEDESC desc, void *data) HRESULT WINAPI Win32Video::EnumDDModesCB (LPDDSURFACEDESC desc, void *data)