summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2005-12-23 14:58:08 +0000
committerTim Angus <tim@ngus.net>2005-12-23 14:58:08 +0000
commit4b614e63d7da358a8a30e61a89365add79ecde9c (patch)
tree4359a65c759e098e6efc8c31c28d337f3ba66689 /src/game
parent07af35d09bd690d0f4ce059c4b3069917b8a49a4 (diff)
* Crudely removed CD key authentication
* Changed defaults for r_picmip and r_textureMode * Changed internal alien weapon names * Removed playback of the intro movie * Fixed painblend reset bug * Added multiple chat sounds * Player splash wake now uses mark system
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_misc.c76
-rw-r--r--src/game/g_main.c2
-rw-r--r--src/game/g_trigger.c2
3 files changed, 40 insertions, 40 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 7bad98c4..cf2649ee 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -3280,7 +3280,7 @@ weaponAttributes_t bg_weapons[ ] =
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "abuild2", //char *weaponName;
+ "abuildupg", //char *weaponName;
"Alien build weapon2",//char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
@@ -3303,7 +3303,7 @@ weaponAttributes_t bg_weapons[ ] =
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "bite", //char *weaponName;
+ "level0", //char *weaponName;
"Bite", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
@@ -3322,17 +3322,17 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL3, //int weaponNum;
+ WP_ALEVEL1, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "pounce", //char *weaponName;
- "Claw and pounce", //char *weaponHumanName;
+ "level1", //char *weaponName;
+ "Claws", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL3_CLAW_REPEAT, //int repeatRate1;
+ LEVEL1_CLAW_REPEAT, //int repeatRate1;
0, //int repeatRate2;
0, //int repeatRate3;
0, //int reloadTime;
@@ -3345,22 +3345,22 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL3_UPG, //int weaponNum;
+ WP_ALEVEL1_UPG, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "pounce_upgrade", //char *weaponName;
- "Claw and pounce (upgrade)", //char *weaponHumanName;
- 3, //int maxAmmo;
+ "level1upg", //char *weaponName;
+ "Claws Upgrade", //char *weaponHumanName;
+ 0, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL3_CLAW_U_REPEAT,//int repeatRate1;
- 0, //int repeatRate2;
- LEVEL3_BOUNCEBALL_REPEAT,//int repeatRate3;
+ LEVEL1_CLAW_U_REPEAT, //int repeatRate1;
+ LEVEL1_PCLOUD_REPEAT, //int repeatRate2;
+ 0, //int repeatRate3;
0, //int reloadTime;
- qfalse, //qboolean hasAltMode;
- qtrue, //qboolean hasThirdMode;
+ qtrue, //qboolean hasAltMode;
+ qfalse, //qboolean hasThirdMode;
qfalse, //qboolean canZoom;
90.0f, //float zoomFov;
qfalse, //qboolean purchasable;
@@ -3368,17 +3368,17 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL1, //int weaponNum;
+ WP_ALEVEL2, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "grabandclaw", //char *weaponName;
- "Claws", //char *weaponHumanName;
+ "level2", //char *weaponName;
+ "Bite", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL1_CLAW_REPEAT, //int repeatRate1;
+ LEVEL2_CLAW_REPEAT, //int repeatRate1;
0, //int repeatRate2;
0, //int repeatRate3;
0, //int reloadTime;
@@ -3391,18 +3391,18 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL1_UPG, //int weaponNum;
+ WP_ALEVEL2_UPG, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "grabandclaw_upgrade",//char *weaponName;
- "Claws Upgrade", //char *weaponHumanName;
+ "level2upg", //char *weaponName;
+ "Zap", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL1_CLAW_U_REPEAT, //int repeatRate1;
- LEVEL1_PCLOUD_REPEAT, //int repeatRate2;
+ LEVEL2_CLAW_U_REPEAT, //int repeatRate1;
+ LEVEL2_AREAZAP_REPEAT,//int repeatRate2;
0, //int repeatRate3;
0, //int reloadTime;
qtrue, //qboolean hasAltMode;
@@ -3414,17 +3414,17 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL2, //int weaponNum;
+ WP_ALEVEL3, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "areazap", //char *weaponName;
- "Area Zap", //char *weaponHumanName;
+ "level3", //char *weaponName;
+ "Pounce", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL2_CLAW_REPEAT, //int repeatRate1;
+ LEVEL3_CLAW_REPEAT, //int repeatRate1;
0, //int repeatRate2;
0, //int repeatRate3;
0, //int reloadTime;
@@ -3437,22 +3437,22 @@ weaponAttributes_t bg_weapons[ ] =
WUT_ALIENS //WUTeam_t team;
},
{
- WP_ALEVEL2_UPG, //int weaponNum;
+ WP_ALEVEL3_UPG, //int weaponNum;
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "directzap", //char *weaponName;
- "Directed Zap", //char *weaponHumanName;
- 0, //int maxAmmo;
+ "level3upg", //char *weaponName;
+ "Pounce (upgrade)", //char *weaponHumanName;
+ 3, //int maxAmmo;
0, //int maxClips;
qtrue, //int infiniteAmmo;
qfalse, //int usesEnergy;
- LEVEL2_CLAW_U_REPEAT,//int repeatRate1;
- LEVEL2_AREAZAP_REPEAT,//int repeatRate2;
- 0, //int repeatRate3;
+ LEVEL3_CLAW_U_REPEAT, //int repeatRate1;
+ 0, //int repeatRate2;
+ LEVEL3_BOUNCEBALL_REPEAT,//int repeatRate3;
0, //int reloadTime;
- qtrue, //qboolean hasAltMode;
- qfalse, //qboolean hasThirdMode;
+ qfalse, //qboolean hasAltMode;
+ qtrue, //qboolean hasThirdMode;
qfalse, //qboolean canZoom;
90.0f, //float zoomFov;
qfalse, //qboolean purchasable;
@@ -3464,7 +3464,7 @@ weaponAttributes_t bg_weapons[ ] =
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "charge", //char *weaponName;
+ "level4", //char *weaponName;
"Charge", //char *weaponHumanName;
0, //int maxAmmo;
0, //int maxClips;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index bc3513a5..95cbda14 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -560,7 +560,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
level.time = levelTime;
level.startTime = levelTime;
- level.snd_fry = G_SoundIndex( "sound/player/fry.wav" ); // FIXME standing in lava / slime
+ level.snd_fry = G_SoundIndex( "sound/misc/fry.wav" ); // FIXME standing in lava / slime
if( g_logFile.string[ 0 ] )
{
diff --git a/src/game/g_trigger.c b/src/game/g_trigger.c
index 2bd62177..0c86747f 100644
--- a/src/game/g_trigger.c
+++ b/src/game/g_trigger.c
@@ -399,7 +399,7 @@ void SP_trigger_hurt( gentity_t *self )
{
InitTrigger( self );
- self->noise_index = G_SoundIndex( "sound/world/electro.wav" );
+ self->noise_index = G_SoundIndex( "sound/misc/electro.wav" );
self->touch = hurt_touch;
if( !self->damage )
generated by cgit (git 2.34.1) at 2024-12-25 05:36:55 +0000