rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-17 01:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

More cleaning up.

Browse source
This commit is contained in:
Andrei Drexler 2009-07-03 19:58:55 +00:00
parent b3bc436778
commit c468f8cb35
10 changed files with 317 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reaction/code/cgame/cg_local.h
View file

@ -403,11 +403,10 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 1999-2000 Id Software, Inc. // Copyright (C) 1999-2000 Id Software, Inc.
// //
#include "../game/q_shared.h" #include "../qcommon/q_shared.h"
#include "tr_types.h" #include "tr_types.h"
#include "../game/bg_public.h" #include "../game/bg_public.h"
#include "cg_public.h" #include "cg_public.h"
#include "../game/q_shared.h" // Added by ClassView
// The entire cgame module is unloaded and reloaded on each level change, // The entire cgame module is unloaded and reloaded on each level change,
// so there is NO persistant data between levels on the client side. // so there is NO persistant data between levels on the client side.

8
reaction/code/cgame/cg_weapons.c
View file

@ -728,23 +728,23 @@ void CG_RegisterWeapon(int weaponNum)
} }
strcpy(path, item->world_model[0]); strcpy(path, item->world_model[0]);
COM_StripExtension(path, path); COM_StripExtensionInPlace(path);
strcat(path, "_flash.md3"); strcat(path, "_flash.md3");
weaponInfo->flashModel = trap_R_RegisterModel(path); weaponInfo->flashModel = trap_R_RegisterModel(path);
strcpy(path, item->world_model[0]); strcpy(path, item->world_model[0]);
COM_StripExtension(path, path); COM_StripExtensionInPlace(path);
strcat(path, "_barrel.md3"); strcat(path, "_barrel.md3");
weaponInfo->barrelModel = trap_R_RegisterModel(path); weaponInfo->barrelModel = trap_R_RegisterModel(path);
strcpy(path, item->world_model[0]); strcpy(path, item->world_model[0]);
COM_StripExtension(path, path); COM_StripExtensionInPlace(path);
strcat(path, "_hand.md3"); strcat(path, "_hand.md3");
weaponInfo->handsModel = trap_R_RegisterModel(path); weaponInfo->handsModel = trap_R_RegisterModel(path);
//Elder: added to cache 1st-person models //Elder: added to cache 1st-person models
strcpy(path, item->world_model[0]); strcpy(path, item->world_model[0]);
COM_StripExtension(path, path); COM_StripExtensionInPlace(path);
strcat(path, "_1st.md3"); strcat(path, "_1st.md3");
weaponInfo->firstModel = trap_R_RegisterModel(path); weaponInfo->firstModel = trap_R_RegisterModel(path);

32
reaction/code/game/bg_public.h
View file

@ -1592,6 +1592,38 @@ int GetIntBytes(char *buf, char count);
//matches any of the tokens in the second string //matches any of the tokens in the second string
qboolean IdMatchesString(const char *id, const char *match); qboolean IdMatchesString(const char *id, const char *match);
//Makro - for the new surfaceparm system
#define MAT_DEFAULT 0
#define MAT_METALSTEPS 1
#define MAT_GRAVEL 2
#define MAT_WOOD 3
#define MAT_CARPET 4
#define MAT_METAL2 5
#define MAT_GLASS 6
#define MAT_GRASS 7
#define MAT_SNOW 8
#define MAT_MUD 9
#define MAT_WOOD2 10
#define MAT_HARDMETAL 11
#define MAT_LEAVES 12
#define MAT_CEMENT 13
#define MAT_MARBLE 14
#define MAT_SNOW2 15
#define MAT_HARDSTEPS 16
#define MAT_SAND 17
#define MAT_BRICK 18
#define MAT_CERAMIC 19
int GetMaterialFromFlag(int flag);
#define IsMetalMat(Mat) ( (Mat)==MAT_METALSTEPS || (Mat)==MAT_METAL2 || (Mat)==MAT_HARDMETAL )
#define IsMetalFlag(Flag) ( IsMetalMat( GetMaterialFromFlag( Flag ) ) )
#define IsWoodMat(Mat) ( (Mat)==MAT_WOOD || (Mat)==MAT_WOOD2 )
#define IsWoodFlag(Flag) ( IsWoodMat( GetMaterialFromFlag( Flag ) ) )
#define IsSnowMat(Mat) ( (Mat)==MAT_SNOW || (Mat)==MAT_SNOW2 )
#define IsSnowFlag(Flag) ( IsSnowMat( GetMaterialFromFlag( Flag ) ) )
float SawTooth(int time, int period); float SawTooth(int time, int period);

