mirror of
https://github.com/openmoh/openmohaa.git
synced 2025-05-09 03:58:14 +03:00
Reworked file inclusion (using relative path)
This commit is contained in:
OM
parent
2ac8f3e39d
commit
c287638f99
67 changed files with 147 additions and 146 deletions
|
|
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
===========================================================================
|
||||
*/
|
||||
|
||||
#ifndef __ALIAS_H__
|
||||
#define __ALIAS_H__
|
||||
#pragma once
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -70,6 +69,7 @@ typedef struct AliasList_s
|
|||
} AliasList_t;
|
||||
|
||||
#if defined(APP_MODULE)
|
||||
|
||||
const char* Alias_Find(const char* alias);
|
||||
qboolean Alias_Add(const char* alias, const char* name, const char* parameters);
|
||||
qboolean Alias_Delete(const char* alias);
|
||||
|
|
@ -80,6 +80,7 @@ AliasList_t* Alias_GetGlobalList();
|
|||
|
||||
int S_ChannelNameToNum( const char *pszName );
|
||||
const char *S_ChannelNumToName( int iChannel );
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
@ -118,5 +119,3 @@ float randweight(void);
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* alias.h */
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#include "class.h"
|
||||
#include "listener.h"
|
||||
#include <q_shared.h>
|
||||
#include "q_shared.h"
|
||||
|
||||
#if defined (GAME_DLL)
|
||||
|
||||
#include "g_local.h"
|
||||
#include "../fgame/g_local.h"
|
||||
|
||||
#define CLASS_Printf gi.Printf
|
||||
#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)
|
||||
|
||||
#include "cg_local.h"
|
||||
#include "../cgame/cg_local.h"
|
||||
|
||||
#define CLASS_Printf cgi.Printf
|
||||
#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
|
||||
|
||||
#include "scriptmaster.h"
|
||||
#include "../fgame/scriptmaster.h"
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
*/
|
||||
|
||||
#include "cm_local.h"
|
||||
#include "server.h"
|
||||
#include "../server/server.h"
|
||||
#include "../client/client.h"
|
||||
#include "tiki.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
// FPS
|
||||
#include <chrono>
|
||||
|
||||
#include <tiki.h>
|
||||
#include "tiki.h"
|
||||
|
||||
qboolean CL_FinishedIntro(void);
|
||||
void UI_PrintConsole(const char* msg);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#ifndef __CON_SET_H__
|
||||
#define __CON_SET_H__
|
||||
|
||||
#include <mem_blockalloc.h>
|
||||
#include "mem_blockalloc.h"
|
||||
|
||||
class Class;
|
||||
class Archiver;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "con_timer.h"
|
||||
|
||||
#if defined (ARCHIVE_SUPPORTED)
|
||||
#include "archive.h"
|
||||
#include "../fgame/archive.h"
|
||||
#endif
|
||||
|
||||
con_timer::con_timer(void)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
//
|
||||
// game dll specific defines
|
||||
//
|
||||
#include "g_local.h"
|
||||
#include "../fgame/g_local.h"
|
||||
|
||||
#define CONTAINER_Error gi.Error
|
||||
#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
|
||||
//
|
||||
#include "cg_local.h"
|
||||
#include "../cgame/cg_local.h"
|
||||
|
||||
#define CONTAINER_Error cgi.Error
|
||||
#define CONTAINER_DPrintf cgi.DPrintf
|
||||
|
|
|
|||
|
|
@ -1641,7 +1641,7 @@ void Cvar_Init (void)
|
|||
}
|
||||
|
||||
#ifndef STANDALONE
|
||||
#include "server.h"
|
||||
#include "../server/server.h"
|
||||
#endif
|
||||
|
||||
static void Cvar_FlagsCheck(int flags) {
|
||||
|
|
|
|||
|
|
@ -22,22 +22,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
// listener.cpp : Listener.
|
||||
|
||||
#include "scriptvariable.h"
|
||||
#include "scriptexception.h"
|
||||
#include "../script/scriptvariable.h"
|
||||
#include "../script/scriptexception.h"
|
||||
#include "Linklist.h"
|
||||
|
||||
#ifdef WITH_SCRIPT_ENGINE
|
||||
#include "archive.h"
|
||||
#include "scriptmaster.h"
|
||||
#include "scriptthread.h"
|
||||
#include "scriptclass.h"
|
||||
#include "../fgame/archive.h"
|
||||
#include "../fgame/scriptmaster.h"
|
||||
#include "../fgame/scriptthread.h"
|
||||
#include "../script/scriptclass.h"
|
||||
#endif
|
||||
|
||||
#if defined( GAME_DLL )
|
||||
|
||||
#include "../fgame/player.h"
|
||||
#include "../fgame/consoleevent.h"
|
||||
#include "animate.h"
|
||||
#include "../fgame/animate.h"
|
||||
|
||||
#define LISTENER_Cvar_Get gi.Cvar_Get
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#if defined(GAME_DLL)
|
||||
|
||||
#include "g_local.h"
|
||||
#include "../fgame/g_local.h"
|
||||
|
||||
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)
|
||||
|
||||
#include "cg_local.h"
|
||||
#include "../cgame/cg_local.h"
|
||||
|
||||
void* MEM_Alloc(int size) { return cgi.Malloc(size); }
|
||||
|
||||
|
|
|
|||
|
|
@ -22,17 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
// mem_tempalloc.cpp: Fast temporary memory manager
|
||||
|
||||
#include <mem_tempalloc.h>
|
||||
#include "mem_tempalloc.h"
|
||||
|
||||
#ifdef GAME_DLL
|
||||
#include "g_local.h"
|
||||
#include "../fgame/g_local.h"
|
||||
|
||||
#define MEM_TempAllocate(x) gi.Malloc(x)
|
||||
#define MEM_TempFree(x) gi.Free(x)
|
||||
|
||||
#elif defined(CGAME_DLL)
|
||||
|
||||
#include "cg_local.h"
|
||||
#include "../cgame/cg_local.h"
|
||||
|
||||
#define MEM_TempAllocate(x) cgi.Malloc(x)
|
||||
#define MEM_TempFree(x) cgi.Free(x)
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
// memory.c: Memory manager
|
||||
|
||||
#include <q_shared.h>
|
||||
#include <qcommon.h>
|
||||
#include "q_shared.h"
|
||||
#include "qcommon.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <Windows.h>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#if defined(GAME_DLL)
|
||||
|
||||
#include "g_local.h"
|
||||
#include "../fgame/g_local.h"
|
||||
|
||||
#define FILE_FS_FreeFile gi.FS_FreeFile
|
||||
#define FILE_FS_ReadFile(a, b) gi.FS_ReadFile(a, b, true)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#include "str.h"
|
||||
|
||||
#if defined(ARCHIVE_SUPPORTED)
|
||||
#include "archive.h"
|
||||
#include "../fgame/archive.h"
|
||||
#endif
|
||||
|
||||
#define TOKENCOMMENT (';')
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#ifdef __cplusplus
|
||||
class Archiver;
|
||||
#include <mem_blockalloc.h>
|
||||
#include <con_set.h>
|
||||
#include <str.h>
|
||||
#include "../qcommon/mem_blockalloc.h"
|
||||
#include "../qcommon/con_set.h"
|
||||
#include "../qcommon/str.h"
|
||||
#endif
|
||||
|
||||
typedef struct AliasList_s AliasList_t;
|
||||
|
|
@ -114,7 +114,7 @@ typedef struct {
|
|||
|
||||
typedef struct dloaddef_s dloaddef_t;
|
||||
|
||||
#include <tiki_script.h>
|
||||
#include "tiki_script.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#include "q_shared.h"
|
||||
#include "qcommon.h"
|
||||
#include <tiki.h>
|
||||
#include "tiki.h"
|
||||
#include "../tiki/tiki_shared.h"
|
||||
|
||||
int cache_numskel = 0;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#include "q_shared.h"
|
||||
#include "qcommon.h"
|
||||
#include <tiki.h>
|
||||
#include "tiki.h"
|
||||
|
||||
TikiScript *TikiScript::currentScript;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
#include <cmath>
|
||||
#include <cstdio>
|
||||
#include <qcommon.h>
|
||||
#include "qcommon.h"
|
||||
|
||||
//#define X 0
|
||||
//#define Y 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue