zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- The GetBlend script call is needed in another place as well.

Browse source 
# Conflicts:
#	src/gl/scene/gl_scene.cpp
This commit is contained in:
drfrag666 2018-12-06 12:00:32 +01:00 committed by drfrag
parent e969e8a86b
commit ab5e5e0389
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gl/scene/gl_scene.cpp
View file

@ -69,6 +69,7 @@
#include "gl/textures/gl_material.h" #include "gl/textures/gl_material.h"
#include "gl/utility/gl_clock.h" #include "gl/utility/gl_clock.h"
#include "gl/utility/gl_templates.h" #include "gl/utility/gl_templates.h"
#include "vm.h"
//========================================================================== //==========================================================================
// //
@ -776,7 +777,14 @@ void GLSceneDrawer::SetFixedColormap (player_t *player)
auto litetype = PClass::FindActor(NAME_PowerLightAmp); auto litetype = PClass::FindActor(NAME_PowerLightAmp);
for(AInventory * in = cplayer->mo->Inventory; in; in = in->Inventory) for(AInventory * in = cplayer->mo->Inventory; in; in = in->Inventory)
{ {
PalEntry color = in->CallGetBlend (); PalEntry color = 0;
IFVIRTUALPTR(in, AInventory, GetBlend)
{
VMValue params[1] = { in };
VMReturn ret((int*)&color.d);
VMCall(func, params, 1, &ret, 1);
}
// Need special handling for light amplifiers // Need special handling for light amplifiers
if (in->IsKindOf(torchtype)) if (in->IsKindOf(torchtype))