From 217ba13c618489a2c9d4d4384c42ce3d54b7959e Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine@gmail.com>
Date: Sat, 3 Oct 2009 11:38:33 +0000
Subject: * Removal of now-redundant Makefile stuff * Loads of whitespace
fiddling to make the code closer to tremulous SVN * HUMAN_BVALUE_MODIFIER
includes ALIEN_CREDITS_PER_FRAG
---
src/game/g_client.c | 2 +-
src/game/g_combat.c | 2 +-
src/game/g_main.c | 3 +--
src/game/tremulous.h | 5 ++---
4 files changed, 5 insertions(+), 7 deletions(-)
(limited to 'src/game')
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 49ae26a9..7c168184 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1359,7 +1359,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
client->sess.sessionTeam = TEAM_SPECTATOR;
client->sess.spectatorState = SPECTATOR_LOCKED;
}
-
+
if( origin != NULL )
VectorCopy( origin, spawn_origin );
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 003ade97..31c80bd1 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -424,7 +424,7 @@ int G_ParseDmgScript( damageRegion_t *regions, char *buf )
regions[ count ].crouch = qfalse;
while( 1 )
- {
+ {
token = COM_ParseExt( &buf, qtrue );
if( !token[ 0 ] )
diff --git a/src/game/g_main.c b/src/game/g_main.c
index b753bdc7..02edb561 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -159,7 +159,7 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO, 0, qfalse },
- { &g_friendlyFire, "g_friendlyFire", "0", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue },
+ { &g_friendlyFire, "g_friendlyFire", "0", CVAR_ARCHIVE, 0, qtrue },
{ &g_friendlyFireAliens, "g_friendlyFireAliens", "0", CVAR_ARCHIVE, 0, qtrue },
{ &g_friendlyFireHumans, "g_friendlyFireHumans", "0", CVAR_ARCHIVE, 0, qtrue },
{ &g_friendlyBuildableFire, "g_friendlyBuildableFire", "0", CVAR_ARCHIVE, 0, qtrue },
@@ -236,7 +236,6 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_currentMap, "g_currentMap", "0", 0, 0, qfalse },
{ &g_initialMapRotation, "g_initialMapRotation", "", CVAR_ARCHIVE, 0, qfalse },
{ &g_shove, "g_shove", "0.0", CVAR_ARCHIVE, 0, qfalse },
-
{ &g_mapConfigs, "g_mapConfigs", "", CVAR_ARCHIVE, 0, qfalse },
{ NULL, "g_mapConfigsLoaded", "0", CVAR_ROM, 0, qfalse },
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index e576af59..af14e822 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -422,7 +422,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define MDRIVER_REPEAT 1000
#define MDRIVER_K_SCALE 1.0f
#define MDRIVER_RELOAD 2000
-#define MDRIVER_MAX_HITS 16
#define CHAINGUN_PRICE 400
#define CHAINGUN_BULLETS 300
@@ -530,8 +529,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define HUMAN_BHLTH_MODIFIER 1.0f
#define HBHM(h) ((int)((float)h*HUMAN_BHLTH_MODIFIER))
-#define HUMAN_BVALUE_MODIFIER 0.1f
-#define HBVM(h) ((int)((float)h*(float)ALIEN_CREDITS_PER_FRAG*HUMAN_BVALUE_MODIFIER))
+#define HUMAN_BVALUE_MODIFIER 40.0f
+#define HBVM(h) ((int)((float)h*(float)HUMAN_BVALUE_MODIFIER)) // remember these are measured in credits not frags (c.f. ALIEN_CREDITS_PER_FRAG)
#define REACTOR_BASESIZE 1000
#define REPEATER_BASESIZE 500
--
cgit