| Revision | 034161116b91f75dde17d05aba634ebecf45f63b (tree) |
|---|---|
| Time | 2019-03-25 07:11:52 |
| Author | Benjamin Berkels <torr.samaho@quan...> |
| Commiter | Benjamin Berkels |
fixed compile problems with NO_GL
src/sdl/glstubs.cpp (diff)| @@ -1,8 +1,10 @@ | ||
| 1 | 1 | #include "r_defs.h" |
| 2 | 2 | #include "r_state.h" |
| 3 | 3 | #include "v_video.h" |
| 4 | - | |
| 4 | +#include "thingdef.h" | |
| 5 | +#include "p_lnspec.h" | |
| 5 | 6 | #include "gl/textures/gl_texture.h" |
| 7 | +#include "gl/textures/gl_material.h" | |
| 6 | 8 | |
| 7 | 9 | #ifdef NO_GL |
| 8 | 10 | // [BB] Having to declare dummy versions of all the dynamic lights is pretty awful... |
| @@ -26,10 +28,10 @@ | ||
| 26 | 28 | DECLARE_CLASS (AVavoomLightColor, AVavoomLight) |
| 27 | 29 | }; |
| 28 | 30 | |
| 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) | |
| 33 | 35 | |
| 34 | 36 | DEFINE_CLASS_PROPERTY(type, S, DynamicLight) |
| 35 | 37 | { |
| @@ -39,10 +41,6 @@ | ||
| 39 | 41 | CVAR (Float, vid_brightness, 0.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) |
| 40 | 42 | CVAR (Float, vid_contrast, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) |
| 41 | 43 | |
| 42 | -void FTexture::UncacheGL() | |
| 43 | -{ | |
| 44 | -} | |
| 45 | - | |
| 46 | 44 | void gl_CleanLevelData() |
| 47 | 45 | { |
| 48 | 46 | } |
| @@ -63,7 +61,7 @@ | ||
| 63 | 61 | { |
| 64 | 62 | } |
| 65 | 63 | |
| 66 | -void FTexture::PrecacheGL() | |
| 64 | +void FGLTexture::Clean(bool) | |
| 67 | 65 | { |
| 68 | 66 | } |
| 69 | 67 |
| @@ -79,6 +77,10 @@ | ||
| 79 | 77 | { |
| 80 | 78 | } |
| 81 | 79 | |
| 80 | +void LS_SetGlobalFogParameter(line_t*, AActor*, bool, int, int, int, int, int) | |
| 81 | +{ | |
| 82 | +} | |
| 83 | + | |
| 82 | 84 | size_t AActor::PropagateMark() |
| 83 | 85 | { |
| 84 | 86 | return Super::PropagateMark(); |
Fork