fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Some misc fixes, mostly win32/msvc focused.

Browse source 
Rename sound flags to include their valid scope.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5322 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-10-17 00:43:04 +00:00
parent 487201eeec
commit 4ae635bc7b
24 changed files with 188 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engine/server/pr_lua.c
View file

@ -1410,7 +1410,7 @@ static int bi_lua_walkmove(lua_State *L)
// save program state, because World_movestep may call other progs
oldself = *world->g.self;
lua_pushboolean(L, World_movestep(world, ent, move, axis, true, false, NULL, NULL));
lua_pushboolean(L, World_movestep(world, ent, move, axis, true, false, NULL));
// restore program state
*world->g.self = oldself;
@ -2367,6 +2367,7 @@ static void my_lua_registerbuiltins(lua_State *L)
registerfuncd(loadlua); //should probably use 'require' instead.
registerfuncn(vec3);
registerfuncn(field);
#undef qtrue
registerfuncn(qtrue); //for auto-converted code that tests for truth amongst a myriad of different custom types...
registerfunc(setmodel);
@ -2898,7 +2899,7 @@ static int QDECL Lua_LoadEnts(pubprogfuncs_t *pf, const char *mapstring, void *c
return sv.world.edict_size;
}
static eval_t *QDECL Lua_GetEdictFieldValue(pubprogfuncs_t *pf, edict_t *e, char *fieldname, etype_t type, evalc_t *cache)
static eval_t *QDECL Lua_GetEdictFieldValue(pubprogfuncs_t *pf, edict_t *e, const char *fieldname, etype_t type, evalc_t *cache)
{
eval_t *val;
luafld_t *fld;
@ -3027,7 +3028,7 @@ static const char *ASMCALL QDECL Lua_StringToNative(pubprogfuncs_t *prinst, stri
return ret;
}
static void Lua_Event_Touch(world_t *w, wedict_t *s, wedict_t *o)
static void Lua_Event_Touch(world_t *w, wedict_t *s, wedict_t *o, trace_t *trace)
{
int oself = pr_global_struct->self;
int oother = pr_global_struct->other;