2
reaction/code/game/g_missile.c
View file

@ -63,8 +63,6 @@
// Copyright (C) 1999-2000 Id Software, Inc. // Copyright (C) 1999-2000 Id Software, Inc.
// //
#include "g_local.h" #include "g_local.h"
//Makro - to get the new surfaceparm system to work :/
#include "surfaceflags.h"
#define MISSILE_PRESTEP_TIME 50 #define MISSILE_PRESTEP_TIME 50

1
reaction/code/game/g_weapon.c
View file

@ -202,7 +202,6 @@
// perform the server side effects of a weapon firing // perform the server side effects of a weapon firing
#include "g_local.h" #include "g_local.h"
#include "surfaceflags.h"
// JBravo: for warnings // JBravo: for warnings
void Use_BinaryMover(gentity_t * ent, gentity_t * other, gentity_t * activator); void Use_BinaryMover(gentity_t * ent, gentity_t * other, gentity_t * activator);

344
reaction/code/qcommon/q_math.c
View file

@ -60,90 +60,266 @@ vec4_t g_color_table[8] =
}; };
vec3_t bytedirs[NUMVERTEXNORMALS] = //Makro - new table; this allows for a much faster DirToByte function
{ vec3_t bytedirs[NUMVERTEXNORMALS] =
{-0.525731f, 0.000000f, 0.850651f}, {-0.442863f, 0.238856f, 0.864188f}, {
{-0.295242f, 0.000000f, 0.955423f}, {-0.309017f, 0.500000f, 0.809017f}, { 1.00000000f, 0.00000000f, 0.00000000f },
{-0.162460f, 0.262866f, 0.951056f}, {0.000000f, 0.000000f, 1.000000f}, { 0.92387950f, 0.38268346f, 0.00000000f },
{0.000000f, 0.850651f, 0.525731f}, {-0.147621f, 0.716567f, 0.681718f}, { 0.70710677f, 0.70710677f, 0.00000000f },
{0.147621f, 0.716567f, 0.681718f}, {0.000000f, 0.525731f, 0.850651f}, { 0.38268343f, 0.92387950f, 0.00000000f },
{0.309017f, 0.500000f, 0.809017f}, {0.525731f, 0.000000f, 0.850651f}, { -0.00000004f, 1.00000000f, 0.00000000f },
{0.295242f, 0.000000f, 0.955423f}, {0.442863f, 0.238856f, 0.864188f}, { -0.38268340f, 0.92387956f, 0.00000000f },
{0.162460f, 0.262866f, 0.951056f}, {-0.681718f, 0.147621f, 0.716567f}, { -0.70710677f, 0.70710677f, 0.00000000f },
{-0.809017f, 0.309017f, 0.500000f},{-0.587785f, 0.425325f, 0.688191f}, { -0.92387950f, 0.38268349f, 0.00000000f },
{-0.850651f, 0.525731f, 0.000000f},{-0.864188f, 0.442863f, 0.238856f}, { -1.00000000f, -0.00000009f, 0.00000000f },
{-0.716567f, 0.681718f, 0.147621f},{-0.688191f, 0.587785f, 0.425325f}, { -0.92387950f, -0.38268343f, 0.00000000f },
{-0.500000f, 0.809017f, 0.309017f}, {-0.238856f, 0.864188f, 0.442863f}, { -0.70710683f, -0.70710671f, 0.00000000f },
{-0.425325f, 0.688191f, 0.587785f}, {-0.716567f, 0.681718f, -0.147621f}, { -0.38268358f, -0.92387950f, 0.00000000f },
{-0.500000f, 0.809017f, -0.309017f}, {-0.525731f, 0.850651f, 0.000000f}, { 0.00000001f, -1.00000000f, 0.00000000f },
{0.000000f, 0.850651f, -0.525731f}, {-0.238856f, 0.864188f, -0.442863f}, { 0.38268360f, -0.92387944f, 0.00000000f },
{0.000000f, 0.955423f, -0.295242f}, {-0.262866f, 0.951056f, -0.162460f}, { 0.70710665f, -0.70710689f, 0.00000000f },
{0.000000f, 1.000000f, 0.000000f}, {0.000000f, 0.955423f, 0.295242f}, { 0.92387956f, -0.38268343f, 0.00000000f },
{-0.262866f, 0.951056f, 0.162460f}, {0.238856f, 0.864188f, 0.442863f}, { 0.92387950f, 0.00000000f, -0.38268346f },
{0.262866f, 0.951056f, 0.162460f}, {0.500000f, 0.809017f, 0.309017f}, { 0.85355335f, 0.35355341f, -0.38268346f },
{0.238856f, 0.864188f, -0.442863f},{0.262866f, 0.951056f, -0.162460f}, { 0.65328145f, 0.65328145f, -0.38268346f },
{0.500000f, 0.809017f, -0.309017f},{0.850651f, 0.525731f, 0.000000f}, { 0.35355338f, 0.85355335f, -0.38268346f },
{0.716567f, 0.681718f, 0.147621f}, {0.716567f, 0.681718f, -0.147621f}, { -0.00000004f, 0.92387950f, -0.38268346f },
{0.525731f, 0.850651f, 0.000000f}, {0.425325f, 0.688191f, 0.587785f}, { -0.35355335f, 0.85355341f, -0.38268346f },
{0.864188f, 0.442863f, 0.238856f}, {0.688191f, 0.587785f, 0.425325f}, { -0.65328145f, 0.65328145f, -0.38268346f },
{0.809017f, 0.309017f, 0.500000f}, {0.681718f, 0.147621f, 0.716567f}, { -0.85355335f, 0.35355341f, -0.38268346f },
{0.587785f, 0.425325f, 0.688191f}, {0.955423f, 0.295242f, 0.000000f}, { -0.92387950f, -0.00000008f, -0.38268346f },
{1.000000f, 0.000000f, 0.000000f}, {0.951056f, 0.162460f, 0.262866f}, { -0.85355335f, -0.35355338f, -0.38268346f },
{0.850651f, -0.525731f, 0.000000f},{0.955423f, -0.295242f, 0.000000f}, { -0.65328151f, -0.65328139f, -0.38268346f },
{0.864188f, -0.442863f, 0.238856f}, {0.951056f, -0.162460f, 0.262866f}, { -0.35355350f, -0.85355335f, -0.38268346f },
{0.809017f, -0.309017f, 0.500000f}, {0.681718f, -0.147621f, 0.716567f}, { 0.00000001f, -0.92387950f, -0.38268346f },
{0.850651f, 0.000000f, 0.525731f}, {0.864188f, 0.442863f, -0.238856f}, { 0.35355353f, -0.85355330f, -0.38268346f },
{0.809017f, 0.309017f, -0.500000f}, {0.951056f, 0.162460f, -0.262866f}, { 0.65328133f, -0.65328157f, -0.38268346f },
{0.525731f, 0.000000f, -0.850651f}, {0.681718f, 0.147621f, -0.716567f}, { 0.85355341f, -0.35355338f, -0.38268346f },
{0.681718f, -0.147621f, -0.716567f},{0.850651f, 0.000000f, -0.525731f}, { 0.70710677f, 0.00000000f, -0.70710677f },
{0.809017f, -0.309017f, -0.500000f}, {0.864188f, -0.442863f, -0.238856f}, { 0.65328145f, 0.27059805f, -0.70710677f },
{0.951056f, -0.162460f, -0.262866f}, {0.147621f, 0.716567f, -0.681718f}, { 0.49999997f, 0.49999997f, -0.70710677f },
{0.309017f, 0.500000f, -0.809017f}, {0.425325f, 0.688191f, -0.587785f}, { 0.27059805f, 0.65328145f, -0.70710677f },
{0.442863f, 0.238856f, -0.864188f}, {0.587785f, 0.425325f, -0.688191f}, { -0.00000003f, 0.70710677f, -0.70710677f },
{0.688191f, 0.587785f, -0.425325f}, {-0.147621f, 0.716567f, -0.681718f}, { -0.27059802f, 0.65328151f, -0.70710677f },
{-0.309017f, 0.500000f, -0.809017f}, {0.000000f, 0.525731f, -0.850651f}, { -0.49999997f, 0.49999997f, -0.70710677f },
{-0.525731f, 0.000000f, -0.850651f}, {-0.442863f, 0.238856f, -0.864188f}, { -0.65328145f, 0.27059808f, -0.70710677f },
{-0.295242f, 0.000000f, -0.955423f}, {-0.162460f, 0.262866f, -0.951056f}, { -0.70710677f, -0.00000006f, -0.70710677f },
{0.000000f, 0.000000f, -1.000000f}, {0.295242f, 0.000000f, -0.955423f}, { -0.65328145f, -0.27059805f, -0.70710677f },
{0.162460f, 0.262866f, -0.951056f}, {-0.442863f, -0.238856f, -0.864188f}, { -0.50000000f, -0.49999994f, -0.70710677f },
{-0.309017f, -0.500000f, -0.809017f}, {-0.162460f, -0.262866f, -0.951056f}, { -0.27059814f, -0.65328145f, -0.70710677f },
{0.000000f, -0.850651f, -0.525731f}, {-0.147621f, -0.716567f, -0.681718f}, { 0.00000001f, -0.70710677f, -0.70710677f },
{0.147621f, -0.716567f, -0.681718f}, {0.000000f, -0.525731f, -0.850651f}, { 0.27059817f, -0.65328139f, -0.70710677f },
{0.309017f, -0.500000f, -0.809017f}, {0.442863f, -0.238856f, -0.864188f}, { 0.49999991f, -0.50000006f, -0.70710677f },
{0.162460f, -0.262866f, -0.951056f}, {0.238856f, -0.864188f, -0.442863f}, { 0.65328151f, -0.27059805f, -0.70710677f },
{0.500000f, -0.809017f, -0.309017f}, {0.425325f, -0.688191f, -0.587785f}, { 0.38268343f, 0.00000000f, -0.92387950f },
{0.716567f, -0.681718f, -0.147621f}, {0.688191f, -0.587785f, -0.425325f}, { 0.35355338f, 0.14644662f, -0.92387950f },
{0.587785f, -0.425325f, -0.688191f}, {0.000000f, -0.955423f, -0.295242f}, { 0.27059805f, 0.27059805f, -0.92387950f },
{0.000000f, -1.000000f, 0.000000f}, {0.262866f, -0.951056f, -0.162460f}, { 0.14644660f, 0.35355338f, -0.92387950f },
{0.000000f, -0.850651f, 0.525731f}, {0.000000f, -0.955423f, 0.295242f}, { -0.00000002f, 0.38268343f, -0.92387950f },
{0.238856f, -0.864188f, 0.442863f}, {0.262866f, -0.951056f, 0.162460f}, { -0.14644660f, 0.35355338f, -0.92387950f },
{0.500000f, -0.809017f, 0.309017f}, {0.716567f, -0.681718f, 0.147621f}, { -0.27059805f, 0.27059805f, -0.92387950f },
{0.525731f, -0.850651f, 0.000000f}, {-0.238856f, -0.864188f, -0.442863f}, { -0.35355338f, 0.14644663f, -0.92387950f },
{-0.500000f, -0.809017f, -0.309017f}, {-0.262866f, -0.951056f, -0.162460f}, { -0.38268343f, -0.00000003f, -0.92387950f },
{-0.850651f, -0.525731f, 0.000000f}, {-0.716567f, -0.681718f, -0.147621f}, { -0.35355338f, -0.14644660f, -0.92387950f },
{-0.716567f, -0.681718f, 0.147621f}, {-0.525731f, -0.850651f, 0.000000f}, { -0.27059805f, -0.27059802f, -0.92387950f },
{-0.500000f, -0.809017f, 0.309017f}, {-0.238856f, -0.864188f, 0.442863f}, { -0.14644666f, -0.35355338f, -0.92387950f },
{-0.262866f, -0.951056f, 0.162460f}, {-0.864188f, -0.442863f, 0.238856f}, { 0.00000000f, -0.38268343f, -0.92387950f },
{-0.809017f, -0.309017f, 0.500000f}, {-0.688191f, -0.587785f, 0.425325f}, { 0.14644668f, -0.35355335f, -0.92387950f },
{-0.681718f, -0.147621f, 0.716567f}, {-0.442863f, -0.238856f, 0.864188f}, { 0.27059799f, -0.27059808f, -0.92387950f },
{-0.587785f, -0.425325f, 0.688191f}, {-0.309017f, -0.500000f, 0.809017f}, { 0.35355338f, -0.14644660f, -0.92387950f },
{-0.147621f, -0.716567f, 0.681718f}, {-0.425325f, -0.688191f, 0.587785f}, { -0.00000004f, 0.00000000f, -1.00000000f },
{-0.162460f, -0.262866f, 0.951056f}, {0.442863f, -0.238856f, 0.864188f}, { -0.00000004f, -0.00000002f, -1.00000000f },
{0.162460f, -0.262866f, 0.951056f}, {0.309017f, -0.500000f, 0.809017f}, { -0.00000003f, -0.00000003f, -1.00000000f },
{0.147621f, -0.716567f, 0.681718f}, {0.000000f, -0.525731f, 0.850651f}, { -0.00000002f, -0.00000004f, -1.00000000f },
{0.425325f, -0.688191f, 0.587785f}, {0.587785f, -0.425325f, 0.688191f}, { 0.00000000f, -0.00000004f, -1.00000000f },
{0.688191f, -0.587785f, 0.425325f}, {-0.955423f, 0.295242f, 0.000000f}, { 0.00000002f, -0.00000004f, -1.00000000f },
{-0.951056f, 0.162460f, 0.262866f}, {-1.000000f, 0.000000f, 0.000000f}, { 0.00000003f, -0.00000003f, -1.00000000f },
{-0.850651f, 0.000000f, 0.525731f}, {-0.955423f, -0.295242f, 0.000000f}, { 0.00000004f, -0.00000002f, -1.00000000f },
{-0.951056f, -0.162460f, 0.262866f}, {-0.864188f, 0.442863f, -0.238856f}, { 0.00000004f, 0.00000000f, -1.00000000f },
{-0.951056f, 0.162460f, -0.262866f}, {-0.809017f, 0.309017f, -0.500000f}, { 0.00000004f, 0.00000002f, -1.00000000f },
{-0.864188f, -0.442863f, -0.238856f}, {-0.951056f, -0.162460f, -0.262866f}, { 0.00000003f, 0.00000003f, -1.00000000f },
{-0.809017f, -0.309017f, -0.500000f}, {-0.681718f, 0.147621f, -0.716567f}, { 0.00000002f, 0.00000004f, -1.00000000f },
{-0.681718f, -0.147621f, -0.716567f}, {-0.850651f, 0.000000f, -0.525731f}, { -0.00000000f, 0.00000004f, -1.00000000f },
{-0.688191f, 0.587785f, -0.425325f}, {-0.587785f, 0.425325f, -0.688191f}, { -0.00000002f, 0.00000004f, -1.00000000f },
{-0.425325f, 0.688191f, -0.587785f}, {-0.425325f, -0.688191f, -0.587785f}, { -0.00000003f, 0.00000003f, -1.00000000f },
{-0.587785f, -0.425325f, -0.688191f}, {-0.688191f, -0.587785f, -0.425325f} { -0.00000004f, 0.00000002f, -1.00000000f },
}; { -0.38268340f, 0.00000000f, -0.92387956f },
{ -0.35355335f, -0.14644660f, -0.92387956f },
{ -0.27059802f, -0.27059802f, -0.92387956f },
{ -0.14644660f, -0.35355335f, -0.92387956f },
{ 0.00000002f, -0.38268340f, -0.92387956f },
{ 0.14644659f, -0.35355335f, -0.92387956f },
{ 0.27059802f, -0.27059802f, -0.92387956f },
{ 0.35355335f, -0.14644662f, -0.92387956f },
{ 0.38268340f, 0.00000003f, -0.92387956f },
{ 0.35355335f, 0.14644660f, -0.92387956f },
{ 0.27059805f, 0.27059799f, -0.92387956f },
{ 0.14644665f, 0.35355335f, -0.92387956f },
{ -0.00000000f, 0.38268340f, -0.92387956f },
{ -0.14644666f, 0.35355332f, -0.92387956f },
{ -0.27059796f, 0.27059805f, -0.92387956f },
{ -0.35355335f, 0.14644660f, -0.92387956f },
{ -0.70710677f, 0.00000000f, -0.70710677f },
{ -0.65328145f, -0.27059805f, -0.70710677f },
{ -0.49999997f, -0.49999997f, -0.70710677f },
{ -0.27059805f, -0.65328145f, -0.70710677f },
{ 0.00000003f, -0.70710677f, -0.70710677f },
{ 0.27059802f, -0.65328151f, -0.70710677f },
{ 0.49999997f, -0.49999997f, -0.70710677f },
{ 0.65328145f, -0.27059808f, -0.70710677f },
{ 0.70710677f, 0.00000006f, -0.70710677f },
{ 0.65328145f, 0.27059805f, -0.70710677f },
{ 0.50000000f, 0.49999994f, -0.70710677f },
{ 0.27059814f, 0.65328145f, -0.70710677f },
{ -0.00000001f, 0.70710677f, -0.70710677f },
{ -0.27059817f, 0.65328139f, -0.70710677f },
{ -0.49999991f, 0.50000006f, -0.70710677f },
{ -0.65328151f, 0.27059805f, -0.70710677f },
{ -0.92387950f, 0.00000000f, -0.38268349f },
{ -0.85355335f, -0.35355341f, -0.38268349f },
{ -0.65328145f, -0.65328145f, -0.38268349f },
{ -0.35355338f, -0.85355335f, -0.38268349f },
{ 0.00000004f, -0.92387950f, -0.38268349f },
{ 0.35355335f, -0.85355341f, -0.38268349f },
{ 0.65328145f, -0.65328145f, -0.38268349f },
{ 0.85355335f, -0.35355341f, -0.38268349f },
{ 0.92387950f, 0.00000008f, -0.38268349f },
{ 0.85355335f, 0.35355338f, -0.38268349f },
{ 0.65328151f, 0.65328139f, -0.38268349f },
{ 0.35355350f, 0.85355335f, -0.38268349f },
{ -0.00000001f, 0.92387950f, -0.38268349f },
{ -0.35355353f, 0.85355330f, -0.38268349f },
{ -0.65328133f, 0.65328157f, -0.38268349f },
{ -0.85355341f, 0.35355338f, -0.38268349f },
{ -1.00000000f, 0.00000000f, 0.00000009f },
{ -0.92387950f, -0.38268346f, 0.00000009f },
{ -0.70710677f, -0.70710677f, 0.00000009f },
{ -0.38268343f, -0.92387950f, 0.00000009f },
{ 0.00000004f, -1.00000000f, 0.00000009f },
{ 0.38268340f, -0.92387956f, 0.00000009f },
{ 0.70710677f, -0.70710677f, 0.00000009f },
{ 0.92387950f, -0.38268349f, 0.00000009f },
{ 1.00000000f, 0.00000009f, 0.00000009f },
{ 0.92387950f, 0.38268343f, 0.00000009f },
{ 0.70710683f, 0.70710671f, 0.00000009f },
{ 0.38268358f, 0.92387950f, 0.00000009f },
{ -0.00000001f, 1.00000000f, 0.00000009f },
{ -0.38268360f, 0.92387944f, 0.00000009f },
{ -0.70710665f, 0.70710689f, 0.00000009f },
{ -0.92387956f, 0.38268343f, 0.00000009f },
{ -0.92387950f, 0.00000000f, 0.38268343f },
{ -0.85355335f, -0.35355341f, 0.38268343f },
{ -0.65328145f, -0.65328145f, 0.38268343f },
{ -0.35355338f, -0.85355335f, 0.38268343f },
{ 0.00000004f, -0.92387950f, 0.38268343f },
{ 0.35355335f, -0.85355341f, 0.38268343f },
{ 0.65328145f, -0.65328145f, 0.38268343f },
{ 0.85355335f, -0.35355341f, 0.38268343f },
{ 0.92387950f, 0.00000008f, 0.38268343f },
{ 0.85355335f, 0.35355338f, 0.38268343f },
{ 0.65328151f, 0.65328139f, 0.38268343f },
{ 0.35355350f, 0.85355335f, 0.38268343f },
{ -0.00000001f, 0.92387950f, 0.38268343f },
{ -0.35355353f, 0.85355330f, 0.38268343f },
{ -0.65328133f, 0.65328157f, 0.38268343f },
{ -0.85355341f, 0.35355338f, 0.38268343f },
{ -0.70710683f, 0.00000000f, 0.70710671f },
{ -0.65328151f, -0.27059808f, 0.70710671f },
{ -0.50000000f, -0.50000000f, 0.70710671f },
{ -0.27059805f, -0.65328151f, 0.70710671f },
{ 0.00000003f, -0.70710683f, 0.70710671f },
{ 0.27059805f, -0.65328157f, 0.70710671f },
{ 0.50000000f, -0.50000000f, 0.70710671f },
{ 0.65328151f, -0.27059811f, 0.70710671f },
{ 0.70710683f, 0.00000006f, 0.70710671f },
{ 0.65328151f, 0.27059805f, 0.70710671f },
{ 0.50000006f, 0.49999997f, 0.70710671f },
{ 0.27059817f, 0.65328151f, 0.70710671f },
{ -0.00000001f, 0.70710683f, 0.70710671f },
{ -0.27059820f, 0.65328145f, 0.70710671f },
{ -0.49999994f, 0.50000012f, 0.70710671f },
{ -0.65328157f, 0.27059805f, 0.70710671f },
{ -0.38268358f, 0.00000000f, 0.92387950f },
{ -0.35355350f, -0.14644668f, 0.92387950f },
{ -0.27059814f, -0.27059814f, 0.92387950f },
{ -0.14644666f, -0.35355350f, 0.92387950f },
{ 0.00000002f, -0.38268358f, 0.92387950f },
{ 0.14644665f, -0.35355353f, 0.92387950f },
{ 0.27059814f, -0.27059814f, 0.92387950f },
{ 0.35355350f, -0.14644669f, 0.92387950f },
{ 0.38268358f, 0.00000003f, 0.92387950f },
{ 0.35355350f, 0.14644666f, 0.92387950f },
{ 0.27059817f, 0.27059811f, 0.92387950f },
{ 0.14644672f, 0.35355350f, 0.92387950f },
{ -0.00000000f, 0.38268358f, 0.92387950f },
{ -0.14644673f, 0.35355350f, 0.92387950f },
{ -0.27059811f, 0.27059820f, 0.92387950f },
{ -0.35355353f, 0.14644666f, 0.92387950f },
{ 0.00000001f, 0.00000000f, 1.00000000f },
{ 0.00000001f, 0.00000000f, 1.00000000f },
{ 0.00000001f, 0.00000001f, 1.00000000f },
{ 0.00000000f, 0.00000001f, 1.00000000f },
{ -0.00000000f, 0.00000001f, 1.00000000f },
{ -0.00000000f, 0.00000001f, 1.00000000f },
{ -0.00000001f, 0.00000001f, 1.00000000f },
{ -0.00000001f, 0.00000000f, 1.00000000f },
{ -0.00000001f, -0.00000000f, 1.00000000f },
{ -0.00000001f, -0.00000000f, 1.00000000f },
{ -0.00000001f, -0.00000001f, 1.00000000f },
{ -0.00000000f, -0.00000001f, 1.00000000f },
{ 0.00000000f, -0.00000001f, 1.00000000f },
{ 0.00000000f, -0.00000001f, 1.00000000f },
{ 0.00000001f, -0.00000001f, 1.00000000f },
{ 0.00000001f, -0.00000000f, 1.00000000f },
{ 0.38268360f, 0.00000000f, 0.92387944f },
{ 0.35355353f, 0.14644669f, 0.92387944f },
{ 0.27059817f, 0.27059817f, 0.92387944f },
{ 0.14644668f, 0.35355353f, 0.92387944f },
{ -0.00000002f, 0.38268360f, 0.92387944f },
{ -0.14644666f, 0.35355356f, 0.92387944f },
{ -0.27059817f, 0.27059817f, 0.92387944f },
{ -0.35355353f, 0.14644669f, 0.92387944f },
{ -0.38268360f, -0.00000003f, 0.92387944f },
{ -0.35355353f, -0.14644668f, 0.92387944f },
{ -0.27059820f, -0.27059814f, 0.92387944f },
{ -0.14644673f, -0.35355353f, 0.92387944f },
{ 0.00000000f, -0.38268360f, 0.92387944f },
{ 0.14644673f, -0.35355350f, 0.92387944f },
{ 0.27059811f, -0.27059820f, 0.92387944f },
{ 0.35355356f, -0.14644668f, 0.92387944f },
{ 0.70710665f, 0.00000000f, 0.70710689f },
{ 0.65328133f, 0.27059802f, 0.70710689f },
{ 0.49999991f, 0.49999991f, 0.70710689f },
{ 0.27059799f, 0.65328133f, 0.70710689f },
{ -0.00000003f, 0.70710665f, 0.70710689f },
{ -0.27059796f, 0.65328139f, 0.70710689f },
{ -0.49999991f, 0.49999991f, 0.70710689f },
{ -0.65328133f, 0.27059802f, 0.70710689f },
{ -0.70710665f, -0.00000006f, 0.70710689f },
{ -0.65328133f, -0.27059799f, 0.70710689f },
{ -0.49999994f, -0.49999985f, 0.70710689f },
{ -0.27059811f, -0.65328133f, 0.70710689f },
{ 0.00000001f, -0.70710665f, 0.70710689f },
{ 0.27059811f, -0.65328127f, 0.70710689f },
{ 0.49999982f, -0.49999997f, 0.70710689f },
{ 0.65328139f, -0.27059799f, 0.70710689f },
{ 0.92387956f, 0.00000000f, 0.38268343f },
{ 0.85355341f, 0.35355341f, 0.38268343f },
{ 0.65328151f, 0.65328151f, 0.38268343f },
{ 0.35355338f, 0.85355341f, 0.38268343f },
{ -0.00000004f, 0.92387956f, 0.38268343f },
{ -0.35355335f, 0.85355347f, 0.38268343f },
{ -0.65328151f, 0.65328151f, 0.38268343f },
{ -0.85355341f, 0.35355344f, 0.38268343f },
{ -0.92387956f, -0.00000008f, 0.38268343f },
{ -0.85355341f, -0.35355338f, 0.38268343f },
{ -0.65328157f, -0.65328145f, 0.38268343f },
{ -0.35355353f, -0.85355341f, 0.38268343f },
{ 0.00000001f, -0.92387956f, 0.38268343f },
{ 0.35355356f, -0.85355335f, 0.38268343f },
{ 0.65328139f, -0.65328163f, 0.38268343f },
{ 0.85355347f, -0.35355338f, 0.38268343f }
};
//============================================================== //==============================================================

