lowered the frag bonus from 5 seconds to 0.5 seconds

version upcount

engine/code/game/bg_misc.c

@@ -152,9 +152,7 @@ gitem_t	bg_itemlist[] =
 	{
 		"item_health_small",
 		"sound/items/s_health.wav",
-        { "models/powerups/health/small_cross.md3", 
+        { "models/powerups/health/small_cross.md3", NULL, NULL },
-		"models/powerups/health/small_sphere.md3", 
-		NULL, NULL },
 /* icon */		"icons/iconh_green",
 /* pickup */	"5 Health",
 		5,
@@ -169,9 +167,7 @@ gitem_t	bg_itemlist[] =
 	{
 		"item_health",
 		"sound/items/n_health.wav",
-        { "models/powerups/health/medium_cross.md3", 
+        { "models/powerups/health/medium_cross.md3", NULL, NULL },
-		"models/powerups/health/medium_sphere.md3", 
-		NULL, NULL },
 /* icon */		"icons/iconh_yellow",
 /* pickup */	"25 Health",
 		25,
@@ -186,9 +182,7 @@ gitem_t	bg_itemlist[] =
 	{
 		"item_health_large",
 		"sound/items/l_health.wav",
-        { "models/powerups/health/large_cross.md3", 
+        { "models/powerups/health/large_cross.md3", NULL, NULL },
-		"models/powerups/health/large_sphere.md3", 
-		NULL, NULL },
 /* icon */		"icons/iconh_red",
 /* pickup */	"50 Health",
 		50,
@@ -203,9 +197,7 @@ gitem_t	bg_itemlist[] =
 	{
 		"item_health_mega",
 		"sound/items/m_health.wav",
-        { "models/powerups/health/mega_cross.md3", 
+        { "models/powerups/health/mega_cross.md3", NULL, NULL },
-		"models/powerups/health/mega_sphere.md3", 
-		NULL, NULL },
 /* icon */		"icons/iconh_mega",
 /* pickup */	"Mega Health",
 		100,

engine/code/game/bg_public.h

@@ -60,7 +60,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DEAD_VIEWHEIGHT         -16
 
 // STONELANCE
-#define TIME_BONUS_PER_FRAG     5000
+#define TIME_BONUS_PER_FRAG     500
 #define RACE_OBSERVER_DELAY     5000
 
 #define NORMAL_WEAPON_TIME_MASK 0x0000ffff

engine/code/q3_ui/ui_local.h

@@ -162,10 +162,8 @@ extern vmCvar_t	ui_mainViewRenderLevel;
 #define	MAX_EDIT_LINE			256
 
 #define MAX_MENUDEPTH			8
-// STONELANCE
-// #define MAX_MENUITEMS			64
 #define MAX_MENUITEMS			128
-// END
+
 
 #define MTYPE_NULL				0
 #define MTYPE_SLIDER			1	
@@ -178,7 +176,6 @@ extern vmCvar_t	ui_mainViewRenderLevel;
 #define MTYPE_SCROLLLIST		8
 #define MTYPE_PTEXT				9
 #define MTYPE_BTEXT				10
-// STONELANCE
 #define MTYPE_LISTBOX			11
 
 #define SB_WIDTH				16
@@ -189,7 +186,6 @@ extern vmCvar_t	ui_mainViewRenderLevel;
 #define SB_TOP					4
 #define SB_BOTTOM				8
 #define SB_HIDE					16
-// END
 
 #define QMF_BLINK				((unsigned int) 0x00000001)
 #define QMF_SMALLFONT			((unsigned int) 0x00000002)
@@ -212,9 +208,7 @@ extern vmCvar_t	ui_mainViewRenderLevel;
 #define QMF_LOWERCASE			((unsigned int) 0x00040000)	// edit field is all lower case
 #define QMF_UPPERCASE			((unsigned int) 0x00080000)	// edit field is all upper case
 #define QMF_SILENT				((unsigned int) 0x00100000)
-// STONELANCE
 #define QMF_SCROLL_ONLY			((unsigned int) 0x00200000)
-// END
 
 // callback notifications
 #define QM_GOTFOCUS				1

engine/code/qcommon/q_shared.h

@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.3c_r450"   
+#define PRODUCT_VERSION "v0.3c_r457"   
 #endif
 
 

q3rallycode.ppr

@@ -886,13 +886,61 @@ q3rallycode
 		engine\cross-make-mingw64.sh
 [Open project files]
 0=engine\code\qcommon\q_shared.h
-1=engine\code\q3_ui\ui_preferences.c
+1=engine\code\game\g_session.c
+2=engine\code\cgame\cg_info.c
+3=engine\code\cgame\cg_rally_hud2.c
+4=engine\code\cgame\cg_rally_tools.c
+5=engine\code\game\ai_dmnet.c
+6=engine\code\game\ai_dmq3.c
+7=engine\code\game\bg_public.h
+8=engine\code\game\g_rally_tools.c
+9=engine\code\q3_ui\ui_rally_servers.c
+10=engine\code\q3_ui\ui_rally_startserver.c
+11=engine\code\q3_ui\ui_servers2.c
+12=engine\code\q3_ui\ui_team.c
+13=engine\code\game\g_spawn.c
 [Selected Project Files]
 Main=
-Selected=engine\code\q3_ui\ui_preferences.c
+Selected=engine\code\game\bg_public.h
 [engine\code\qcommon\q_shared.h]
 TopLine=57
 Caret=36,70
-[engine\code\q3_ui\ui_preferences.c]
+[engine\code\game\g_session.c]
-TopLine=46
+TopLine=130
-Caret=33,68
+Caret=1,146
+[engine\code\cgame\cg_info.c]
+TopLine=271
+Caret=25,288
+[engine\code\cgame\cg_rally_hud2.c]
+TopLine=110
+Caret=51,123
+[engine\code\cgame\cg_rally_tools.c]
+TopLine=769
+Caret=1,785
+[engine\code\game\ai_dmnet.c]
+TopLine=2347
+Caret=1,2435
+[engine\code\game\ai_dmq3.c]
+TopLine=2971
+Caret=1,2991
+[engine\code\game\bg_public.h]
+TopLine=47
+Caret=36,63
+[engine\code\game\g_rally_tools.c]
+TopLine=206
+Caret=1,212
+[engine\code\q3_ui\ui_rally_servers.c]
+TopLine=478
+Caret=1,494
+[engine\code\q3_ui\ui_rally_startserver.c]
+TopLine=2179
+Caret=1,2195
+[engine\code\q3_ui\ui_servers2.c]
+TopLine=1154
+Caret=31,1171
+[engine\code\q3_ui\ui_team.c]
+TopLine=188
+Caret=1,210
+[engine\code\game\g_spawn.c]
+TopLine=467
+Caret=1,483