qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-14 06:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed up a bit more that should use HAVE_MASM

Browse source
This commit is contained in:
Jamie Wilkinson 2002-04-12 14:47:58 +00:00
parent 309c37b9c2
commit 476f5e4ae9
4 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/baseq2/q_shared.h
View file

@ -143,9 +143,11 @@ struct cplane_s;
extern vec3_t vec3_origin; extern vec3_t vec3_origin;
/* unused
#define nanmask (255<<23) #define nanmask (255<<23)
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
*/
/* FIXME: (jaq) use them C99 functions instead */ /* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...

2
src/ctf/q_shared.h
View file

@ -143,9 +143,11 @@ struct cplane_s;
extern vec3_t vec3_origin; extern vec3_t vec3_origin;
/* unused
#define nanmask (255<<23) #define nanmask (255<<23)
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
*/
/* FIXME: (jaq) use them C99 functions instead */ /* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...

42
src/q_shared.c
View file

@ -1,22 +1,28 @@
/* /* $Id$
Copyright (C) 1997-2001 Id Software, Inc. *
* Copyright (C) 1997-2001 Id Software, Inc.
* Copyright (c) 2002 The Quakeforge Project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
This program is free software; you can redistribute it and/or #ifdef HAVE_CONFIG_H
modify it under the terms of the GNU General Public License # include "config.h"
as published by the Free Software Foundation; either version 2 #endif
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "q_shared.h" #include "q_shared.h"
#define DEG2RAD( a ) ( a * M_PI ) / 180.0F #define DEG2RAD( a ) ( a * M_PI ) / 180.0F
@ -345,7 +351,7 @@ BoxOnPlaneSide
Returns 1, 2, or 1 + 2 Returns 1, 2, or 1 + 2
================== ==================
*/ */
#ifdef USE_ASM #ifdef HAVE_MASM
# pragma warning( disable: 4035 ) # pragma warning( disable: 4035 )
__declspec( naked ) int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p) __declspec( naked ) int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)

40
src/q_shared.h
View file

@ -1,22 +1,24 @@
/* /* $Id$
Copyright (C) 1997-2001 Id Software, Inc. *
* Copyright (C) 1997-2001 Id Software, Inc.
* Copyright (c) 2002 The Quakeforge Project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "gcc_attr.h" #include "gcc_attr.h"
// q_shared.h -- included first by ALL program modules // q_shared.h -- included first by ALL program modules
@ -143,9 +145,11 @@ struct cplane_s;
extern vec3_t vec3_origin; extern vec3_t vec3_origin;
/* unused
#define nanmask (255<<23) #define nanmask (255<<23)
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
*/
/* FIXME: (jaq) use them C99 functions instead */ /* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...