8
reaction/code/qcommon/q_shared.h
View file

@ -258,9 +258,13 @@ typedef enum {
// font rendering values used by ui and cgame // font rendering values used by ui and cgame
#define PROP_GAP_WIDTH 3 //#define PROP_GAP_WIDTH 3
#define PROP_GAP_WIDTH -16
#define PROP_SPACE_WIDTH 8 #define PROP_SPACE_WIDTH 8
#define PROP_HEIGHT 27 //Elder: changed to fit new font from 27
//Makro - changed back
//TTI: changed from 27 to 63
#define PROP_HEIGHT 63
#define PROP_SMALL_SIZE_SCALE 0.75 #define PROP_SMALL_SIZE_SCALE 0.75
#define BLINK_DIVISOR 200 #define BLINK_DIVISOR 200

14
reaction/code/qcommon/surfaceflags.h
View file

@ -78,3 +78,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define SURF_ALPHASHADOW 0x10000 // do per-pixel light shadow casting in q3map #define SURF_ALPHASHADOW 0x10000 // do per-pixel light shadow casting in q3map
#define SURF_NODLIGHT 0x20000 // don't dlight even if solid (solid lava, skies) #define SURF_NODLIGHT 0x20000 // don't dlight even if solid (solid lava, skies)
#define SURF_DUST 0x40000 // leave a dust trail when walking on this surface #define SURF_DUST 0x40000 // leave a dust trail when walking on this surface
//Elder: new surfaces
#define SURF_GRAVEL 0x80000
#define SURF_WOOD 0x100000
#define SURF_CARPET 0x200000
#define SURF_METAL2 0x400000
#define SURF_GLASS 0x800000
#define SURF_GRASS 0x1000000
// JBravo: new sounds
#define SURF_SNOW 0x2000000
#define SURF_MUD 0x4000000
#define SURF_WOOD2 0x8000000
#define SURF_HARDMETAL 0x10000000

92
reaction/misc/msvc/cgame.vcproj
View file

@ -999,52 +999,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\code\cgame\cg_newDraw.c"
>
<FileConfiguration
Name="Release TA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;MISSIONPACK;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug TA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;MISSIONPACK;"
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\code\cgame\cg_players.c" RelativePath="..\..\code\cgame\cg_players.c"
> >
@ -1435,52 +1389,6 @@
RelativePath="..\..\code\qcommon\q_shared.c" RelativePath="..\..\code\qcommon\q_shared.c"
> >
</File> </File>
<File
RelativePath="..\..\code\ui\ui_shared.c"
>
<FileConfiguration
Name="Release TA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;MISSIONPACK;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug TA|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;MISSIONPACK;"
BrowseInformation="1"
/>
</FileConfiguration>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"

4
reaction/misc/msvc/game.vcproj
View file

@ -705,7 +705,6 @@
> >
<FileConfiguration <FileConfiguration
Name="Debug TA|Win32" Name="Debug TA|Win32"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -716,7 +715,6 @@
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -727,7 +725,6 @@
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -737,7 +734,6 @@
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release TA|Win32" Name="Release TA|Win32"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"