zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the PSPTwoDSetter

Browse source 
This is no longer needed because all weapon drawing is using the proper interface now.
This commit is contained in:
Christoph Oelckers 2020-10-13 21:38:24 +02:00
parent 53481fb9a3
commit 99b4a64a67
7 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/build/include/build.h
View file

@ -994,25 +994,5 @@ extern int32_t(*changespritestat_replace)(int16_t spritenum, int16_t newstatnum)
extern void(*PolymostProcessVoxels_Callback)(void);
#endif
class F2DDrawer;
extern F2DDrawer twodpsp;
extern F2DDrawer* twod;
// This is for safely substituting the 2D drawer for a block of code. Won't be needed anymore after proper refactoring.
class PspTwoDSetter
{
F2DDrawer* old;
public:
PspTwoDSetter()
{
old = twod;
twod = &twodpsp;
}
~PspTwoDSetter()
{
twod = old;
}
};
#endif // build_h_

1
source/core/automap.cpp
View file

@ -43,6 +43,7 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
#include "quotemgr.h"
#include "v_video.h"
#include "gamestruct.h"
#include "v_draw.h"
CVAR(Bool, am_followplayer, true, CVAR_ARCHIVE)
CVAR(Bool, am_rotate, true, CVAR_ARCHIVE)

1
source/core/mainloop.cpp
View file

@ -87,6 +87,7 @@
#include "statusbar.h"
#include "gamestruct.h"
#include "savegamehelp.h"
#include "v_draw.h"
CVAR(Bool, vid_activeinbackground, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, r_ticstability, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)

1
source/core/palette.cpp
View file

@ -44,6 +44,7 @@
#include "v_colortables.h"
#include "v_font.h"
#include "printf.h"
#include "v_draw.h"
#include "../../glbackend/glbackend.h"
LookupTableInfo lookups;

1
source/exhumed/src/exhumed.cpp
View file

@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "d_protocol.h"
#include "texturemanager.h"
#include "razemenu.h"
#include "v_draw.h"
BEGIN_PS_NS

2
source/exhumed/src/gun.cpp
View file

@ -934,8 +934,6 @@ void DrawWeapons(double smooth)
if (nWeapon < -1) {
return;
}
PspTwoDSetter set; // this is the last one.
short var_34 = PlayerList[nLocalPlayer].field_3A;
short var_30 = SeqOffsets[WeaponInfo[nWeapon].nSeq];

1
source/exhumed/src/view.cpp
View file

@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "mapinfo.h"
#include "v_video.h"
#include "glbackend/glbackend.h"
#include "v_draw.h"
#include <string.h>
BEGIN_PS_NS