diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index cbbd8797f..53d87e3dc 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -1556,7 +1556,7 @@ bool P_LookForPlayers (AActor *actor, INTBOOL allaround, FLookExParams *params) if (actor->MissileState != NULL) { - actor->SetStateNF(actor->SeeState); + actor->SetState(actor->SeeState, true); actor->flags &= ~MF_JUSTHIT; } diff --git a/src/sdl/hardware.h b/src/sdl/hardware.h index 073a555b1..5b14b7cbb 100644 --- a/src/sdl/hardware.h +++ b/src/sdl/hardware.h @@ -52,6 +52,7 @@ class IVideo virtual bool SetResolution (int width, int height, int bits); + virtual void DumpAdapters(); }; void I_InitGraphics (); diff --git a/src/v_video.cpp b/src/v_video.cpp index 2327529be..1e8993e74 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -1768,3 +1768,14 @@ const int BaseRatioSizes[5][4] = { 960, 600, 0, 48 }, { 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(); +} diff --git a/src/win32/hardware.h b/src/win32/hardware.h index bdff41cf8..223ba621c 100644 --- a/src/win32/hardware.h +++ b/src/win32/hardware.h @@ -52,6 +52,7 @@ class IVideo virtual bool SetResolution (int width, int height, int bits); + virtual void DumpAdapters(); }; void I_InitGraphics (); diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp index 672e81df3..e9df043d0 100644 --- a/src/win32/win32video.cpp +++ b/src/win32/win32video.cpp @@ -405,14 +405,6 @@ void Win32Video::DumpAdapters() } } -CCMD(vid_listadapters) -{ - if (Video != NULL) - { - static_cast(Video)->DumpAdapters(); - } -} - // Mode enumeration -------------------------------------------------------- HRESULT WINAPI Win32Video::EnumDDModesCB (LPDDSURFACEDESC desc, void *data)