From e8c2444dddf4fce546d73c746173fad1e6034f79 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 4 Feb 2017 18:10:30 +0200 Subject: [PATCH] Fixed compilation with GCC/Clang error: use of undeclared identifier 'op' error: no matching function for call to 'ListEnd' error: no matching function for call to 'ListGetInt' error: no matching function for call to 'ListGetDouble' ... --- src/scripting/vm/vmexec.h | 2 +- src/v_draw.cpp | 2 +- src/v_video.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripting/vm/vmexec.h b/src/scripting/vm/vmexec.h index 0e34aa0315..38dbbc411c 100644 --- a/src/scripting/vm/vmexec.h +++ b/src/scripting/vm/vmexec.h @@ -774,7 +774,7 @@ begin: OP(NEW_K): OP(NEW): { - PClass *cls = (PClass*)(op == OP_NEW ? reg.a[C] : konsta[C].v); + PClass *cls = (PClass*)(pc->op == OP_NEW ? reg.a[C] : konsta[C].v); reg.a[B] = cls->CreateNew(); NEXTOP; } diff --git a/src/v_draw.cpp b/src/v_draw.cpp index e5896958a8..8c66c3d382 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -462,7 +462,7 @@ static inline FColormapStyle * ListGetColormapStyle(va_list &tags) return va_arg(tags, FColormapStyle *); } -bool DCanvas::ParseDrawTextureTags (FTexture *img, double x, double y, DWORD tag, va_list tags, DrawParms *parms, bool fortext) const +bool DCanvas::ParseDrawTextureTags (FTexture *img, double x, double y, DWORD tag, va_list& tags, DrawParms *parms, bool fortext) const { INTBOOL boolval; int intval; diff --git a/src/v_video.h b/src/v_video.h index a33ea22f28..968408b627 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -275,7 +275,7 @@ protected: bool ClipBox (int &left, int &top, int &width, int &height, const BYTE *&src, const int srcpitch) const; void DrawTextureV(FTexture *img, double x, double y, uint32 tag, va_list tags) = delete; virtual void DrawTextureParms(FTexture *img, DrawParms &parms); - bool ParseDrawTextureTags (FTexture *img, double x, double y, uint32 tag, va_list tags, DrawParms *parms, bool fortext) const; + bool ParseDrawTextureTags (FTexture *img, double x, double y, uint32 tag, va_list& tags, DrawParms *parms, bool fortext) const; DCanvas() {}