ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring of some function names

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-10-13 22:06:17 +02:00
parent 67306ef4bf
commit c62b0bcefa
16 changed files with 115 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/game/ai_team.h
View file

@ -21,5 +21,5 @@ void BotTeamAI(bot_state_t *bs);
int BotGetTeamMateCTFPreference(bot_state_t *bs, int teammate);
void BotSetTeamMateCTFPreference(bot_state_t *bs, int teammate, int preference);
#endif AI_TEAM_H_
#endif /* AI_TEAM_H_ */

2
code/game/g_cmds.c
View file

@ -7633,7 +7633,7 @@ void G_Client_Command( int clientNum )
#ifdef G_LUA
if(Q_stricmp(cmd, "lua_status") == 0)
{
G_LuaStatus(ent);
G_Lua_Status(ent);
return;
}
#endif

138
code/game/g_lua.c
View file

@ -86,9 +86,9 @@ qboolean LoadLuaFile(char *path, int num_vm)
vm->code_size = flen;
vm->error = 0;
if(G_LuaStartVM(vm) == qfalse)
if(G_Lua_StartVM(vm) == qfalse)
{
G_LuaStopVM(vm);
G_Lua_StopVM(vm);
vm = NULL;
return qfalse;
}
@ -101,7 +101,7 @@ qboolean LoadLuaFile(char *path, int num_vm)
}
}
qboolean G_LuaInit()
qboolean G_Lua_Init()
{
int i, num_vm = 0;
char buff[128];
@ -113,7 +113,7 @@ qboolean G_LuaInit()
char *dirptr;
int dirlen;
G_Printf("------- G_LuaInit -------\n");
G_Printf("------- G_Lua_Init -------\n");
numFiles = 0;
trap_Cvar_VariableStringBuffer("mapname", buff, sizeof(buff));
@ -149,12 +149,12 @@ qboolean G_LuaInit()
Com_Printf("%i map files parsed\n", numFiles);
G_Printf("------- G_LuaInit Finish -------\n");
G_Printf("------- G_Lua_Init Finish -------\n");
return qtrue;
}
qboolean G_LuaResume(lvm_t *vm, lua_State *T, char *func, int nargs) {
qboolean G_Lua_Resume(lvm_t *vm, lua_State *T, char *func, int nargs) {
int res = lua_resume(T, NULL, nargs);
if(res == LUA_ERRRUN) {
@ -185,7 +185,7 @@ qboolean G_LuaResume(lvm_t *vm, lua_State *T, char *func, int nargs) {
if(p == T) {
lua_remove(vm->L, i);
G_LuaCollectGarbage();
G_Lua_CollectGarbage();
}
}
}
@ -193,7 +193,7 @@ qboolean G_LuaResume(lvm_t *vm, lua_State *T, char *func, int nargs) {
return qtrue;
}
qboolean G_LuaCall(lvm_t * vm, char *func, int nargs, int nresults)
qboolean G_Lua_Call(lvm_t * vm, char *func, int nargs, int nresults)
{
int res = lua_pcall(vm->L, nargs, nresults, 0);
@ -224,7 +224,7 @@ qboolean G_LuaCall(lvm_t * vm, char *func, int nargs, int nresults)
#define SAY_ALL 0
#define SAY_TEAM 1
qboolean G_LuaGetFunctionT(lua_State *T, char *name)
qboolean G_Lua_GetFunctionT(lua_State *T, char *name)
{
if(T)
{
@ -242,7 +242,7 @@ qboolean G_LuaGetFunctionT(lua_State *T, char *name)
return qfalse;
}
qboolean G_LuaGetFunction(lvm_t * vm, char *name)
qboolean G_Lua_GetFunction(lvm_t * vm, char *name)
{
if(vm->L)
{
@ -260,7 +260,7 @@ qboolean G_LuaGetFunction(lvm_t * vm, char *name)
return qfalse;
}
qboolean G_LuaStartVM(lvm_t * vm)
qboolean G_Lua_StartVM(lvm_t * vm)
{
int res = 0;
char homepath[MAX_QPATH], gamepath[MAX_QPATH];
@ -340,14 +340,14 @@ qboolean G_LuaStartVM(lvm_t * vm)
return qfalse;
}
if(!G_LuaCall(vm, "G_LuaStartVM", 0, 0))
if(!G_Lua_Call(vm, "G_Lua_StartVM", 0, 0))
return qfalse;
LUA_LOG("Lua: Loading %s\n", vm->filename);
return qtrue;
}
void G_LuaStopVM(lvm_t * vm)
void G_Lua_StopVM(lvm_t * vm)
{
if(vm == NULL)
return;
@ -368,7 +368,7 @@ void G_LuaStopVM(lvm_t * vm)
free(vm);
}
void G_LuaShutdown()
void G_Lua_Shutdown()
{
int i;
lvm_t *vm;
@ -378,12 +378,12 @@ void G_LuaShutdown()
vm = lVM[i];
if(vm)
{
G_LuaStopVM(vm);
G_Lua_StopVM(vm);
}
}
}
void G_LuaStatus(gentity_t * ent)
void G_Lua_Status(gentity_t * ent)
{
int i, cnt = 0;
@ -446,7 +446,7 @@ void G_LuaStatus(gentity_t * ent)
}
lvm_t *G_LuaGetVM(lua_State * L)
lvm_t *G_Lua_GetVM(lua_State * L)
{
int i;
@ -468,12 +468,12 @@ void LuaHook_G_InitGame(int levelTime, unsigned int randomSeed, int restart)
{
if(vm->id < 0 )
continue;
if(!G_LuaGetFunction(vm, "InitGame"))
if(!G_Lua_GetFunction(vm, "InitGame"))
continue;
lua_pushinteger(vm->L, levelTime);
lua_pushinteger(vm->L, randomSeed);
lua_pushinteger(vm->L, restart);
if(!G_LuaCall(vm, "InitGame", 3, 0))
if(!G_Lua_Call(vm, "InitGame", 3, 0))
{
continue;
}
@ -493,10 +493,10 @@ void LuaHook_G_Shutdown(int restart)
{
if(vm->id < 0 )
continue;
if(!G_LuaGetFunction(vm, "ShutdownGame"))
if(!G_Lua_GetFunction(vm, "ShutdownGame"))
continue;
lua_pushinteger(vm->L, restart);
if(!G_LuaCall(vm, "ShutdownGame", 1, 0))
if(!G_Lua_Call(vm, "ShutdownGame", 1, 0))
{
continue;
}
@ -516,10 +516,10 @@ void LuaHook_G_RunFrame(int levelTime)
{
if(vm->id < 0 )
continue;
if(!G_LuaGetFunction(vm, "RunFrame"))
if(!G_Lua_GetFunction(vm, "RunFrame"))
continue;
lua_pushinteger(vm->L, levelTime);
if(!G_LuaCall(vm, "RunFrame", 1, 0))
if(!G_Lua_Call(vm, "RunFrame", 1, 0))
{
continue;
}
@ -539,7 +539,7 @@ void LuaHook_G_ClientPrint(char *text, int entnum) {
if(vm) {
if(vm->id < 0)
continue;
if(!G_LuaGetFunction(vm, "GClientPrint"))
if(!G_Lua_GetFunction(vm, "GClientPrint"))
continue;
lua_pushstring(vm->L, text);
ent = &g_entities[entnum];
@ -548,7 +548,7 @@ void LuaHook_G_ClientPrint(char *text, int entnum) {
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, "GClientPrint", 2, 0))
if(!G_Lua_Call(vm, "GClientPrint", 2, 0))
continue;
}
}
@ -566,10 +566,10 @@ void LuaHook_G_Print(char *text)
{
if(vm->id < 0 )
continue;
if(!G_LuaGetFunction(vm, "GPrint"))
if(!G_Lua_GetFunction(vm, "GPrint"))
continue;
lua_pushstring(vm->L, text);
if(!G_LuaCall(vm, "GPrint", 1, 0))
if(!G_Lua_Call(vm, "GPrint", 1, 0))
{
continue;
}
@ -593,27 +593,27 @@ void LuaHook_G_EntityThink(char *function, int entnum)
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, function, 1, 0))
if(!G_Lua_Call(vm, function, 1, 0))
{
continue;
}
} else {
t = vm->L;
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(t);
else
Lua_PushEntity(t, ent);
if(!G_LuaResume(vm, t, function, 1))
if(!G_Lua_Resume(vm, t, function, 1))
continue;
}
}
@ -637,7 +637,7 @@ void LuaHook_G_EntityTouch(char *function, int entnum, int othernum)
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -649,12 +649,12 @@ void LuaHook_G_EntityTouch(char *function, int entnum, int othernum)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, other);
if(!G_LuaCall(vm, function, 2, 0))
if(!G_Lua_Call(vm, function, 2, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -666,7 +666,7 @@ void LuaHook_G_EntityTouch(char *function, int entnum, int othernum)
lua_pushnil(t);
else
Lua_PushEntity(t, other);
if(!G_LuaResume(vm, t, function, 2))
if(!G_Lua_Resume(vm, t, function, 2))
continue;
}
}
@ -691,7 +691,7 @@ void LuaHook_G_EntityUse(char *function, int entnum, int othernum, int activator
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -708,12 +708,12 @@ void LuaHook_G_EntityUse(char *function, int entnum, int othernum, int activator
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, activator);
if(!G_LuaCall(vm, function, 3, 0))
if(!G_Lua_Call(vm, function, 3, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -730,7 +730,7 @@ void LuaHook_G_EntityUse(char *function, int entnum, int othernum, int activator
lua_pushnil(t);
else
Lua_PushEntity(t, activator);
G_LuaResume(vm, t, function, 3);
G_Lua_Resume(vm, t, function, 3);
}
}
}
@ -754,7 +754,7 @@ void LuaHook_G_EntityHurt(char *function, int entnum, int inflictornum, int atta
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -771,12 +771,12 @@ void LuaHook_G_EntityHurt(char *function, int entnum, int inflictornum, int atta
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, attacker);
if(!G_LuaCall(vm, function, 3, 0))
if(!G_Lua_Call(vm, function, 3, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -793,7 +793,7 @@ void LuaHook_G_EntityHurt(char *function, int entnum, int inflictornum, int atta
lua_pushnil(t);
else
Lua_PushEntity(t, attacker);
if(!G_LuaResume(vm, t, function, 3))
if(!G_Lua_Resume(vm, t, function, 3))
continue;
}
}
@ -818,7 +818,7 @@ void LuaHook_G_EntityDie(char *function, int entnum, int inflictornum, int attac
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -837,12 +837,12 @@ void LuaHook_G_EntityDie(char *function, int entnum, int inflictornum, int attac
Lua_PushEntity(vm->L, attacker);
lua_pushinteger(vm->L, dmg);
lua_pushinteger(vm->L, mod);
if(!G_LuaCall(vm, function, 5, 0))
if(!G_Lua_Call(vm, function, 5, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -861,7 +861,7 @@ void LuaHook_G_EntityDie(char *function, int entnum, int inflictornum, int attac
Lua_PushEntity(t, attacker);
lua_pushinteger(t, dmg);
lua_pushinteger(t, mod);
if(!G_LuaResume(vm, t, function, 5))
if(!G_Lua_Resume(vm, t, function, 5))
continue;
}
}
@ -884,26 +884,26 @@ void LuaHook_G_EntityFree(char *function, int entnum)
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, function, 1, 0))
if(!G_Lua_Call(vm, function, 1, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(t);
else
Lua_PushEntity(t, ent);
if(!G_LuaResume(vm, t, function, 1))
if(!G_Lua_Resume(vm, t, function, 1))
continue;
}
}
@ -923,24 +923,24 @@ void LuaHook_G_EntityReached(char *function, int entnum) {
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, function, 1, 0))
if(!G_Lua_Call(vm, function, 1, 0))
continue;
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(t);
else
Lua_PushEntity(t, ent);
if(!G_LuaResume(vm, t, function, 1))
if(!G_Lua_Resume(vm, t, function, 1))
continue;
}
}
@ -960,24 +960,24 @@ void LuaHook_G_EntityReachedAngular(char *function, int entnum) {
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, function, 1, 0))
if(!G_Lua_Call(vm, function, 1, 0))
continue;
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(t);
else
Lua_PushEntity(t, ent);
if(!G_LuaResume(vm, t, function, 1))
if(!G_Lua_Resume(vm, t, function, 1))
continue;
}
}
@ -1001,7 +1001,7 @@ void LuaHook_G_EntityTrigger(char *function, int entnum, int othernum)
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -1013,12 +1013,12 @@ void LuaHook_G_EntityTrigger(char *function, int entnum, int othernum)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, other);
if(!G_LuaCall(vm, function, 2, 0))
if(!G_Lua_Call(vm, function, 2, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
@ -1030,7 +1030,7 @@ void LuaHook_G_EntityTrigger(char *function, int entnum, int othernum)
lua_pushnil(t);
else
Lua_PushEntity(t, other);
if(!G_LuaResume(vm, t, function, 2))
if(!G_Lua_Resume(vm, t, function, 2))
continue;
}
}
@ -1053,33 +1053,33 @@ void LuaHook_G_EntitySpawn(char *function, int entnum)
continue;
t = lua_newthread(vm->L);
if(!t) {
if(!G_LuaGetFunction(vm, function))
if(!G_Lua_GetFunction(vm, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(vm->L);
else
Lua_PushEntity(vm->L, ent);
if(!G_LuaCall(vm, function, 1, 0))
if(!G_Lua_Call(vm, function, 1, 0))
{
continue;
}
} else {
if(!G_LuaGetFunctionT(t, function))
if(!G_Lua_GetFunctionT(t, function))
continue;
ent = &g_entities[entnum];
if(!ent || !ent->inuse)
lua_pushnil(t);
else
Lua_PushEntity(t, ent);
if(!G_LuaResume(vm, t, function, 1))
if(!G_Lua_Resume(vm, t, function, 1))
continue;
}
}
}
}
unsigned G_LuaNumThreads(void) {
unsigned G_Lua_NumThreads(void) {
lvm_t* vm = lVM[0];
unsigned num = 0;
@ -1106,7 +1106,7 @@ unsigned G_LuaNumThreads(void) {
return num;
}
void G_LuaCollectGarbage(void) {
void G_Lua_CollectGarbage(void) {
lvm_t *vm;
lua_State *p;
int i, n, m;

23
code/game/g_lua.h
View file

@ -43,16 +43,15 @@ extern lvm_t *lVM[NUM_VMS];
void QDECL LUA_DEBUG(const char *fmt, ...);
void QDECL LUA_LOG(const char *fmt, ...);
qboolean G_LuaInit(void);
qboolean G_LuaCall(lvm_t *vm, char *func, int nargs, int nresults);
qboolean G_LuaResume(lvm_t *vm, lua_State *T, char *func, int nargs);
qboolean G_LuaGetFunction(lvm_t *vm, char *name);
qboolean G_LuaGetFunctionT(lua_State *T, char *name);
qboolean G_LuaStartVM(lvm_t *vm);
void G_LuaStopVM(lvm_t *vm);
void G_LuaShutdown(void);
void G_LuaStatus(gentity_t *ent);
lvm_t* G_LuaGetVM(lua_State *L);
qboolean G_Lua_Init(void);
qboolean G_Lua_Call(lvm_t *vm, char *func, int nargs, int nresults);
qboolean G_Lua_Resume(lvm_t *vm, lua_State *T, char *func, int nargs);
qboolean G_Lua_GetFunction(lvm_t *vm, char *name);
qboolean G_Lua_StartVM(lvm_t *vm);
void G_Lua_StopVM(lvm_t *vm);
void G_Lua_Shutdown(void);
void G_Lua_Status(gentity_t *ent);
lvm_t* G_Lua_GetVM(lua_State *L);
// lua_entity.c
typedef struct {
@ -226,8 +225,8 @@ void LuaHook_G_EntityReached(char* function, int entnum);
*/
void LuaHook_G_EntityReachedAngular(char* function, int entnum);
unsigned G_LuaNumThreads(void);
unsigned G_Lua_NumThreads(void);
void G_LuaCollectGarbage(void);
void G_Lua_CollectGarbage(void);
#endif

8
code/game/g_main.c
View file

@ -590,7 +590,7 @@ void QDECL G_Error( const char *fmt, ... ) {
va_end (argptr);
#ifdef G_LUA
G_LuaShutdown();
G_Lua_Shutdown();
#endif
trap_Error( text );
@ -1845,7 +1845,7 @@ void G_InitGame( int levelTime, unsigned int randomSeed, int restart ) {
}
#ifdef G_LUA
G_LuaInit();
G_Lua_Init();
#endif
G_LogWeaponInit();
@ -1881,7 +1881,7 @@ void G_InitGame( int levelTime, unsigned int randomSeed, int restart ) {
ClearRegisteredItems();
// parse the map usables file
G_SetupUsablesStrings();
G_Usable_SetupUsablesStrings();
// parse the key/value pairs and spawn gentities
G_SpawnEntitiesFromString();
@ -2013,7 +2013,7 @@ void G_ShutdownGame( int restart ) {
#ifdef G_LUA
LuaHook_G_Shutdown(restart);
G_LuaShutdown();
G_Lua_Shutdown();
#endif
#if 0 // kef -- Pat sez this is causing some trouble these days

8
code/game/g_main.h
View file

@ -3,9 +3,9 @@
#include "g_local.h"
extern int numKilled;
extern holoData_t holoData;
extern qboolean levelExiting;
extern mapChangeData_t mapChangeData;
extern int numKilled;
extern holoData_t holoData;
extern qboolean levelExiting;
extern mapChangeData_t mapChangeData;
#endif

6
code/game/g_missile.c
View file

@ -197,11 +197,11 @@ static void G_MissileStick( gentity_t *ent, trace_t *trace )
/*
================
G_MissileImpact
G_Missile_Impact
================
*/
void G_MissileImpact( gentity_t *ent, trace_t *trace ) {
void G_Missile_Impact( gentity_t *ent, trace_t *trace ) {
gentity_t *other = NULL, *tent = NULL;
//qboolean hitClient = qfalse;
@ -398,7 +398,7 @@ void G_Missile_Run( gentity_t *ent ) {
return;
}
G_MissileImpact( ent, &tr );
G_Missile_Impact( ent, &tr );
if ( (ent->s.eType != ET_MISSILE) && (ent->s.eType != ET_ALT_MISSILE) ) {
return; // exploded
}

2
code/game/g_missile.h
View file

@ -3,6 +3,6 @@
#include "g_local.h"
void G_MissileImpact( gentity_t *ent, trace_t *trace);
void G_Missile_Impact( gentity_t *ent, trace_t *trace);
#endif /* G_MISSILE_H_ */

8
code/game/g_sql.h
View file

@ -8,10 +8,10 @@
#define SQL_ROLLBACK_TRANSACTION "ROLLBACK TRANSACTION"
#define SQL_COMMIT_TRANSACTION "COMMIT TRANSACTION"
#define SQL_USER_CREATEUSERTABLE "CREATE TABLE IF NOT EXISTS rpgx_users ( \
id INTEGER PRIMARY KEY AUTOINCREMENT, \
username TEXT NOT NULL , \
password TEXT NOT NULL \
)"
id INTEGER PRIMARY KEY AUTOINCREMENT, \
username TEXT NOT NULL , \
password TEXT NOT NULL \
)"
#define SQL_USER_CREATERIGHTSTABLE "CREATE TABLE IF NOT EXISTS rpgx_userRights ( \
id INT NOT NULL PRIMARY KEY, \
admin BIT NOT NULL, \

6
code/game/g_svcmds.c
View file

@ -784,8 +784,8 @@ Svcmd_LuaRestart_f
#ifdef G_LUA
static void Svcmd_LuaRestart_f(void)
{
G_LuaShutdown();
G_LuaInit();
G_Lua_Shutdown();
G_Lua_Init();
}
#endif
@ -797,7 +797,7 @@ qboolean ConsoleCommand( void ) { //void
#ifdef G_LUA
if(Q_stricmp(cmd, "lua_status") == 0)
{
G_LuaStatus(NULL);
G_Lua_Status(NULL);
return qtrue;
}

2
code/game/g_usable.c
View file

@ -425,7 +425,7 @@ void SP_func_usable( gentity_t *self )
* \return sucessfully loaded?
* \author Ubergames - TiM
*/
qboolean G_SetupUsablesStrings( void )
qboolean G_Usable_SetupUsablesStrings( void )
{
char *serverInfo;
char fileRoute[MAX_QPATH];

2
code/game/g_usable.h
View file

@ -4,7 +4,7 @@
#include "g_local.h"
//TiM - load usables scan text
qboolean G_SetupUsablesStrings( void );
qboolean G_Usable_SetupUsablesStrings( void );
#endif /* G_USABLE_H_ */

2
code/game/g_utils.h
View file

@ -3,6 +3,6 @@
#include "g_local.h"
qboolean LineOfSight( gentity_t* ent1, gentity_t* ent2 ); //Phenix
qboolean G_Utils_LineOfSight( gentity_t* ent1, gentity_t* ent2 ); //Phenix
#endif /* G_UTILS_H_ */

4
code/game/g_weapon.h
View file

@ -3,7 +3,9 @@
#include "g_local.h"
vec3_t forward, right, up;
vec3_t forward;
vec3_t right;
vec3_t up;
vec3_t muzzle;
#endif /* _G_WEAPON_H */

2
code/game/game.vcxproj
View file

@ -505,6 +505,7 @@
<ClInclude Include="g_cinematic.h" />
<ClInclude Include="g_client.h" />
<ClInclude Include="g_cmds.h" />
<ClInclude Include="g_combat.h" />
<ClInclude Include="g_groups.h" />
<ClInclude Include="g_items.h" />
<ClInclude Include="g_local.h" />
@ -516,6 +517,7 @@
<ClInclude Include="g_sql.h" />
<ClInclude Include="g_team.h" />
<ClInclude Include="g_usable.h" />
<ClInclude Include="g_utils.h" />
<ClInclude Include="g_weapon.h" />
<ClInclude Include="g_logger.h" />
<ClInclude Include="inv.h" />

6
code/game/game.vcxproj.filters
View file

@ -509,6 +509,12 @@
<ClInclude Include="g_usable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="g_combat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="g_utils.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="game.def">