• R/O
  • SSH

zandronum-zdoom-sync: Commit


Commit MetaInfo

Revision034161116b91f75dde17d05aba634ebecf45f63b (tree)
Time2019-03-25 07:11:52
AuthorBenjamin Berkels <torr.samaho@quan...>
CommiterBenjamin Berkels

Log Message

fixed compile problems with NO_GL

Change Summary

Incremental Difference

diff -r 5888ff02905b -r 034161116b91 src/sdl/glstubs.cpp
--- a/src/sdl/glstubs.cpp Sun Mar 24 21:43:01 2019 +0100
+++ b/src/sdl/glstubs.cpp Sun Mar 24 23:11:52 2019 +0100
@@ -1,8 +1,10 @@
11 #include "r_defs.h"
22 #include "r_state.h"
33 #include "v_video.h"
4-
4+#include "thingdef.h"
5+#include "p_lnspec.h"
56 #include "gl/textures/gl_texture.h"
7+#include "gl/textures/gl_material.h"
68
79 #ifdef NO_GL
810 // [BB] Having to declare dummy versions of all the dynamic lights is pretty awful...
@@ -26,10 +28,10 @@
2628 DECLARE_CLASS (AVavoomLightColor, AVavoomLight)
2729 };
2830
29-IMPLEMENT_CLASS (ADynamicLight)
30-IMPLEMENT_CLASS (AVavoomLight)
31-IMPLEMENT_CLASS (AVavoomLightWhite)
32-IMPLEMENT_CLASS (AVavoomLightColor)
31+IMPLEMENT_CLASS (ADynamicLight, false, false)
32+IMPLEMENT_CLASS (AVavoomLight, false, false)
33+IMPLEMENT_CLASS (AVavoomLightWhite, false, false)
34+IMPLEMENT_CLASS (AVavoomLightColor, false, false)
3335
3436 DEFINE_CLASS_PROPERTY(type, S, DynamicLight)
3537 {
@@ -39,10 +41,6 @@
3941 CVAR (Float, vid_brightness, 0.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
4042 CVAR (Float, vid_contrast, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
4143
42-void FTexture::UncacheGL()
43-{
44-}
45-
4644 void gl_CleanLevelData()
4745 {
4846 }
@@ -63,7 +61,7 @@
6361 {
6462 }
6563
66-void FTexture::PrecacheGL()
64+void FGLTexture::Clean(bool)
6765 {
6866 }
6967
@@ -79,6 +77,10 @@
7977 {
8078 }
8179
80+void LS_SetGlobalFogParameter(line_t*, AActor*, bool, int, int, int, int, int)
81+{
82+}
83+
8284 size_t AActor::PropagateMark()
8385 {
8486 return Super::PropagateMark();
Show on old repository browser