ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 17:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

more fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-05-16 23:54:40 +02:00
parent 0861620c2e
commit 2a16df527b
10 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/game/bg_pmove.c
View file

@ -43,7 +43,7 @@ extern vmCvar_t rpg_altTricorderDelay;
#define PHOTON_DELAY rpg_photonDelay.integer
#define ALT_PHOTON_DELAY rpg_altPhotonDelay.integer
#define TR116_DELAY rpg_TR116Delay.integer
#define ALT_TRICORDER_DELAY rpg_altTricorderDelay.integer
#define ALT_TRICORDER_DELAY rpg_altTricorderDelay.integer
#else
#define RIFLE_DELAY 250
#define DISRUPTOR_DELAY 700

2
code/game/g_bot.c
View file

@ -3,6 +3,7 @@
// g_bot.c
#include "g_local.h"
#include "g_main.h"
static int g_numBots;
@ -31,7 +32,6 @@ vmCvar_t bot_minplayers;
extern gentity_t *podium1;
extern gentity_t *podium2;
extern gentity_t *podium3;
extern int numKilled;
/*

2
code/game/g_client.c
View file

@ -2,6 +2,7 @@
//
#include "g_local.h"
#include "g_groups.h"
#include "g_main.h"
reconData_t g_reconData[MAX_RECON_NAMES]; //!< recon data for a limited ammount of clients
int g_reconNum;
@ -15,7 +16,6 @@ extern void BroadcastClassChange( gclient_t *client, pclass_t oldPClass );
extern char* correlateRanks( const char* strArg, int intArg );
extern pclass_t ValueNameForClass ( /*gentity_t *ent,*/ char* s );
extern qboolean levelExiting;
// g_client.c -- client functions that don't happen every frame
void G_Client_StoreClientInitialStatus( gentity_t *ent );

3
code/game/g_cmds.c
View file

