summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_local.h2
-rw-r--r--src/cgame/cg_main.c2
-rw-r--r--src/game/bg_public.h4
-rw-r--r--src/game/g_buildable.c9
-rw-r--r--src/game/tremulous.h2
-rw-r--r--src/ui/ui_shared.h4
6 files changed, 18 insertions, 5 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index de784ba..b9ed03d 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -2286,4 +2286,4 @@ typedef enum
// mod version data
-#define SPLASH_VERSION "0.1.7 (Feb 25)"
+#define SPLASH_VERSION "0.1.8 (Feb 25)"
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index ee37596..7c798a2 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -764,7 +764,7 @@ static void CG_RegisterSounds( void )
for( i = 0; i < 4; i++ )
cgs.media.powerZap[ i ] = trap_S_RegisterSound( va( "sound/buildables/human/powerzap%i.wav", i + 1 ), qfalse );
- cgs.media.hitSound = trap_S_RegisterSound( "sound/feedback/hit.wav", qfalse );
+ cgs.media.hitSound = trap_S_RegisterSound( "sound/feedback/_hit.wav", qfalse );
}
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index cbaf90a..1fa36ca 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//tremulous balance header
#include "tremulous.h"
+// thanks for defining MAX_EMOTICONS in q_shared...
+#undef MAX_EMOTICONS
+#define MAX_EMOTICONS 1024
+
// because games can change separately from the main system version, we need a
// second version that must match between game and cgame
#define GAME_VERSION "base"
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 7c051bd..1faca0c 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -465,6 +465,9 @@ void G_ScanPowerGrid( gentity_t *this )
if( !next->active )
continue;
grid.sources[ grid.sourceCount++ ] = next;
+
+ next->powerNetwork = grid.networkID;
+ G_ScanPowerGrid( next );
}
else
grid.load[ grid.loadCount++ ] = next;
@@ -652,8 +655,8 @@ void G_UpdatePowerGrid( float dt )
ent->voltage -= ent->current * dt / CAPBANK_CAPACITY;
//zapping effect
- #define MIN_ZAP_CURRENT 8.0f
- #define ZAP_CHANCE_FACTOR 0.007f
+ #define MIN_ZAP_CURRENT 15.0f
+ #define ZAP_CHANCE_FACTOR 0.001f
if( ent->current > MIN_ZAP_CURRENT )
{
float chance;
@@ -3192,10 +3195,12 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance
reason = IBE_NORMAL;
//the only buildable one can build on is a cuboid
+ /*
if( tr1.entityNum != ENTITYNUM_WORLD )
if( g_entities[ tr1.entityNum ].s.eType == ET_BUILDABLE &&
!BG_Buildable( g_entities[ tr1.entityNum ].s.modelindex, NULL )->cuboid )
reason = IBE_NORMAL;
+ */
contents = trap_PointContents( entity_origin, -1 );
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 71d848e..e31f59a 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -675,7 +675,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define RTG_RESISTANCE 5.0f
-#define REACTOR_RESISTANCE 1.0f
+#define REACTOR_RESISTANCE 1.66f
#define CAPBANK_RESISTANCE 0.05f
#define CAPBANK_CAPACITY 2.0f
diff --git a/src/ui/ui_shared.h b/src/ui/ui_shared.h
index 649d51f..9654fe5 100644
--- a/src/ui/ui_shared.h
+++ b/src/ui/ui_shared.h
@@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../../assets/ui/menudef.h"
+// thanks for defining MAX_EMOTICONS in q_shared...
+#undef MAX_EMOTICONS
+#define MAX_EMOTICONS 1024
+
#define MAX_MENUNAME 32
#define MAX_ITEMTEXT 64
#define MAX_ITEMACTION 64