ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to cg_local.h

This commit is contained in:
Walter Julius Hennecke 2014-10-27 22:39:54 +01:00
parent bfc137ff2e
commit ce76bfa8d4
3 changed files with 367 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
code/cgame/cg_local.h
View File

@ -16,72 +16,71 @@
// by the server in the server stored userinfos, or stashed in a cvar.
//RPG-X | Phenix | 13/02/2005
#define N00bSoundCount 12
enum cg_localLimits_e {
NUM_FONT_BIG = 1,
NUM_FONT_SMALL = 2,
MAX_TALK_SKINS = 4,
TEAMCHAT_HEIGHT = 8,
MAX_VERTS_ON_POLY = 10,
MAX_BOLTONS = 10,
NUM_CROSSHAIRS = 12,
MAX_N00BSOUND_COUNT = 12,
MAX_OBJECTIVES = 16,
MAX_CUSTOM_SOUNDS = 32,
TEAMCHAT_WIDTH = 80,
MAX_MARK_POLYS = 256,
MAX_OBJ_LENGTH = 1024,
MAX_OBJ_TEXT_LENGTH = (MAX_OBJECTIVES*MAX_OBJ_LENGTH)
};
#define POWERUP_BLINKS 5
static const uint32_t POWERUP_BLINKS = 5;
static const uint32_t Q_FLASH_TIME = 450;
#define Q_FLASH_TIME 450
#define POWERUP_BLINK_TIME 1000
#define FADE_TIME 200
#define PULSE_TIME 200
#define DAMAGE_DEFLECT_TIME 100
#define DAMAGE_RETURN_TIME 400
#define DAMAGE_TIME 500
#define LAND_DEFLECT_TIME 150
#define LAND_RETURN_TIME 300
#define STEP_TIME 200
#define DUCK_TIME 100
#define PAIN_TWITCH_TIME 200
#define WEAPON_SELECT_TIME 1400
#define ITEM_SCALEUP_TIME 1000
static const uint32_t POWERUP_BLINK_TIME = 1000;
static const uint32_t FADE_TIME = 200;
static const uint32_t PULSE_TIME = 200;
static const uint32_t DAMAGE_DEFLECT_TIME = 100;
static const uint32_t DAMAGE_RETURN_TIME = 400;
static const uint32_t DAMAGE_TIME = 500;
static const uint32_t LAND_DEFLECT_TIME = 150;
static const uint32_t LAND_RETURN_TIME = 300;
static const uint32_t STEP_TIME = 200;
static const uint32_t DUCK_TIME = 100;
static const uint32_t PAIN_TWITCH_TIME = 200;
static const uint32_t WEAPON_SELECT_TIME = 1400;
static const uint32_t ITEM_SCALEUP_TIME = 1000;
// Zoom vars
#define ZOOM_TIME 150
#define MAX_ZOOM_FOV 5.0f
#define ZOOM_IN_TIME 1000.0f
#define ZOOM_OUT_TIME 100.0f
#define ZOOM_START_PERCENT 0.3f
static const uint32_t ZOOM_TIME = 150;
static const double MAX_ZOOM_FOV = 5.0;
static const double ZOOM_IN_TIME = 1000.0;
static const double ZOOM_OUT_TIME = 100.0;
static const double ZOOM_START_PERCENT = 0.3;
#define ITEM_BLOB_TIME 200
#define MUZZLE_FLASH_TIME 20
#define SINK_TIME 1000 // time for fragments to sink into ground before going away
#define ATTACKER_HEAD_TIME 10000
#define REWARD_TIME 3000
static const uint32_t ITEM_BLOB_TIME = 200;
static const uint32_t MUZZLE_FLASH_TIME = 20;
static const uint32_t SINK_TIME = 1000; // time for fragments to sink into ground before going away
static const uint32_t ATTACKER_HEAD_TIME = 10000;
static const uint32_t REWARD_TIME = 3000;
#define PULSE_SCALE 1.5 // amount to scale up the icons when activating
static const double PULSE_SCALE = 1.5; // amount to scale up the icons when activating
#define MAX_STEP_CHANGE 32
static const uint32_t MAX_STEP_CHANGE = 32;
#define MAX_VERTS_ON_POLY 10
#define MAX_MARK_POLYS 256
static const uint32_t STAT_MINUS = 10; // num frame for '-' stats digit
#define STAT_MINUS 10 // num frame for '-' stats digit
#define ICON_SIZE 48
#define CHAR_WIDTH 32
#define CHAR_HEIGHT 48
#define TEXT_ICON_SPACE 4
#define TEAMCHAT_WIDTH 80
#define TEAMCHAT_HEIGHT 8
static const uint32_t ICON_SIZE = 48;
static const uint32_t CHAR_WIDTH = 32;
static const uint32_t CHAR_HEIGHT = 48;
static const uint32_t TEXT_ICON_SPACE = 4;
// very large characters
#define GIANT_WIDTH 32
#define GIANT_HEIGHT 48
#define NUM_FONT_BIG 1
#define NUM_FONT_SMALL 2
#define NUM_CROSSHAIRS 12
#define MAX_OBJECTIVES 16
#define MAX_OBJ_LENGTH 1024
#define MAX_OBJ_TEXT_LENGTH (MAX_OBJECTIVES*MAX_OBJ_LENGTH)
static const uint32_t GIANT_WIDTH = 32;
static const uint32_t GIANT_HEIGHT = 48;
//beam defines used to calc player fading in beam sequence
#define PLAYER_BEAM_FADE 1500 //RPG-X: TiM - Time index for when player model fades in/out in a beam sequence
#define PLAYER_BEAM_FADETIME 1000 //Length of time the player will be fading out
static const uint32_t PLAYER_BEAM_FADE = 1500; //RPG-X: TiM - Time index for when player model fades in/out in a beam sequence
static const uint32_t PLAYER_BEAM_FADETIME = 1000; //Length of time the player will be fading out
typedef enum {
FOOTSTEP_NORMAL,
@ -114,11 +113,13 @@ typedef enum {
// For the holodoor intro
#define TIME_INIT 100
#define TIME_DOOR_START 1000
#define TIME_DOOR_DUR (TIME_FADE_START-TIME_DOOR_START)
#define TIME_FADE_START 3000
#define TIME_FADE_DUR (TIME_INTRO-TIME_FADE_START)
enum cg_HolodoorConstants_e {
TIME_INIT = 100,
TIME_DOOR_START = 1000,
TIME_FADE_START = 3000,
TIME_DOOR_DUR = (TIME_FADE_START - TIME_DOOR_START),
TIME_FADE_DUR = (TIME_INTRO - TIME_FADE_START)
};
/*==============================================
TiM - Since the majority of the body models use the same anim config,
@ -528,8 +529,7 @@ typedef struct localEntity_s {
float width;
float dwidth;
} electricity;
struct
{
struct {
// fight the power! open and close brackets in the same column!
float radius;
float dradius;
@ -538,8 +538,7 @@ typedef struct localEntity_s {
//particle is sent to the renderer
// may want to add something like particle::localEntity_s *le (for the particle's think fn)
} particle;
struct
{
struct {
qboolean dontDie;
vec3_t dir;
float variance;
@ -549,8 +548,7 @@ typedef struct localEntity_s {
int32_t data1;
int32_t data2;
} spawner;
struct
{
struct {
float radius;
} fragment;
} data;
@ -601,8 +599,6 @@ typedef struct {
//is parsed to. From there, it can be plugged straight into
//the original model loading pipeline.... I think
//**********************************************************
#define MAX_BOLTONS 10
#define MAX_TALK_SKINS 4
typedef enum {
BOLTON_HEAD = 0,
@ -631,7 +627,6 @@ typedef struct {
// client model and other color coded effects
// this is regenerated each time a client's configstring changes,
// usually as a result of a userinfo (name, model, etc) change
#define MAX_CUSTOM_SOUNDS 32
typedef struct {
qboolean infoValid;
@ -1024,8 +1019,7 @@ typedef struct {
} cg_t;
typedef enum
{
typedef enum {
MT_NONE = 0,
MT_METAL,
MT_GLASS,
@ -1332,7 +1326,7 @@ typedef struct {
//RPG-X: RedTechie - Shake command sound
sfxHandle_t ShakeSound;
//RPG-X | Phenix | 13/02/2005
sfxHandle_t N00bSound[N00bSoundCount];
sfxHandle_t N00bSound[MAX_N00BSOUND_COUNT];
//RPG-X | Phenix | 08/06/2005
sfxHandle_t AdminMsgSound;
//RPG-X | TiM
@ -1711,8 +1705,7 @@ qboolean CG_LoadClasses( void );
//
// cg_draw.c
//
typedef struct
{
typedef struct {
int32_t type; // STRING or GRAPHIC
float timer; // When it changes
int32_t x; // X position
@ -1727,8 +1720,7 @@ typedef struct
int32_t style; // Style of characters
} interfacegraphics_s;
typedef enum
{
typedef enum {
IG_GROW,
IG_HEALTH_START,
@ -1991,8 +1983,7 @@ typedef enum {
AWARD_MAX
} awardType_t;
typedef enum
{
typedef enum {
TEAM_NONE = 0, // ha ha! you suck!
TEAM_MVP, // most overall points
TEAM_DEFENDER, // killed the most baddies near your flag
@ -2007,8 +1998,7 @@ typedef enum
// above lists need to be sync'ed with stuff under g_log in g_local.h
//
typedef enum
{
typedef enum {
AWARD_STREAK_NONE = 0,
AWARD_STREAK_ACE,
AWARD_STREAK_EXPERT,

2
code/cgame/cg_main.c
View File

@ -703,7 +703,7 @@ static void CG_RegisterSounds( void )
cgs.media.ShakeSound = trap_S_RegisterSound("sound/shake.wav");
cgs.media.tedTextSound = trap_S_RegisterSound( "sound/interface/tedtext.wav" );
for (i=0 ; i<N00bSoundCount ; i++) {
for (i=0 ; i<MAX_N00BSOUND_COUNT ; i++) {
Com_sprintf (name, sizeof(name), "sound/n00bs/insult%i.wav", i+1);
cgs.media.N00bSound[i] = trap_S_RegisterSound (name);
}

2
code/cgame/cg_servercmds.c
View File

@ -679,7 +679,7 @@ static void CG_ServerCommand( void ) {
//RPG-X | Phenix | 13/02/2005
// Play a insult to the n00b when moved into n00b class
if ( !strcmp( cmd, "playN00bInsult") ) {
trap_S_StartLocalSound( cgs.media.N00bSound[(rand()%N00bSoundCount)], CHAN_LOCAL_SOUND );
trap_S_StartLocalSound( cgs.media.N00bSound[(rand()%MAX_N00BSOUND_COUNT)], CHAN_LOCAL_SOUND );
CG_CenterPrint( "Welcome to the n00b Class", SCREEN_HEIGHT * 0.25, BIGCHAR_WIDTH );
return;
}