- made video base code game independent

This commit is contained in:
Christoph Oelckers 2020-04-28 17:22:17 +02:00
commit ddef3f7b98
56 changed files with 251 additions and 241 deletions

View file

@ -53,6 +53,7 @@
#include "templates.h"
#include "s_music.h"
#include "texturemanager.h"
#include "v_draw.h"
FIntermissionDescriptorList IntermissionDescriptors;
@ -941,7 +942,7 @@ void DIntermissionController::OnDestroy ()
void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, uint8_t state)
{
ScaleOverrider s(&screen->m2DDrawer);
ScaleOverrider s(twod);
if (DIntermissionController::CurrentIntermission != NULL)
{
DIntermissionController::CurrentIntermission->Destroy();
@ -987,7 +988,7 @@ void F_StartIntermission(FName seq, uint8_t state)
bool F_Responder (event_t* ev)
{
ScaleOverrider s(&screen->m2DDrawer);
ScaleOverrider s(twod);
if (DIntermissionController::CurrentIntermission != NULL)
{
return DIntermissionController::CurrentIntermission->Responder(ev);
@ -1003,7 +1004,7 @@ bool F_Responder (event_t* ev)
void F_Ticker ()
{
ScaleOverrider s(&screen->m2DDrawer);
ScaleOverrider s(twod);
if (DIntermissionController::CurrentIntermission != NULL)
{
DIntermissionController::CurrentIntermission->Ticker();
@ -1018,7 +1019,7 @@ void F_Ticker ()
void F_Drawer ()
{
ScaleOverrider s(&screen->m2DDrawer);
ScaleOverrider s(twod);
if (DIntermissionController::CurrentIntermission != NULL)
{
DIntermissionController::CurrentIntermission->Drawer();
@ -1034,7 +1035,6 @@ void F_Drawer ()
void F_EndFinale ()
{
ScaleOverrider s(&screen->m2DDrawer);
if (DIntermissionController::CurrentIntermission != NULL)
{
DIntermissionController::CurrentIntermission->Destroy();
@ -1050,7 +1050,7 @@ void F_EndFinale ()
void F_AdvanceIntermission()
{
ScaleOverrider s(&screen->m2DDrawer);
ScaleOverrider s(twod);
if (DIntermissionController::CurrentIntermission != NULL)
{
DIntermissionController::CurrentIntermission->mAdvance = true;