Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reworked file inclusion (using relative path)

Browse source
This commit is contained in:
OM 2023-06-17 01:24:20 +02:00
parent 2ac8f3e39d
commit c287638f99
67 changed files with 147 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/client/cl_cgame.cpp
View file

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "client.h" #include "client.h"
#include "cl_ui.h" #include "cl_ui.h"
#include "tiki.h" #include "../qcommon/tiki.h"
#include <localization.h> #include "../qcommon/localization.h"
extern qboolean loadCamera(const char *name); extern qboolean loadCamera(const char *name);
extern void startCamera(int time); extern void startCamera(int time);

2
code/client/cl_consolecmds.cpp
View file

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// cl_consolecmds.cpp : New client console commands. // cl_consolecmds.cpp : New client console commands.
#include "client.h" #include "client.h"
#include "listener.h" #include "../qcommon/listener.h"
/* /*
=============== ===============

11
code/client/cl_main.cpp
View file

@ -22,17 +22,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// cl_main.c -- client main loop // cl_main.c -- client main loop
#include "client.h" #include "client.h"
#include "server.h" #include "../server/server.h"
#include "cl_ui.h" #include "cl_ui.h"
#include "tiki.h" #include "../qcommon/tiki.h"
#include <cm_terrain.h> #include "../qcommon/cm_terrain.h"
#include "../sys/sys_local.h" #include "../sys/sys_local.h"
#include <limits.h>
#ifdef USE_RENDERER_DLL #ifdef USE_RENDERER_DLL
#include "../sys/sys_loadlib.h" #include "../sys/sys_loadlib.h"
#endif #endif
#include "gcdkeyc.h" #include "../gamespy/gcdkey/gcdkeyc.h"
#include <climits>
cvar_t *cl_nodelta; cvar_t *cl_nodelta;
cvar_t *cl_debugMove; cvar_t *cl_debugMove;

6
code/client/cl_ui.cpp
View file

@ -23,9 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "client.h" #include "client.h"
#include "../server/server.h" #include "../server/server.h"
#include "../renderer/tr_public.h" #include "../renderercommon/tr_public.h"
#include "tiki.h" #include "../qcommon/tiki.h"
#include <localization.h> #include "../qcommon/localization.h"
#include "cl_ui.h" #include "cl_ui.h"

4
code/client/cl_ui.h
View file

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __CL_UI_H__ #ifndef __CL_UI_H__
#define __CL_UI_H__ #define __CL_UI_H__
#include "ui_extern.h" #include "../uilib/ui_extern.h"
#include "uiwidget.h" #include "../uilib/uiwidget.h"
typedef struct { typedef struct {
UIReggedMaterial *loading; UIReggedMaterial *loading;

2
code/client/cl_uistd.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110EV_DEFAULT301 U
*/ */
#include "cl_ui.h" #include "cl_ui.h"
#include <localization.h> #include "../qcommon/localization.h"
Event EV_Layout_PlayerStat Event EV_Layout_PlayerStat
( (

4
code/client/keys.h
View file

@ -39,6 +39,7 @@ extern qboolean chat_team;
extern int chat_playerNum; extern int chat_playerNum;
#if defined(APP_MODULE) #if defined(APP_MODULE)
int Key_StringToKeynum( const char *str ); int Key_StringToKeynum( const char *str );
void Key_WriteBindings( fileHandle_t f ); void Key_WriteBindings( fileHandle_t f );
void Key_SetBinding( int keynum, const char *binding ); void Key_SetBinding( int keynum, const char *binding );
@ -48,7 +49,8 @@ qboolean Key_GetOverstrikeMode( void );
void Key_SetOverstrikeMode( qboolean state ); void Key_SetOverstrikeMode( qboolean state );
void Key_ClearStates( void ); void Key_ClearStates( void );
int Key_GetKey(const char *binding); int Key_GetKey(const char *binding);
const char *Key_GetKeynameForCommand( const char *command ); const char* Key_GetKeynameForCommand(const char* command);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

2
code/client/usignal.cpp
View file

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#include "ui_local.h" #include "../uilib/ui_local.h"
UConnection::UConnection() UConnection::UConnection()
{ {

4
code/fgame/actor.cpp
View file

@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "g_phys.h" #include "g_phys.h"
#include "debuglines.h" #include "debuglines.h"
#include "scriptexception.h" #include "scriptexception.h"
#include <parm.h> #include "parm.h"
#include <tiki.h> #include "../qcommon/tiki.h"
#include <cmath> #include <cmath>

6
code/fgame/actor.h
View file

@ -30,10 +30,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "actorenemy.h" #include "actorenemy.h"
#include "level.h" #include "level.h"
#include "game.h" #include "game.h"
#include <gamescript.h> #include "gamescript.h"
#include <scriptmaster.h> #include "scriptmaster.h"
#include "grenadehint.h" #include "grenadehint.h"
#include <parm.h> #include "parm.h"
extern Event EV_Actor_Start; extern Event EV_Actor_Start;
extern Event EV_Actor_Dead; extern Event EV_Actor_Dead;

2
code/fgame/body.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __BODY_H__ #ifndef __BODY_H__
#define __BODY_H__ #define __BODY_H__
#include <animate.h> #include "animate.h"
//============================================================= //=============================================================
//class Body //class Body

2
code/fgame/entity.h
View file

@ -947,7 +947,7 @@ inline int Entity::CurrentAnim
return 0; return 0;
} }
#include <world.h> #include "world.h"
#endif #endif

2
code/fgame/g_client.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "player.h" #include "player.h"
#include "playerbot.h" #include "playerbot.h"
#include "playerstart.h" #include "playerstart.h"
#include <scriptmaster.h> #include "scriptmaster.h"
// g_client.c -- client functions that don't happen every frame // g_client.c -- client functions that don't happen every frame

6
code/fgame/g_spawn.cpp
View file

@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "glb_local.h" #include "glb_local.h"
#include "g_spawn.h" #include "g_spawn.h"
#include <scriptvariable.h> #include "../script/scriptvariable.h"
#include <object.h> #include "object.h"
#include <tiki.h> #include "../qcommon/tiki.h"
#ifdef GAME_DLL #ifdef GAME_DLL
#include "../fgame/entity.h" #include "../fgame/entity.h"

2
code/fgame/item.h
View file

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "entity.h" #include "entity.h"
#include "trigger.h" #include "trigger.h"
#include "sentient.h" #include "sentient.h"
#include <gamescript.h> #include "gamescript.h"
extern Event EV_Item_Pickup; extern Event EV_Item_Pickup;
extern Event EV_Item_DropToFloor; extern Event EV_Item_DropToFloor;

4
code/fgame/movegrid.h
View file

@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define __MOVEGRID_H__ #define __MOVEGRID_H__
#include "g_local.h" #include "g_local.h"
#include <class.h> #include "../qcommon/class.h"
#include <archive.h> #include "../fgame/archive.h"
typedef struct vehicleState_s { typedef struct vehicleState_s {
float origin[ 3 ]; float origin[ 3 ];

16
code/fgame/scriptmaster.cpp
View file

@ -50,15 +50,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#elif defined ( GAME_DLL ) #elif defined ( GAME_DLL )
#include <hud.h> #include "hud.h"
#include "../fgame/dm_team.h" #include "dm_team.h"
#include "../fgame/player.h" #include "player.h"
#include "../fgame/entity.h" #include "entity.h"
#include "../fgame/huddraw.h" #include "huddraw.h"
#include "../fgame/weaputils.h" #include "weaputils.h"
#include "../fgame/camera.h" #include "camera.h"
#include "../fgame/consoleevent.h" #include "consoleevent.h"
#define SCRIPT_Printf gi.Printf #define SCRIPT_Printf gi.Printf
#define SCRIPT_DPrintf gi.DPrintf #define SCRIPT_DPrintf gi.DPrintf

2
code/fgame/scriptthread.cpp
View file

@ -21,7 +21,7 @@
#include "slre.h" #include "slre.h"
#include <md5.h> #include "md5.h"
#ifdef WIN32 #ifdef WIN32
#include <direct.h> #include <direct.h>

2
code/fgame/weapon.h
View file

@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "ammo.h" #include "ammo.h"
#include "queue.h" #include "queue.h"
#include "sentient.h" #include "sentient.h"
#include <scriptmaster.h> #include "../fgame/scriptmaster.h"
extern Event EV_Weapon_GiveStartingAmmo; extern Event EV_Weapon_GiveStartingAmmo;
extern Event EV_Weapon_SetAmmoInClip; extern Event EV_Weapon_SetAmmoInClip;

2
code/fgame/world.h
View file

@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "simpleentity.h" #include "simpleentity.h"
#endif #endif
#include <gamescript.h> #include "gamescript.h"
#define WORLD_CINEMATIC 1 #define WORLD_CINEMATIC 1

6
code/gamespy/sv_gamespy.c
View file

@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#include "q_shared.h" #include "../qcommon/q_shared.h"
#include "server.h" #include "../server/server.h"
#include "sv_gqueryreporting.h" #include "sv_gqueryreporting.h"
#include <gcdkey/gcdkeys.h> #include "gcdkey/gcdkeys.h"
static char gamemode[128]; static char gamemode[128];
static qboolean gcdInitialized = qfalse; static qboolean gcdInitialized = qfalse;

6
code/gamespy/sv_gqueryreporting.c
View file

@ -22,9 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "sv_gqueryreporting.h" #include "sv_gqueryreporting.h"
#include <common/gsPlatformSocket.h> #include "common/gsPlatformSocket.h"
#include <common/gsPlatformUtil.h> #include "common/gsPlatformUtil.h"
#include <gutil.h> #include "gutil.h"
static char* queries[] = static char* queries[] =
{ {

2
code/gamespy/sv_gqueryreporting.h
View file

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#include <common/gsPlatformSocket.h> #include "common/gsPlatformSocket.h"
typedef void (*qr_querycallback_t) (char* outbuf, int maxlen, void* userdata); typedef void (*qr_querycallback_t) (char* outbuf, int maxlen, void* userdata);
typedef void (*qr_custom_handler_t) (const char* query, struct sockaddr* sender); typedef void (*qr_custom_handler_t) (const char* query, struct sockaddr* sender);

8
code/parser/parsetree.cpp
View file

@ -22,9 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// parsetree.cpp: Abstract Syntax Layer for Lexer/Parser // parsetree.cpp: Abstract Syntax Layer for Lexer/Parser
#include "glb_local.h"
#include "parsetree.h" #include "parsetree.h"
#include <mem_tempalloc.h> #include "../fgame/gamecvars.h"
#include "../qcommon/mem_tempalloc.h"
MEM_TempAlloc parsetree_allocator; MEM_TempAlloc parsetree_allocator;
@ -79,9 +79,9 @@ void parsetree_freeall()
{ {
parsetree_allocator.FreeAll(); parsetree_allocator.FreeAll();
if (showopcodes->integer) if (g_showopcodes->integer)
{ {
glbs.DPrintf("%d bytes freed\n", parsedata.total_length); gi.DPrintf("%d bytes freed\n", parsedata.total_length);
} }
} }

4
code/parser/yyLexer.cpp
View file

@ -889,7 +889,7 @@ void fprintf2( FILE *f, const char *format, ... )
vsprintf( buffer, format, va ); vsprintf( buffer, format, va );
va_end( va ); va_end( va );
glbs.Printf( buffer ); gi.Printf( buffer );
} }
#define fprintf fprintf2 #define fprintf fprintf2
@ -906,7 +906,7 @@ extern yyparsedata parsedata;
void yylexerror( const char *msg ) void yylexerror( const char *msg )
{ {
glbs.Printf( "%s\n%s", msg, yytext ); gi.Printf( "%s\n%s", msg, yytext );
assert( 0 ); assert( 0 );
} }

7
code/qcommon/alias.h
View file

@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __ALIAS_H__ #pragma once
#define __ALIAS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -70,6 +69,7 @@ typedef struct AliasList_s
} AliasList_t; } AliasList_t;
#if defined(APP_MODULE) #if defined(APP_MODULE)
const char* Alias_Find(const char* alias); const char* Alias_Find(const char* alias);
qboolean Alias_Add(const char* alias, const char* name, const char* parameters); qboolean Alias_Add(const char* alias, const char* name, const char* parameters);
qboolean Alias_Delete(const char* alias); qboolean Alias_Delete(const char* alias);
@ -80,6 +80,7 @@ AliasList_t* Alias_GetGlobalList();
int S_ChannelNameToNum( const char *pszName ); int S_ChannelNameToNum( const char *pszName );
const char *S_ChannelNumToName( int iChannel ); const char *S_ChannelNumToName( int iChannel );
#endif #endif
// //
@ -118,5 +119,3 @@ float randweight(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* alias.h */

8
code/qcommon/class.cpp
View file

@ -24,11 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "class.h" #include "class.h"
#include "listener.h" #include "listener.h"
#include <q_shared.h> #include "q_shared.h"
#if defined (GAME_DLL) #if defined (GAME_DLL)
#include "g_local.h" #include "../fgame/g_local.h"
#define CLASS_Printf gi.Printf #define CLASS_Printf gi.Printf
#define CLASS_DPrintf gi.DPrintf #define CLASS_DPrintf gi.DPrintf
@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#elif defined(CGAME_DLL) #elif defined(CGAME_DLL)
#include "cg_local.h" #include "../cgame/cg_local.h"
#define CLASS_Printf cgi.Printf #define CLASS_Printf cgi.Printf
#define CLASS_DPrintf cgi.DPrintf #define CLASS_DPrintf cgi.DPrintf
@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifdef WITH_SCRIPT_ENGINE #ifdef WITH_SCRIPT_ENGINE
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#endif #endif

2
code/qcommon/cm_trace_lbd.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "cm_local.h" #include "cm_local.h"
#include "server.h" #include "../server/server.h"
#include "../client/client.h" #include "../client/client.h"
#include "tiki.h" #include "tiki.h"

2
code/qcommon/common.cpp
View file

@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// FPS // FPS
#include <chrono> #include <chrono>
#include <tiki.h> #include "tiki.h"
qboolean CL_FinishedIntro(void); qboolean CL_FinishedIntro(void);
void UI_PrintConsole(const char* msg); void UI_PrintConsole(const char* msg);

2
code/qcommon/con_set.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __CON_SET_H__ #ifndef __CON_SET_H__
#define __CON_SET_H__ #define __CON_SET_H__
#include <mem_blockalloc.h> #include "mem_blockalloc.h"
class Class; class Class;
class Archiver; class Archiver;

2
code/qcommon/con_timer.cpp
View file

@ -1,7 +1,7 @@
#include "con_timer.h" #include "con_timer.h"
#if defined (ARCHIVE_SUPPORTED) #if defined (ARCHIVE_SUPPORTED)
#include "archive.h" #include "../fgame/archive.h"
#endif #endif
con_timer::con_timer(void) con_timer::con_timer(void)

4
code/qcommon/container.h
View file

@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
// game dll specific defines // game dll specific defines
// //
#include "g_local.h" #include "../fgame/g_local.h"
#define CONTAINER_Error gi.Error #define CONTAINER_Error gi.Error
#define CONTAINER_DPrintf gi.DPrintf #define CONTAINER_DPrintf gi.DPrintf
@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
// cgame dll specific defines // cgame dll specific defines
// //
#include "cg_local.h" #include "../cgame/cg_local.h"
#define CONTAINER_Error cgi.Error #define CONTAINER_Error cgi.Error
#define CONTAINER_DPrintf cgi.DPrintf #define CONTAINER_DPrintf cgi.DPrintf

2
code/qcommon/cvar.c
View file

@ -1641,7 +1641,7 @@ void Cvar_Init (void)
} }
#ifndef STANDALONE #ifndef STANDALONE
#include "server.h" #include "../server/server.h"
#endif #endif
static void Cvar_FlagsCheck(int flags) { static void Cvar_FlagsCheck(int flags) {

14
code/qcommon/listener.cpp
View file

@ -22,22 +22,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// listener.cpp : Listener. // listener.cpp : Listener.
#include "scriptvariable.h" #include "../script/scriptvariable.h"
#include "scriptexception.h" #include "../script/scriptexception.h"
#include "Linklist.h" #include "Linklist.h"
#ifdef WITH_SCRIPT_ENGINE #ifdef WITH_SCRIPT_ENGINE
#include "archive.h" #include "../fgame/archive.h"
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#include "scriptthread.h" #include "../fgame/scriptthread.h"
#include "scriptclass.h" #include "../script/scriptclass.h"
#endif #endif
#if defined( GAME_DLL ) #if defined( GAME_DLL )
#include "../fgame/player.h" #include "../fgame/player.h"
#include "../fgame/consoleevent.h" #include "../fgame/consoleevent.h"
#include "animate.h" #include "../fgame/animate.h"
#define LISTENER_Cvar_Get gi.Cvar_Get #define LISTENER_Cvar_Get gi.Cvar_Get

4
code/qcommon/mem_blockalloc.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if defined(GAME_DLL) #if defined(GAME_DLL)
#include "g_local.h" #include "../fgame/g_local.h"
void* MEM_Alloc(int size) { return gi.Malloc(size); } void* MEM_Alloc(int size) { return gi.Malloc(size); }
@ -32,7 +32,7 @@ void MEM_Free(void* ptr) { return gi.Free(ptr); }
#elif defined(CGAME_DLL) #elif defined(CGAME_DLL)
#include "cg_local.h" #include "../cgame/cg_local.h"
void* MEM_Alloc(int size) { return cgi.Malloc(size); } void* MEM_Alloc(int size) { return cgi.Malloc(size); }

6
code/qcommon/mem_tempalloc.cpp
View file

@ -22,17 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// mem_tempalloc.cpp: Fast temporary memory manager // mem_tempalloc.cpp: Fast temporary memory manager
#include <mem_tempalloc.h> #include "mem_tempalloc.h"
#ifdef GAME_DLL #ifdef GAME_DLL
#include "g_local.h" #include "../fgame/g_local.h"
#define MEM_TempAllocate(x) gi.Malloc(x) #define MEM_TempAllocate(x) gi.Malloc(x)
#define MEM_TempFree(x) gi.Free(x) #define MEM_TempFree(x) gi.Free(x)
#elif defined(CGAME_DLL) #elif defined(CGAME_DLL)
#include "cg_local.h" #include "../cgame/cg_local.h"
#define MEM_TempAllocate(x) cgi.Malloc(x) #define MEM_TempAllocate(x) cgi.Malloc(x)
#define MEM_TempFree(x) cgi.Free(x) #define MEM_TempFree(x) cgi.Free(x)

4
code/qcommon/memory.c
View file

@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// memory.c: Memory manager // memory.c: Memory manager
#include <q_shared.h> #include "q_shared.h"
#include <qcommon.h> #include "qcommon.h"
#ifdef WIN32 #ifdef WIN32
#include <Windows.h> #include <Windows.h>

2
code/qcommon/script.cpp
View file

@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if defined(GAME_DLL) #if defined(GAME_DLL)
#include "g_local.h" #include "../fgame/g_local.h"
#define FILE_FS_FreeFile gi.FS_FreeFile #define FILE_FS_FreeFile gi.FS_FreeFile
#define FILE_FS_ReadFile(a, b) gi.FS_ReadFile(a, b, true) #define FILE_FS_ReadFile(a, b) gi.FS_ReadFile(a, b, true)

2
code/qcommon/script.h
View file

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "str.h" #include "str.h"
#if defined(ARCHIVE_SUPPORTED) #if defined(ARCHIVE_SUPPORTED)
#include "archive.h" #include "../fgame/archive.h"
#endif #endif
#define TOKENCOMMENT (';') #define TOKENCOMMENT (';')

8
code/qcommon/tiki.h
View file

@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifdef __cplusplus #ifdef __cplusplus
class Archiver; class Archiver;
#include <mem_blockalloc.h> #include "../qcommon/mem_blockalloc.h"
#include <con_set.h> #include "../qcommon/con_set.h"
#include <str.h> #include "../qcommon/str.h"
#endif #endif
typedef struct AliasList_s AliasList_t; typedef struct AliasList_s AliasList_t;
@ -114,7 +114,7 @@ typedef struct {
typedef struct dloaddef_s dloaddef_t; typedef struct dloaddef_s dloaddef_t;
#include <tiki_script.h> #include "tiki_script.h"
#ifdef __cplusplus #ifdef __cplusplus

2
code/qcommon/tiki_main.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "q_shared.h" #include "q_shared.h"
#include "qcommon.h" #include "qcommon.h"
#include <tiki.h> #include "tiki.h"
#include "../tiki/tiki_shared.h" #include "../tiki/tiki_shared.h"
int cache_numskel = 0; int cache_numskel = 0;

2
code/qcommon/tiki_script.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "q_shared.h" #include "q_shared.h"
#include "qcommon.h" #include "qcommon.h"
#include <tiki.h> #include "tiki.h"
TikiScript *TikiScript::currentScript; TikiScript *TikiScript::currentScript;

2
code/qcommon/vector.h
View file

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
#include <qcommon.h> #include "qcommon.h"
//#define X 0 //#define X 0
//#define Y 1 //#define Y 1

4
code/script/scriptclass.cpp
View file

@ -1,6 +1,6 @@
#include "scriptclass.h" #include "scriptclass.h"
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#include "scriptthread.h" #include "../fgame/scriptthread.h"
#include "scriptexception.h" #include "scriptexception.h"
//==================== //====================

17
code/script/scriptcompiler.cpp
View file

@ -22,19 +22,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// compiler.cpp : Parse, then compile to op-codes. // compiler.cpp : Parse, then compile to op-codes.
#include "glb_local.h"
#include "scriptcompiler.h" #include "scriptcompiler.h"
#include "scriptvm.h" #include "scriptvm.h"
#include "level.h" #include "../fgame/level.h"
#include "parm.h" #include "../fgame/parm.h"
#include "game.h" #include "../fgame/game.h"
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#include "scriptthread.h" #include "../fgame/scriptthread.h"
#include "scriptclass.h" #include "scriptclass.h"
#include "scriptexception.h" #include "scriptexception.h"
#include "parsetree.h" #include "../parser/parsetree.h"
#include "yyParser.h" #include "../parser/yyParser.h"
#include "yyLexer.h" #include "../parser/yyLexer.h"
ScriptCompiler Compiler; ScriptCompiler Compiler;
int ScriptCompiler::current_label; int ScriptCompiler::current_label;

7
code/script/scriptcompiler.h
View file

@ -25,10 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __COMPILER_H__ #ifndef __COMPILER_H__
#define __COMPILER_H__ #define __COMPILER_H__
#include "glb_local.h" #include "../script/scriptopcodes.h"
#include <scriptopcodes.h> #include "../fgame/gamescript.h"
#include <gamescript.h> #include "../parser/parsetree.h"
#include "parsetree.h"
class ScriptVariable; class ScriptVariable;

2
code/script/scriptexception.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __EXCEPT_H__ #ifndef __EXCEPT_H__
#define __EXCEPT_H__ #define __EXCEPT_H__
#include "str.h" #include "../qcommon/str.h"
class ScriptException class ScriptException
{ {

12
code/script/scriptvariable.cpp
View file

@ -24,18 +24,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "scriptvariable.h" #include "scriptvariable.h"
#include "scriptexception.h" #include "scriptexception.h"
#include "str.h" #include "../qcommon/str.h"
#ifdef GAME_DLL #ifdef GAME_DLL
#include "archive.h" #include "../fgame/archive.h"
#include "g_local.h" #include "../fgame/g_local.h"
#include "../fgame/navigate.h" #include "../fgame/navigate.h"
#endif #endif
#ifdef WITH_SCRIPT_ENGINE #ifdef WITH_SCRIPT_ENGINE
#include "world.h" #include "../fgame/world.h"
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#include "simpleentity.h" #include "../fgame/simpleentity.h"
#endif #endif
#include <utility> #include <utility>

6
code/script/scriptvariable.h
View file

@ -25,11 +25,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __SCRIPTVARIABLE_H__ #ifndef __SCRIPTVARIABLE_H__
#define __SCRIPTVARIABLE_H__ #define __SCRIPTVARIABLE_H__
#include "listener.h" #include "../qcommon/listener.h"
#include "short3.h" #include "../qcommon/short3.h"
#ifdef GAME_DLL #ifdef GAME_DLL
#include "misc.h" #include "../fgame/misc.h"
#endif #endif
enum variabletype enum variabletype

14
code/script/scriptvm.cpp
View file

@ -22,17 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// scriptvm.cpp : Script virtual machine, interprets and execute scripts // scriptvm.cpp : Script virtual machine, interprets and execute scripts
#include "g_local.h" #include "../fgame/g_local.h"
#include "scriptmaster.h" #include "../fgame/scriptmaster.h"
#include "scriptthread.h" #include "../fgame/scriptthread.h"
#include "scriptclass.h" #include "scriptclass.h"
#include "scriptvm.h" #include "scriptvm.h"
#include "scriptcompiler.h" #include "scriptcompiler.h"
#include "scriptexception.h" #include "scriptexception.h"
#include "game.h" #include "../fgame/game.h"
#include "level.h" #include "../fgame/level.h"
#include "parm.h" #include "../fgame/parm.h"
#include "world.h" #include "../fgame/world.h"
#include <utility> #include <utility>

4
code/script/scriptvm.h
View file

@ -27,11 +27,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "listener.h" #include "listener.h"
#include <gamescript.h> #include "../fgame/gamescript.h"
#include "scriptvariable.h" #include "scriptvariable.h"
#include "scriptopcodes.h" #include "scriptopcodes.h"
#include "con_set.h" #include "../qcommon/con_set.h"
#define MAX_STACK_DEPTH 20 // 9 in mohaa #define MAX_STACK_DEPTH 20 // 9 in mohaa
//#define LOCALSTACK_SIZE 255 // pre-allocated localstack size for each VM //#define LOCALSTACK_SIZE 255 // pre-allocated localstack size for each VM

7
code/server/sv_game.c
View file

@ -25,9 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../client/snd_public.h" #include "../client/snd_public.h"
#include "../client/client.h" #include "../client/client.h"
#include "tiki.h" #include "../qcommon/tiki.h"
#include <localization.h> #include "../qcommon/localization.h"
#include <crc.h> #include "../qcommon/crc.h"
#include "../qcommon/alias.h"
debugline_t *DebugLines; debugline_t *DebugLines;
int numDebugLines; int numDebugLines;

2
code/server/sv_init.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "server.h" #include "server.h"
#include "../client/client.h" #include "../client/client.h"
#include "tiki.h" #include "../qcommon/tiki.h"
static char last_mapname[ MAX_QPATH ]; static char last_mapname[ MAX_QPATH ];
static int g_iSvsTimeFixupCount; static int g_iSvsTimeFixupCount;

2
code/server/sv_world.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// world.c -- world query functions // world.c -- world query functions
#include "server.h" #include "server.h"
#include <tiki.h> #include "../qcommon/tiki.h"
/* /*
================ ================

2
code/skeletor/bonetable.cpp
View file

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// bonetable.cpp : Bone table // bonetable.cpp : Bone table
#include "q_shared.h" #include "q_shared.h"
#include <tiki.h> #include "tiki.h"
void ChannelNameTable::CopyChannel( ChannelName_t *dest, const ChannelName_t *source ) void ChannelNameTable::CopyChannel( ChannelName_t *dest, const ChannelName_t *source )
{ {

2
code/sys/win_localization.h
View file

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "q_shared.h" #include "q_shared.h"
#include "qcommon.h" #include "qcommon.h"
#include "localization.h" #include "../qcommon/localization.h"
#ifdef __cplusplus #ifdef __cplusplus
#include "str.h" #include "str.h"

2
code/tiki/tiki_files.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __TIKI_FILES_H__ #ifndef __TIKI_FILES_H__
#define __TIKI_FILES_H__ #define __TIKI_FILES_H__
#include <tiki.h> #include "../qcommon/tiki.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
code/uilib/ui_extern.h
View file

@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/q_shared.h" #include "../qcommon/q_shared.h"
#include "../qcommon/qcommon.h" #include "../qcommon/qcommon.h"
#include <listener.h> #include "../qcommon/listener.h"
#include <script.h> #include "../qcommon/script.h"
#include "../client/client.h" #include "../client/client.h"
#include "ui_public.h" #include "ui_public.h"

2
code/uilib/uibutton.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include "localization.h" #include "../qcommon/localization.h"
Event W_Button_Pressed Event W_Button_Pressed
( (

2
code/uilib/uilabel.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include <localization.h> #include "../qcommon/localization.h"
Event EV_UILabel_LinkString Event EV_UILabel_LinkString
( (

2
code/uilib/uilayout.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include "scriptexception.h" #include "../script/scriptexception.h"
Event EV_Layout_Menu Event EV_Layout_Menu
( (

2
code/uilib/uilistctrl.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include "localization.h" #include "../qcommon/localization.h"
static UISize2D s_columnpadding; static UISize2D s_columnpadding;

4
code/uilib/uimenu.h
View file

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __UIMENU_H__ #ifndef __UIMENU_H__
#define __UIMENU_H__ #define __UIMENU_H__
#include "listener.h" #include "../qcommon/listener.h"
#include "stack.h" #include "../qcommon/stack.h"
class Menu : public Listener { class Menu : public Listener {
qboolean m_fullscreen; qboolean m_fullscreen;

2
code/uilib/uistatus.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include "localization.h" #include "../qcommon/localization.h"
CLASS_DECLARATION( UIWidget, UIWindowSizer, NULL ) CLASS_DECLARATION( UIWidget, UIWindowSizer, NULL )
{ {

2
code/uilib/uivertscroll.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include "localization.h" #include "../qcommon/localization.h"
Event W_Scrollbar_Positioned Event W_Scrollbar_Positioned
( (

2
code/uilib/uiwidget.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ui_local.h" #include "ui_local.h"
#include <localization.h> #include "../qcommon/localization.h"
Event W_Destroyed Event W_Destroyed
( (