@ -3,6 +3,7 @@
#include "g_local.h"
#include "g_sql.h"
#include "g_main.h"
//#include <windows.h>
@ -13,9 +14,7 @@ extern void G_CheckReplaceQueen( int clientNum );
extern qboolean PlaceDecoy( gentity_t *ent );
extern qboolean G_CallSpawn(gentity_t *ent);
extern int numKilled;
extern clInitStatus_t clientInitialStatus[];
extern qboolean levelExiting;
void DeathmatchScoreboardMessage( gentity_t *ent ) {
char entry[1024];

2
code/game/g_combat.c
View file

@ -4,8 +4,8 @@
#include "g_local.h"
#include "g_breakable.h" //RPG-X | GSIO01 | 09/05/2009: needed by G_Repair
#include "g_main.h"
extern int numKilled;
extern void SetClass( gentity_t *ent, char *s, char *teamName, qboolean SaveToCvar );

25
code/game/g_local.h
View file

@ -2750,6 +2750,31 @@ extern vmCvar_t rpg_disruptorSpeed; //RPG-X | Marcin | 04/12/2008
extern vmCvar_t rpg_photonSpeed; //RPG-X | Marcin | 05/12/2008
extern vmCvar_t rpg_altPhotonSpeed; //RPG-X | Marcin | 06/12/2008
// Weapon Delays
//! Fire delay for Compression Rifle
extern vmCvar_t rpg_rifleDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for Disruptor
extern vmCvar_t rpg_disruptorDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for photon burst primary fire
extern vmCvar_t rpg_photonDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for photon burst secondary fire
extern vmCvar_t rpg_altPhotonDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for TR116
extern vmCvar_t rpg_TR116Delay; //RPG-X | Marcin | 30/12/2008
//! Fire delay for Tricorder alt fire
extern vmCvar_t rpg_altTricorderDelay; //RPG-X | GSIO01 | 14/05/2009
// Weapon Damage
extern vmCvar_t rpg_rifleDamage;
extern vmCvar_t rpg_rifleAltDamage;
extern vmCvar_t rpg_phaserDamage;
extern vmCvar_t rpg_disruptorDamage;
extern vmCvar_t rpg_grenadeDamage;
extern vmCvar_t rpg_grenadeAltDamage;
extern vmCvar_t rpg_tr116Damage;
extern vmCvar_t rpg_photonDamage;
extern vmCvar_t rpg_photonAltDamage;
// Motd
extern vmCvar_t rpg_motdFile; //RPG-X | Marcin | 23/12/2008

29
code/game/g_main.c
View file

@ -4,6 +4,7 @@
#include "g_local.h"
#include "g_groups.h"
#include "bg_lex.h"
#include "g_main.h"
extern void BG_LoadItemNames(void);
extern qboolean BG_ParseRankNames ( char* fileName, rankNames_t rankNames[] );
@ -13,11 +14,10 @@ int RPGEntityCount; //Global entity count varible
level_locals_t level;
extern char races[256]; //this is evil!
extern qboolean levelExiting;
group_list_t group_list[MAX_GROUP_MEMBERS];
int group_count;
int numKilled;
int numKilled;
typedef struct {
vmCvar_t *vmCvar;
@ -29,7 +29,7 @@ typedef struct {
} cvarTable_t;
gentity_t g_entities[MAX_GENTITIES];
gclient_t g_clients[MAX_CLIENTS];
static gclient_t g_clients[MAX_CLIENTS];
rankNames_t g_rankNames[MAX_RANKS];
@ -57,10 +57,8 @@ vmCvar_t g_adaptRespawn;
vmCvar_t g_motd;
vmCvar_t g_synchronousClients;
vmCvar_t g_restarted;
vmCvar_t g_log;
vmCvar_t g_logSync;
vmCvar_t g_podiumDist;
vmCvar_t g_podiumDrop;
static vmCvar_t g_log;
static vmCvar_t g_logSync;
vmCvar_t g_allowVote;
vmCvar_t g_banIPs;
vmCvar_t g_filterBan;
@ -70,7 +68,6 @@ vmCvar_t g_debugRight;
vmCvar_t g_debugUp;
vmCvar_t g_language;
vmCvar_t g_holoIntro;
vmCvar_t g_intermissionTime;
vmCvar_t g_team_group_red;
vmCvar_t g_team_group_blue;
vmCvar_t g_random_skin_limit;
@ -165,17 +162,11 @@ vmCvar_t rpg_photonSpeed; //RPG-X | Marcin | 05/12/2008
vmCvar_t rpg_altPhotonSpeed; //RPG-X | Marcin | 06/12/2008
// Weapon delays
//! Fire delay for Compression Rifle
vmCvar_t rpg_rifleDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for Disruptor
vmCvar_t rpg_disruptorDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for photon burst primary fire
vmCvar_t rpg_photonDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for photon burst secondary fire
vmCvar_t rpg_altPhotonDelay; //RPG-X | Marcin | 06/12/2008
//! Fire delay for TR116
vmCvar_t rpg_TR116Delay; //RPG-X | Marcin | 30/12/2008
//! Fire delay for Tricorder alt fire
vmCvar_t rpg_altTricorderDelay; //RPG-X | GSIO01 | 14/05/2009
// Weapon Damage
@ -321,7 +312,6 @@ static cvarTable_t gameCvarTable[] = {
// change anytime vars
{ &g_dmflags, "dmflags", "0", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue },
{ &g_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO, 0, qfalse },
{ &g_intermissionTime, "g_intermissionTime", "20", CVAR_ARCHIVE, 0, qtrue },
{ &g_log, "g_log", "", CVAR_ARCHIVE, 0, qfalse },
{ &g_logSync, "g_logSync", "0", CVAR_ARCHIVE, 0, qfalse },
{ &g_password, "g_password", "", CVAR_USERINFO, 0, qfalse },
@ -342,8 +332,6 @@ static cvarTable_t gameCvarTable[] = {
{ &g_debugDamage, "g_debugDamage", "0", 0, 0, qfalse },
{ &g_debugAlloc, "g_debugAlloc", "0", 0, 0, qfalse },
{ &g_motd, "g_motd", "", 0, 0, qfalse },
{ &g_podiumDist, "g_podiumDist", "80", 0, 0, qfalse },
{ &g_podiumDrop, "g_podiumDrop", "70", 0, 0, qfalse },
{ &g_allowVote, "g_allowVote", "1", CVAR_SERVERINFO, 0, qfalse },
#if 0
{ &g_debugForward, "g_debugForward", "0", 0, 0, qfalse },
@ -1195,7 +1183,7 @@ static void G_LoadServerChangeFile(void) {
free(buffer);
}
mapChangeData_t mapChangeData;
static mapChangeData_t mapChangeData;
static void G_LoadMapChangeFile(void) {
char fileRoute[MAX_QPATH];
@ -2082,7 +2070,7 @@ SortRanks
=============
*/
int QDECL SortRanks( const void *a, const void *b ) {
static int QDECL SortRanks( const void *a, const void *b ) {
gclient_t *ca, *cb;
ca = &level.clients[*(int *)a];
@ -2414,7 +2402,7 @@ void G_Client_BeginIntermission( void ) {
}
void G_ClearObjectives( void )
static void G_ClearObjectives( void )
{
gentity_t *tent;
@ -2614,7 +2602,6 @@ Advances the non-player objects in the world
extern void SetClass( gentity_t *ent, char *s, char *teamName, qboolean SaveToCvar );
void DragCheck( void ); //RPG-X: J2J - Added to rid warning.
void CheckHealthInfoMessage( void );
extern qboolean levelExiting;
void G_RunFrame( int levelTime ) {
int i;
gentity_t *ent;

8
code/game/g_main.h Normal file
View file

@ -0,0 +1,8 @@
#ifndef G_MAIN_H
#define G_MAIN_H
extern int numKilled;
extern holoData_t holoData;
extern qboolean levelExiting;
#endif

3
code/game/g_session.c
View file

@ -1,6 +1,7 @@
// Copyright (C) 1999-2000 Id Software, Inc.
//
#include "g_local.h"
#include "g_main.h"
/*
@ -13,8 +14,6 @@ and tournament restarts.
=======================================================================
*/
extern int numKilled;
/*
================
G_WriteClientSessionData

12
code/game/g_weapon.c
View file

@ -13,18 +13,6 @@ extern void G_MissileImpact( gentity_t *ent, trace_t *trace);
#define DMG_VAR (flrandom(0.8,1.2))
/* Weapon damages are located up here for easy access... */
extern vmCvar_t rpg_rifleDamage;
extern vmCvar_t rpg_rifleAltDamage;
extern vmCvar_t rpg_phaserDamage;
extern vmCvar_t rpg_disruptorDamage;
extern vmCvar_t rpg_grenadeDamage;
extern vmCvar_t rpg_grenadeAltDamage;
extern vmCvar_t rpg_tr116Damage;
extern vmCvar_t rpg_photonDamage;
extern vmCvar_t rpg_photonAltDamage;
/* Phaser */
/* I'll keep this comment just because it's funny lol :D */
/* RPG-X: TiM - Increased to a standard 0.5 second