zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- committed from the wrong subdirectory and missed all files that just changed the #include line.

This commit is contained in:
Christoph Oelckers 2016-10-15 10:43:02 +02:00
parent f86e64e712
commit 3b0d687b22
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripting/decorate/olddecorations.cpp
View File

@ -48,7 +48,7 @@
#include "decallib.h" #include "decallib.h"
#include "i_system.h" #include "i_system.h"
#include "thingdef.h" #include "thingdef.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "r_data/r_translate.h" #include "r_data/r_translate.h"
// TYPES ------------------------------------------------------------------- // TYPES -------------------------------------------------------------------

2
src/scripting/decorate/thingdef_exp.cpp
View File

@ -48,7 +48,7 @@
#include "thingdef.h" #include "thingdef.h"
#include "p_lnspec.h" #include "p_lnspec.h"
#include "doomstat.h" #include "doomstat.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
FRandom pr_exrandom ("EX_Random"); FRandom pr_exrandom ("EX_Random");

2
src/scripting/decorate/thingdef_parse.cpp
View File

@ -49,7 +49,7 @@
#include "v_palette.h" #include "v_palette.h"
#include "doomerrors.h" #include "doomerrors.h"
#include "i_system.h" #include "i_system.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "w_wad.h" #include "w_wad.h"
#include "v_video.h" #include "v_video.h"
#include "version.h" #include "version.h"

2
src/scripting/decorate/thingdef_states.cpp
View File

@ -54,7 +54,7 @@
#include "s_sound.h" #include "s_sound.h"
#include "i_system.h" #include "i_system.h"
#include "colormatcher.h" #include "colormatcher.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "version.h" #include "version.h"
#include "templates.h" #include "templates.h"
#include "vmbuilder.h" #include "vmbuilder.h"

2
src/scripting/thingdef.cpp
View File

@ -61,7 +61,7 @@
#include "p_conversation.h" #include "p_conversation.h"
#include "v_text.h" #include "v_text.h"
#include "thingdef.h" #include "thingdef.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "a_sharedglobal.h" #include "a_sharedglobal.h"
#include "vmbuilder.h" #include "vmbuilder.h"
#include "stats.h" #include "stats.h"

2
src/scripting/vm/vmbuilder.cpp
View File

@ -32,7 +32,7 @@
*/ */
#include "vmbuilder.h" #include "vmbuilder.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "info.h" #include "info.h"
#include "m_argv.h" #include "m_argv.h"
#include "thingdef.h" #include "thingdef.h"

3
src/scripting/zscript/zcc_compile.cpp
View File

@ -47,7 +47,7 @@
#include "p_lnspec.h" #include "p_lnspec.h"
#include "i_system.h" #include "i_system.h"
#include "gdtoa.h" #include "gdtoa.h"
#include "codegeneration/thingdef_exp.h" #include "codegeneration/codegen.h"
#include "vmbuilder.h" #include "vmbuilder.h"
#define DEFINING_CONST ((PSymbolConst *)(void *)1) #define DEFINING_CONST ((PSymbolConst *)(void *)1)
@ -2290,6 +2290,7 @@ FxExpression *ZCCCompiler::ConvertNode(ZCC_TreeNode *ast)
case AST_ExprFuncCall: case AST_ExprFuncCall:
{ {
auto fcall = static_cast<ZCC_ExprFuncCall *>(ast); auto fcall = static_cast<ZCC_ExprFuncCall *>(ast);
//return ConvertFunctionCall(fcall);
assert(fcall->Function->NodeType == AST_ExprID); // of course this cannot remain. Right now nothing more complex can come along but later this will have to be decomposed into 'self' and the actual function name. assert(fcall->Function->NodeType == AST_ExprID); // of course this cannot remain. Right now nothing more complex can come along but later this will have to be decomposed into 'self' and the actual function name.
auto fname = static_cast<ZCC_ExprID *>(fcall->Function)->Identifier; auto fname = static_cast<ZCC_ExprID *>(fcall->Function)->Identifier;
return new FxFunctionCall(nullptr, fname, ConvertNodeList(fcall->Parameters), *ast); return new FxFunctionCall(nullptr, fname, ConvertNodeList(fcall->Parameters), *ast);