libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2024-11-23 16:10:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

world: re-order header includes for merging

Browse Source 
Also include the correct model file for SW vs. GL.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-11-13 09:10:40 +10:30
parent 79a44f2fd3
commit d33296695c
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NQ/world.c
View File

@ -19,14 +19,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// world.c -- world query functions
#include "bspfile.h"
#include "console.h"
#include "host.h"
#include "mathlib.h"
#include "progs.h"
#include "quakedef.h"
#include "server.h"
#include "sys.h"
#include "world.h"
#ifdef GLQUAKE
#include "gl_model.h"
#else
#include "model.h"
#endif
#include "quakedef.h"
#include "host.h"
#include "sys.h"
/* FIXME - quick hack to enable merging of NQ/QWSV shared code */
#define SV_Error Sys_Error

8
QW/server/world.c
View File

@ -22,12 +22,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "bspfile.h"
#include "console.h"
#include "mathlib.h"
#include "model.h"
#include "pmove.h"
#include "qwsvdef.h"
#include "progs.h"
#include "server.h"
#include "world.h"
#include "model.h"
#include "qwsvdef.h"
#include "pmove.h"
/*
entities never clip against themselves, or their owner