From 25f31e0255da742317da01d1b91833b5468b0527 Mon Sep 17 00:00:00 2001 From: Walter Julius Hennecke Date: Mon, 5 Dec 2011 19:19:16 +0100 Subject: [PATCH] started adding cgame lua support --- cgame/Makefile | 2 ++ cgame/cg_local.h | 6 ++++++ cgame/cg_main.c | 15 ++++++++++++++- stefgame.suo | Bin 204800 -> 204800 bytes 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cgame/Makefile b/cgame/Makefile index 30281b9..bc8a7e8 100644 --- a/cgame/Makefile +++ b/cgame/Makefile @@ -56,6 +56,7 @@ OBJ = \ cg_drawtools.o \ cg_draw.o \ cg_consolecmds.o \ + cg_lua.o \ lua_vector.o \ lua_qmath.o \ @@ -136,6 +137,7 @@ cg_servercmds.o : cg_servercmds.c; $(DO_CC) cg_snapshot.o : cg_snapshot.c; $(DO_CC) cg_view.o : cg_view.c; $(DO_CC) cg_weapons.o : cg_weapons.c; $(DO_CC) +cg_lua.o : cg_lua.c; $(DO_CC) fx_compression.o : fx_compression.c; $(DO_CC) fx_grenade.o : fx_grenade.c; $(DO_CC) fx_item.o : fx_item.c; $(DO_CC) diff --git a/cgame/cg_local.h b/cgame/cg_local.h index 01114ec..d2d0a52 100644 --- a/cgame/cg_local.h +++ b/cgame/cg_local.h @@ -1821,6 +1821,12 @@ extern vmCvar_t rpg_forceFieldSet; // grp cvars extern vmCvar_t grp_berp; +// lua +#ifdef CG_LUA +extern vmCvar_t cg_debugLua; +extern vmCvar_t cg_logLua; +#endif + diff --git a/cgame/cg_main.c b/cgame/cg_main.c index 75d0278..0771a27 100644 --- a/cgame/cg_main.c +++ b/cgame/cg_main.c @@ -195,6 +195,12 @@ vmCvar_t rpg_forceFieldSet; // grp cvars vmCvar_t grp_berp; +// lua +#ifdef CG_LUA +vmCvar_t cg_debugLua; +vmCvar_t cg_logLua; +#endif + //RPG-X | Phenix | 05/02/2006 //Ban System (and it's backup cvars) @@ -342,7 +348,14 @@ static cvarTable_t cvarTable[] = { //{ &cg_playerID, "cg_playerID", "0", CVAR_ARCHIVE | CVAR_ROM | CVAR_NORESTART } // grp cvars - { &grp_berp, "grp_berp", "0", CVAR_ARCHIVE | CVAR_LATCH } + { &grp_berp, "grp_berp", "0", CVAR_ARCHIVE | CVAR_LATCH }, + + // lua +#ifdef CG_LUA + { &cg_debugLua, "cg_debuglua", "0", CVAR_ARCHIVE | CVAR_LATCH }, + { &cg_logLua, "cg_loglua", "0", CVAR_ARCHIVE } +#endif + }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); diff --git a/stefgame.suo b/stefgame.suo index 44712818a398dd3c17ca0772649e6bd6b42cdb41..a4faa45633a41607e20d861074b38aab9c63b40d 100644 GIT binary patch delta 228 zcmZoTz|(MmXG0DPtApdNpz`KImhFWsjP~7vxvUHf|Nj5~pAV%Arysn{Xg{%F!}bjm z7<0T>fl~kfZ&$p{cwd^)V!Go|Mgz%GhC~KEhGYhhgBnh+c&*PaoY81(IOpa!`RNzl zGfGWQ`OY|p(P6ryHw$M$(Y7_YrzEZAQ9 znCYC%WMpQS0{|*|SFQj6 delta 168 zcmZoTz|(MmXG0DPE5o+k-RaGREZYlN811_`|3g9k^n?A3?;Y~L_}F~^Jb1S zzwL^*8ShI^JI~lKz2Q5MSj5h3G5vu9lg#!j=NZ>9Z~Mbo@|^WJP-W`$%KJ>(+m}3M znlCfincHw`39~;NV*w)rL(z1`DNNc^zcBlQ#96a|isPp%mNI#Bz-*qb(8r`SIe}Mb I856S{0DZ4T