diff --git a/engine/code/game/g_weapon.c b/engine/code/game/g_weapon.c index e8b70327..63ffc1db 100644 --- a/engine/code/game/g_weapon.c +++ b/engine/code/game/g_weapon.c @@ -609,7 +609,7 @@ void weapon_railgun_fire (gentity_t *ent) { int passent; gentity_t *unlinkedEntities[MAX_RAIL_HITS]; - damage = 50 * s_quadFactor; + damage = 17 * s_quadFactor; VectorMA (muzzle, 8192, forward, end); @@ -1211,10 +1211,9 @@ void FireWeapon( gentity_t *ent ) { case WP_BFG: BFG_Fire( ent ); break; - - case WP_FLAME_THROWER: - Weapon_fire_flame( ent ); - break; + case WP_FLAME_THROWER: + Weapon_fire_flame( ent ); + break; #ifdef MISSIONPACK case WP_NAILGUN: diff --git a/engine/code/q3_ui/ui_credits.c b/engine/code/q3_ui/ui_credits.c index 353ca6c8..90d95a57 100644 --- a/engine/code/q3_ui/ui_credits.c +++ b/engine/code/q3_ui/ui_credits.c @@ -132,6 +132,7 @@ cr_line credits[] = { // edit this as necessary for your credits { "Mirco 'PaniC' Herrmann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Jeremiah aka. 'BETAMONKEY'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'Onai'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, +{ "'insellium'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index b52f50e5..b89312e6 100644 --- a/engine/code/qcommon/q_shared.h +++ b/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.0.3.0_r287" +#define PRODUCT_VERSION "v0.0.3.0_r289" #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index f0eb0011..056766c2 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -859,89 +859,33 @@ q3rallycode engine\cross-make-mingw64.sh [Open project files] 0=engine\code\qcommon\files.c -1=engine\Makefile -2=engine\code\q3_ui\ui_rally_startserver.c -3=engine\code\cgame\cg_local.h -4=engine\code\cgame\cg_main.c -5=engine\code\client\snd_dma.c -6=engine\code\game\g_spawn.c -7=engine\code\q3_ui\ui_menu.c -8=engine\code\q3_ui\ui_credits.c -9=engine\code\q3_ui\ui_rally_controls.c -10=engine\code\q3_ui\ui_rally_options.c -11=engine\code\game\g_weapon.c -12=engine\code\game\g_rally_rearweapon.c -13=engine\code\q3_ui\ui_rally_credits.c -14=engine\code\qcommon\q_shared.h -15=engine\code\ui\ui_main.c -16=engine\resync_svn.sh -17=engine\code\q3_ui\ui_rally_servers.c -18=engine\code\qcommon\qcommon.h -19=engine\code\game\g_utils.c -20=engine\code\cgame\cg_rally_hud.c +1=engine\code\game\g_weapon.c +2=engine\code\cgame\cg_weapons.c +3=engine\code\game\g_missile.c +4=engine\code\qcommon\q_shared.h +5=engine\code\q3_ui\ui_rally_credits.c +6=engine\code\q3_ui\ui_credits.c [Selected Project Files] Main= -Selected=engine\code\cgame\cg_rally_hud.c +Selected=engine\code\q3_ui\ui_credits.c [engine\code\qcommon\files.c] TopLine=3681 Caret=1,3695 -[engine\Makefile] -TopLine=1 -Caret=17,114 -[engine\code\q3_ui\ui_rally_startserver.c] -TopLine=1228 -Caret=22,1254 -[engine\code\cgame\cg_local.h] -TopLine=2063 -Caret=10,2089 -[engine\code\cgame\cg_main.c] -TopLine=2254 -Caret=1,2269 -[engine\code\client\snd_dma.c] -TopLine=709 -Caret=1,724 -[engine\code\game\g_spawn.c] -TopLine=655 -Caret=1,670 -[engine\code\q3_ui\ui_menu.c] -TopLine=417 -Caret=63,438 -[engine\code\q3_ui\ui_credits.c] -TopLine=87 -Caret=5,105 -[engine\code\q3_ui\ui_rally_controls.c] -TopLine=548 -Caret=80,574 -[engine\code\q3_ui\ui_rally_options.c] -TopLine=147 -Caret=27,147 [engine\code\game\g_weapon.c] -TopLine=586 +TopLine=593 Caret=13,612 -[engine\code\game\g_rally_rearweapon.c] -TopLine=211 -Caret=1,225 -[engine\code\q3_ui\ui_rally_credits.c] -TopLine=79 -Caret=118,93 +[engine\code\cgame\cg_weapons.c] +TopLine=766 +Caret=17,810 +[engine\code\game\g_missile.c] +TopLine=1022 +Caret=1,201 [engine\code\qcommon\q_shared.h] -TopLine=1 +TopLine=55 Caret=39,70 -[engine\code\ui\ui_main.c] -TopLine=3012 -Caret=1,3026 -[engine\resync_svn.sh] -TopLine=44 -Caret=1,58 -[engine\code\q3_ui\ui_rally_servers.c] -TopLine=1230 -Caret=1,1244 -[engine\code\qcommon\qcommon.h] -TopLine=253 -Caret=1,267 -[engine\code\game\g_utils.c] -TopLine=679 -Caret=1,693 -[engine\code\cgame\cg_rally_hud.c] -TopLine=831 -Caret=26,845 +[engine\code\q3_ui\ui_rally_credits.c] +TopLine=63 +Caret=1,78 +[engine\code\q3_ui\ui_credits.c] +TopLine=110 +Caret=76,135