forked from OctaForge/OctaCore
change file extensions to follow convention
parent
5fc5c37873
commit
62c2b8149f
|
@ -1,55 +1,55 @@
|
||||||
client_src = [
|
client_src = [
|
||||||
'../shared/crypto.cpp',
|
'../shared/crypto.cc',
|
||||||
'../shared/geom.cpp',
|
'../shared/geom.cc',
|
||||||
'../shared/glemu.cpp',
|
'../shared/glemu.cc',
|
||||||
'../shared/stream.cpp',
|
'../shared/stream.cc',
|
||||||
'../shared/tools.cpp',
|
'../shared/tools.cc',
|
||||||
'../shared/zip.cpp',
|
'../shared/zip.cc',
|
||||||
'../engine/aa.cpp',
|
'../engine/aa.cc',
|
||||||
'../engine/bih.cpp',
|
'../engine/bih.cc',
|
||||||
'../engine/blend.cpp',
|
'../engine/blend.cc',
|
||||||
'../engine/client.cpp',
|
'../engine/client.cc',
|
||||||
'../engine/command.cpp',
|
'../engine/command.cc',
|
||||||
'../engine/console.cpp',
|
'../engine/console.cc',
|
||||||
'../engine/dynlight.cpp',
|
'../engine/dynlight.cc',
|
||||||
'../engine/grass.cpp',
|
'../engine/grass.cc',
|
||||||
'../engine/light.cpp',
|
'../engine/light.cc',
|
||||||
'../engine/main.cpp',
|
'../engine/main.cc',
|
||||||
'../engine/material.cpp',
|
'../engine/material.cc',
|
||||||
'../engine/menus.cpp',
|
'../engine/menus.cc',
|
||||||
'../engine/movie.cpp',
|
'../engine/movie.cc',
|
||||||
'../engine/normal.cpp',
|
'../engine/normal.cc',
|
||||||
'../engine/octa.cpp',
|
'../engine/octa.cc',
|
||||||
'../engine/octaedit.cpp',
|
'../engine/octaedit.cc',
|
||||||
'../engine/octarender.cpp',
|
'../engine/octarender.cc',
|
||||||
'../engine/physics.cpp',
|
'../engine/physics.cc',
|
||||||
'../engine/pvs.cpp',
|
'../engine/pvs.cc',
|
||||||
'../engine/rendergl.cpp',
|
'../engine/rendergl.cc',
|
||||||
'../engine/renderlights.cpp',
|
'../engine/renderlights.cc',
|
||||||
'../engine/rendermodel.cpp',
|
'../engine/rendermodel.cc',
|
||||||
'../engine/renderparticles.cpp',
|
'../engine/renderparticles.cc',
|
||||||
'../engine/rendersky.cpp',
|
'../engine/rendersky.cc',
|
||||||
'../engine/rendertext.cpp',
|
'../engine/rendertext.cc',
|
||||||
'../engine/renderva.cpp',
|
'../engine/renderva.cc',
|
||||||
'../engine/server.cpp',
|
'../engine/server.cc',
|
||||||
'../engine/serverbrowser.cpp',
|
'../engine/serverbrowser.cc',
|
||||||
'../engine/shader.cpp',
|
'../engine/shader.cc',
|
||||||
'../engine/sound.cpp',
|
'../engine/sound.cc',
|
||||||
'../engine/stain.cpp',
|
'../engine/stain.cc',
|
||||||
'../engine/texture.cpp',
|
'../engine/texture.cc',
|
||||||
'../engine/ui.cpp',
|
'../engine/ui.cc',
|
||||||
'../engine/water.cpp',
|
'../engine/water.cc',
|
||||||
'../engine/world.cpp',
|
'../engine/world.cc',
|
||||||
'../engine/worldio.cpp',
|
'../engine/worldio.cc',
|
||||||
'../game/ai.cpp',
|
'../game/ai.cc',
|
||||||
'../game/client.cpp',
|
'../game/client.cc',
|
||||||
'../game/entities.cpp',
|
'../game/entities.cc',
|
||||||
'../game/game.cpp',
|
'../game/game.cc',
|
||||||
'../game/render.cpp',
|
'../game/render.cc',
|
||||||
'../game/scoreboard.cpp',
|
'../game/scoreboard.cc',
|
||||||
'../game/server.cpp',
|
'../game/server.cc',
|
||||||
'../game/waypoint.cpp',
|
'../game/waypoint.cc',
|
||||||
'../game/weapon.cpp'
|
'../game/weapon.cc'
|
||||||
]
|
]
|
||||||
|
|
||||||
threads_dep = dependency('threads')
|
threads_dep = dependency('threads')
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
extern int intel_texalpha_bug;
|
extern int intel_texalpha_bug;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
extern vec hitsurface;
|
extern vec hitsurface;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
// client.cpp, mostly network related client game code
|
// client.cpp, mostly network related client game code
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
ENetHost *clienthost = NULL;
|
ENetHost *clienthost = NULL;
|
||||||
ENetPeer *curpeer = NULL, *connpeer = NULL;
|
ENetPeer *curpeer = NULL, *connpeer = NULL;
|
|
@ -1,7 +1,7 @@
|
||||||
// command.cpp: implements the parsing and execution of a tiny script language which
|
// command.cpp: implements the parsing and execution of a tiny script language which
|
||||||
// is largely backwards compatible with the quake console language.
|
// is largely backwards compatible with the quake console language.
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
hashnameset<ident> idents; // contains ALL vars/commands/aliases
|
hashnameset<ident> idents; // contains ALL vars/commands/aliases
|
||||||
vector<ident *> identmap;
|
vector<ident *> identmap;
|
|
@ -1,6 +1,6 @@
|
||||||
// console.cpp: the console buffer, its display, and command line control
|
// console.cpp: the console buffer, its display, and command line control
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
#define MAXCONLINES 1000
|
#define MAXCONLINES 1000
|
||||||
struct cline { char *line; int type, outtime; };
|
struct cline { char *line; int type, outtime; };
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
VARNP(dynlights, usedynlights, 0, 1, 1);
|
VARNP(dynlights, usedynlights, 0, 1, 1);
|
||||||
VARP(dynlightdist, 0, 1024, 10000);
|
VARP(dynlightdist, 0, 1024, 10000);
|
|
@ -1,16 +1,16 @@
|
||||||
#ifndef __ENGINE_H__
|
#ifndef __ENGINE_H__
|
||||||
#define __ENGINE_H__
|
#define __ENGINE_H__
|
||||||
|
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
#include "world.h"
|
#include "world.hh"
|
||||||
|
|
||||||
#ifndef STANDALONE
|
#ifndef STANDALONE
|
||||||
|
|
||||||
#include "octa.h"
|
#include "octa.hh"
|
||||||
#include "light.h"
|
#include "light.hh"
|
||||||
#include "texture.h"
|
#include "texture.hh"
|
||||||
#include "bih.h"
|
#include "bih.hh"
|
||||||
#include "model.h"
|
#include "model.hh"
|
||||||
|
|
||||||
extern dynent *player;
|
extern dynent *player;
|
||||||
extern physent *camera1; // special ent that acts as camera, same object as player1 in FPS mode
|
extern physent *camera1; // special ent that acts as camera, same object as player1 in FPS mode
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
VARP(grass, 0, 1, 1);
|
VARP(grass, 0, 1, 1);
|
||||||
VAR(dbggrass, 0, 0, 1);
|
VAR(dbggrass, 0, 0, 1);
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
CVAR1R(ambient, 0x191919);
|
CVAR1R(ambient, 0x191919);
|
||||||
FVARR(ambientscale, 0, 1, 16);
|
FVARR(ambientscale, 0, 1, 16);
|
|
@ -1,6 +1,6 @@
|
||||||
// main.cpp: initialisation & main loop
|
// main.cpp: initialisation & main loop
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
extern void cleargamma();
|
extern void cleargamma();
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#define __FD_SETSIZE 4096
|
#define __FD_SETSIZE 4096
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <enet/time.h>
|
#include <enet/time.h>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
struct QuadNode
|
struct QuadNode
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
void notifywelcome()
|
void notifywelcome()
|
||||||
{
|
{
|
|
@ -7,7 +7,7 @@
|
||||||
// avidemux - ok - 3Apr09-RockKeyman:had to swap UV channels as it showed up blue
|
// avidemux - ok - 3Apr09-RockKeyman:had to swap UV channels as it showed up blue
|
||||||
// kino - ok
|
// kino - ok
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include "SDL2_mixer/SDL_mixer.h"
|
#include "SDL2_mixer/SDL_mixer.h"
|
||||||
#else
|
#else
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
struct normalkey
|
struct normalkey
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
// core world management routines
|
// core world management routines
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
static struct emptycube : cube
|
static struct emptycube : cube
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
extern int outline;
|
extern int outline;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// octarender.cpp: fill vertex arrays with different cube surfaces.
|
// octarender.cpp: fill vertex arrays with different cube surfaces.
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
struct vboinfo
|
struct vboinfo
|
||||||
{
|
{
|
|
@ -0,0 +1,2 @@
|
||||||
|
#include "engine.hh"
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
#include "engine.h"
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
// they "felt right", and have no basis in reality. Collision detection is simplistic but
|
// they "felt right", and have no basis in reality. Collision detection is simplistic but
|
||||||
// very robust (uses discrete steps at fixed fps).
|
// very robust (uses discrete steps at fixed fps).
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
#include "mpr.h"
|
#include "mpr.hh"
|
||||||
|
|
||||||
const int MAXCLIPOFFSET = 4;
|
const int MAXCLIPOFFSET = 4;
|
||||||
const int MAXCLIPPLANES = 1024;
|
const int MAXCLIPPLANES = 1024;
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
// rendergl.cpp: core opengl rendering stuff
|
// rendergl.cpp: core opengl rendering stuff
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
bool hasS3TC = false, hasFXT1 = false, hasLATC = false, hasAF = false, hasFBMSBS = false, hasDBT = false, hasDBGO = false, hasES3 = false, hasCI = false;
|
bool hasS3TC = false, hasFXT1 = false, hasLATC = false, hasAF = false, hasFBMSBS = false, hasDBT = false, hasDBGO = false, hasES3 = false, hasCI = false;
|
||||||
bool mesa = false, intel = false, amd = false, nvidia = false;
|
bool mesa = false, intel = false, amd = false, nvidia = false;
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
int gw = -1, gh = -1, bloomw = -1, bloomh = -1, lasthdraccum = 0;
|
int gw = -1, gh = -1, bloomw = -1, bloomh = -1, lasthdraccum = 0;
|
||||||
GLuint gfbo = 0, gdepthtex = 0, gcolortex = 0, gnormaltex = 0, gglowtex = 0, gdepthrb = 0, gstencilrb = 0;
|
GLuint gfbo = 0, gdepthtex = 0, gcolortex = 0, gnormaltex = 0, gglowtex = 0, gdepthrb = 0, gstencilrb = 0;
|
|
@ -1,15 +1,15 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
VAR(oqdynent, 0, 1, 1);
|
VAR(oqdynent, 0, 1, 1);
|
||||||
VAR(animationinterpolationtime, 0, 200, 1000);
|
VAR(animationinterpolationtime, 0, 200, 1000);
|
||||||
|
|
||||||
model *loadingmodel = NULL;
|
model *loadingmodel = NULL;
|
||||||
|
|
||||||
#include "ragdoll.h"
|
#include "ragdoll.hh"
|
||||||
#include "animmodel.h"
|
#include "animmodel.hh"
|
||||||
#include "vertmodel.h"
|
#include "vertmodel.hh"
|
||||||
#include "skelmodel.h"
|
#include "skelmodel.hh"
|
||||||
#include "hitzone.h"
|
#include "hitzone.hh"
|
||||||
|
|
||||||
static model *(__cdecl *modeltypes[NUMMODELTYPES])(const char *);
|
static model *(__cdecl *modeltypes[NUMMODELTYPES])(const char *);
|
||||||
|
|
||||||
|
@ -26,12 +26,12 @@ static model *__loadmodel__##modelclass(const char *filename) \
|
||||||
} \
|
} \
|
||||||
UNUSED static int __dummy__##modelclass = addmodeltype((modeltype), __loadmodel__##modelclass);
|
UNUSED static int __dummy__##modelclass = addmodeltype((modeltype), __loadmodel__##modelclass);
|
||||||
|
|
||||||
#include "md2.h"
|
#include "md2.hh"
|
||||||
#include "md3.h"
|
#include "md3.hh"
|
||||||
#include "md5.h"
|
#include "md5.hh"
|
||||||
#include "obj.h"
|
#include "obj.hh"
|
||||||
#include "smd.h"
|
#include "smd.hh"
|
||||||
#include "iqm.h"
|
#include "iqm.hh"
|
||||||
|
|
||||||
MODELTYPE(MDL_MD2, md2);
|
MODELTYPE(MDL_MD2, md2);
|
||||||
MODELTYPE(MDL_MD3, md3);
|
MODELTYPE(MDL_MD3, md3);
|
|
@ -1,6 +1,6 @@
|
||||||
// renderparticles.cpp
|
// renderparticles.cpp
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
Shader *particleshader = NULL, *particlenotextureshader = NULL, *particlesoftshader = NULL, *particletextshader = NULL;
|
Shader *particleshader = NULL, *particlenotextureshader = NULL, *particlesoftshader = NULL, *particletextshader = NULL;
|
||||||
|
|
||||||
|
@ -825,9 +825,9 @@ typedef varenderer<PT_PART> quadrenderer;
|
||||||
typedef varenderer<PT_TAPE> taperenderer;
|
typedef varenderer<PT_TAPE> taperenderer;
|
||||||
typedef varenderer<PT_TRAIL> trailrenderer;
|
typedef varenderer<PT_TRAIL> trailrenderer;
|
||||||
|
|
||||||
#include "explosion.h"
|
#include "explosion.hh"
|
||||||
#include "lensflare.h"
|
#include "lensflare.hh"
|
||||||
#include "lightning.h"
|
#include "lightning.hh"
|
||||||
|
|
||||||
struct softquadrenderer : quadrenderer
|
struct softquadrenderer : quadrenderer
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
|
Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
static hashnameset<font> fonts;
|
static hashnameset<font> fonts;
|
||||||
static font *fontdef = NULL;
|
static font *fontdef = NULL;
|
|
@ -1,6 +1,6 @@
|
||||||
// renderva.cpp: handles the occlusion and rendering of vertex arrays
|
// renderva.cpp: handles the occlusion and rendering of vertex arrays
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
|
static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
|
||||||
{
|
{
|
|
@ -1,7 +1,7 @@
|
||||||
// server.cpp: little more than enhanced multicaster
|
// server.cpp: little more than enhanced multicaster
|
||||||
// runs dedicated or as client coroutine
|
// runs dedicated or as client coroutine
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
#define LOGSTRLEN 512
|
#define LOGSTRLEN 512
|
||||||
|
|
||||||
|
@ -739,7 +739,7 @@ void localconnect()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "shellapi.h"
|
#include "shellapi.hh"
|
||||||
|
|
||||||
#define IDI_ICON1 1
|
#define IDI_ICON1 1
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
struct resolverthread
|
struct resolverthread
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
// shader.cpp: OpenGL GLSL shader management
|
// shader.cpp: OpenGL GLSL shader management
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
Shader *Shader::lastshader = NULL;
|
Shader *Shader::lastshader = NULL;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// sound.cpp: basic positional sound using sdl_mixer
|
// sound.cpp: basic positional sound using sdl_mixer
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include "SDL2_mixer/SDL_mixer.h"
|
#include "SDL2_mixer/SDL_mixer.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
struct stainvert
|
struct stainvert
|
||||||
{
|
{
|
|
@ -1,6 +1,6 @@
|
||||||
// texture.cpp: texture slot management
|
// texture.cpp: texture slot management
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include "SDL2_image/SDL_image.h"
|
#include "SDL2_image/SDL_image.h"
|
|
@ -1,5 +1,5 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
#include "textedit.h"
|
#include "textedit.hh"
|
||||||
|
|
||||||
namespace UI
|
namespace UI
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
#define NUMCAUSTICS 32
|
#define NUMCAUSTICS 32
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// world.cpp: core map management stuff
|
// world.cpp: core map management stuff
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
VARR(mapversion, 1, MAPVERSION, 0);
|
VARR(mapversion, 1, MAPVERSION, 0);
|
||||||
VARNR(mapscale, worldscale, 1, 0, 0);
|
VARNR(mapscale, worldscale, 1, 0, 0);
|
|
@ -1,6 +1,6 @@
|
||||||
// worldio.cpp: loading & saving of maps and savegames
|
// worldio.cpp: loading & saving of maps and savegames
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.hh"
|
||||||
|
|
||||||
void validmapname(char *dst, const char *src, const char *prefix = NULL, const char *alt = "untitled", size_t maxlen = 100)
|
void validmapname(char *dst, const char *src, const char *prefix = NULL, const char *alt = "untitled", size_t maxlen = 100)
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
extern int fog;
|
extern int fog;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ namespace game
|
||||||
if(dead) gle::end();
|
if(dead) gle::end();
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "ctf.h"
|
#include "ctf.hh"
|
||||||
|
|
||||||
clientmode *cmode = NULL;
|
clientmode *cmode = NULL;
|
||||||
ctfclientmode ctfmode;
|
ctfclientmode ctfmode;
|
||||||
|
@ -1917,7 +1917,7 @@ namespace game
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PARSEMESSAGES 1
|
#define PARSEMESSAGES 1
|
||||||
#include "ctf.h"
|
#include "ctf.hh"
|
||||||
#undef PARSEMESSAGES
|
#undef PARSEMESSAGES
|
||||||
|
|
||||||
case N_NEWMAP:
|
case N_NEWMAP:
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace entities
|
namespace entities
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __GAME_H__
|
#ifndef __GAME_H__
|
||||||
#define __GAME_H__
|
#define __GAME_H__
|
||||||
|
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
// animations
|
// animations
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ static const struct guninfo { const char *name, *file, *vwep; int attacks[NUMACT
|
||||||
{ "pulse rifle", "pulserifle", "worldgun/pulserifle", { -1, ATK_PULSE_SHOOT, ATK_PULSE_MELEE } }
|
{ "pulse rifle", "pulserifle", "worldgun/pulserifle", { -1, ATK_PULSE_SHOOT, ATK_PULSE_MELEE } }
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "ai.h"
|
#include "ai.hh"
|
||||||
|
|
||||||
// inherited by gameent and server clients
|
// inherited by gameent and server clients
|
||||||
struct gamestate
|
struct gamestate
|
|
@ -0,0 +1,2 @@
|
||||||
|
#include "game.hh"
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
#include "game.h"
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
|
@ -1,5 +1,5 @@
|
||||||
// creation of scoreboard
|
// creation of scoreboard
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
||||||
|
@ -839,7 +839,7 @@ namespace server
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SERVMODE 1
|
#define SERVMODE 1
|
||||||
#include "ctf.h"
|
#include "ctf.hh"
|
||||||
|
|
||||||
ctfservmode ctfmode;
|
ctfservmode ctfmode;
|
||||||
servmode *smode = NULL;
|
servmode *smode = NULL;
|
||||||
|
@ -3532,7 +3532,7 @@ namespace server
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#define PARSEMESSAGES 1
|
#define PARSEMESSAGES 1
|
||||||
#include "ctf.h"
|
#include "ctf.hh"
|
||||||
#undef PARSEMESSAGES
|
#undef PARSEMESSAGES
|
||||||
|
|
||||||
case -1:
|
case -1:
|
||||||
|
@ -3564,7 +3564,7 @@ namespace server
|
||||||
int masterport() { return TESSERACT_MASTER_PORT; }
|
int masterport() { return TESSERACT_MASTER_PORT; }
|
||||||
int numchannels() { return 3; }
|
int numchannels() { return 3; }
|
||||||
|
|
||||||
#include "extinfo.h"
|
#include "extinfo.hh"
|
||||||
|
|
||||||
void serverinforeply(ucharbuf &req, ucharbuf &p)
|
void serverinforeply(ucharbuf &req, ucharbuf &p)
|
||||||
{
|
{
|
||||||
|
@ -3593,6 +3593,6 @@ namespace server
|
||||||
|
|
||||||
int protocolversion() { return PROTOCOL_VERSION; }
|
int protocolversion() { return PROTOCOL_VERSION; }
|
||||||
|
|
||||||
#include "aiman.h"
|
#include "aiman.hh"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
extern selinfo sel;
|
extern selinfo sel;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
// weapon.cpp: all shooting and effects code, projectile management
|
// weapon.cpp: all shooting and effects code, projectile management
|
||||||
#include "game.h"
|
#include "game.hh"
|
||||||
|
|
||||||
namespace game
|
namespace game
|
||||||
{
|
{
|
|
@ -1,9 +1,9 @@
|
||||||
client_src = [
|
client_src = [
|
||||||
'../shared/crypto.cpp',
|
'../shared/crypto.cc',
|
||||||
'../shared/stream.cpp',
|
'../shared/stream.cc',
|
||||||
'../shared/tools.cpp',
|
'../shared/tools.cc',
|
||||||
'../engine/command.cpp',
|
'../engine/command.cc',
|
||||||
'../engine/master.cpp'
|
'../engine/master.cc'
|
||||||
]
|
]
|
||||||
|
|
||||||
threads_dep = dependency('threads')
|
threads_dep = dependency('threads')
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
client_src = [
|
client_src = [
|
||||||
'../shared/crypto.cpp',
|
'../shared/crypto.cc',
|
||||||
'../shared/stream.cpp',
|
'../shared/stream.cc',
|
||||||
'../shared/tools.cpp',
|
'../shared/tools.cc',
|
||||||
'../engine/command.cpp',
|
'../engine/command.cc',
|
||||||
'../engine/server.cpp',
|
'../engine/server.cc',
|
||||||
'../engine/worldio.cpp',
|
'../engine/worldio.cc',
|
||||||
'../game/entities.cpp',
|
'../game/entities.cc',
|
||||||
'../game/server.cpp'
|
'../game/server.cc'
|
||||||
]
|
]
|
||||||
|
|
||||||
threads_dep = dependency('threads')
|
threads_dep = dependency('threads')
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
///////////////////////// cryptography /////////////////////////////////
|
///////////////////////// cryptography /////////////////////////////////
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#endif
|
#endif
|
||||||
#define _WIN32_WINNT 0x0500
|
#define _WIN32_WINNT 0x0500
|
||||||
#include "windows.h"
|
#include "windows.hh"
|
||||||
#ifndef _WINDOWS
|
#ifndef _WINDOWS
|
||||||
#define _WINDOWS
|
#define _WINDOWS
|
||||||
#endif
|
#endif
|
||||||
|
@ -53,18 +53,18 @@
|
||||||
|
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
#include "tools.h"
|
#include "tools.hh"
|
||||||
#include "geom.h"
|
#include "geom.hh"
|
||||||
#include "ents.h"
|
#include "ents.hh"
|
||||||
#include "command.h"
|
#include "command.hh"
|
||||||
|
|
||||||
#ifndef STANDALONE
|
#ifndef STANDALONE
|
||||||
#include "glexts.h"
|
#include "glexts.hh"
|
||||||
#include "glemu.h"
|
#include "glemu.hh"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "iengine.h"
|
#include "iengine.hh"
|
||||||
#include "igame.h"
|
#include "igame.hh"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
static inline double det2x2(double a, double b, double c, double d) { return a*d - b*c; }
|
static inline double det2x2(double a, double b, double c, double d) { return a*d - b*c; }
|
||||||
static inline double det3x3(double a1, double a2, double a3,
|
static inline double det3x3(double a1, double a2, double a3,
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
namespace gle
|
namespace gle
|
||||||
{
|
{
|
|
@ -0,0 +1 @@
|
||||||
|
#include "cube.hh"
|
|
@ -1 +0,0 @@
|
||||||
#include "cube.h"
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
///////////////////////// character conversion ///////////////
|
///////////////////////// character conversion ///////////////
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// implementation of generic tools
|
// implementation of generic tools
|
||||||
|
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
void *operator new(size_t size)
|
void *operator new(size_t size)
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.h"
|
#include "cube.hh"
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
Loading…
Reference in New Issue