zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: fix build and user_defs definition mismatch.

Browse source 
Left: projectile changes.

git-svn-id: https://svn.eduke32.com/eduke32@5186 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-05-14 12:18:42 +00:00
parent 178d9b1c58
commit 564e7d2332
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/lunatic/control.lua
View file

@ -1041,9 +1041,7 @@ function _showview(x, y, z, a, horiz, sect, x1, y1, x2, y2, unbiasedp)
error("invalid coordinates "..str, 2) error("invalid coordinates "..str, 2)
end end
local pos = vec3(x, y, z) CF.G_ShowViewXYZ(x, y, z, a, horiz, sect, x1, y1, x2, y2, unbiasedp);
CF.G_ShowView(pos, a, horiz, sect, x1, y1, x2, y2, unbiasedp);
end end

1
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -591,6 +591,7 @@ typedef struct {
char pwlockout[MAXPWLOCKOUT],rtsname[MAXRTSNAME]; char pwlockout[MAXPWLOCKOUT],rtsname[MAXRTSNAME];
char display_bonus_screen; char display_bonus_screen;
char show_level_text; char show_level_text;
char wchoice[MAX_WEAPONS];
} user_defs; } user_defs;
typedef struct { typedef struct {

13
polymer/eduke32/source/lunatic/lunatic_game.c
View file

@ -375,6 +375,13 @@ extern void G_GameExit(const char *msg);
} }
#endif #endif
static void G_ShowViewXYZ(int32_t x, int32_t y, int32_t z, int32_t a, int32_t horiz, int32_t sect,
int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t unbiasedp)
{
vec3_t vec = { x, y, z };
G_ShowView(vec, a, horiz, sect, x1, y1, x2, y2, unbiasedp);
}
#define LARG(index) lua_tointeger(L, index) #define LARG(index) lua_tointeger(L, index)
#define ONE_ARG LARG(1) #define ONE_ARG LARG(1)
@ -419,8 +426,8 @@ DEFINE_RET_CFUNC(A_InsertSprite, LARG(1), LARG(2), LARG(3), LARG(4), LARG(5), LA
DEFINE_VOID_CFUNC(A_AddToDeleteQueue, ONE_ARG) DEFINE_VOID_CFUNC(A_AddToDeleteQueue, ONE_ARG)
DEFINE_RET_CFUNC(A_PlaySound, TWO_ARGS) DEFINE_RET_CFUNC(A_PlaySound, TWO_ARGS)
DEFINE_VOID_CFUNC(A_DeleteSprite, ONE_ARG) DEFINE_VOID_CFUNC(A_DeleteSprite, ONE_ARG)
DEFINE_VOID_CFUNC(G_ShowView, LARG(1), LARG(2), LARG(3), LARG(4), LARG(5), LARG(6), DEFINE_VOID_CFUNC(G_ShowViewXYZ, LARG(1), LARG(2), LARG(3), LARG(4), LARG(5), LARG(6),
LARG(7), LARG(8), LARG(9)) LARG(7), LARG(8), LARG(9), LARG(10), LARG(11))
#define CFUNC_REG(Name) { #Name, Name##_CF } #define CFUNC_REG(Name) { #Name, Name##_CF }
@ -440,7 +447,7 @@ static struct { const char *name; lua_CFunction func; } cfuncs[] =
CFUNC_REG(A_AddToDeleteQueue), CFUNC_REG(A_AddToDeleteQueue),
CFUNC_REG(A_PlaySound), CFUNC_REG(A_PlaySound),
CFUNC_REG(A_DeleteSprite), CFUNC_REG(A_DeleteSprite),
CFUNC_REG(G_ShowView), CFUNC_REG(G_ShowViewXYZ),
}; };
// Creates a global table "CF" containing the functions from cfuncs[]. // Creates a global table "CF" containing the functions from cfuncs[].