Fix weapon selection sounds fpr pc shareware and do not allow selecting weapons not available in this content (i.e. if obtained by cheat)
This commit is contained in:
parent
bc7089fd7e
commit
5d1cf695e2
|
@ -3,6 +3,7 @@ D1X-Rebirth Changelog
|
||||||
20110604
|
20110604
|
||||||
--------
|
--------
|
||||||
main/lighting.c: Since set_dynamic_light() is not necessarily processed each frame, added own counter for delayed precession of vertex-clight calculation; Added possibility to page in a bitmap in case an object which has never been rendered before is supposed to cast light visible by the player
|
main/lighting.c: Since set_dynamic_light() is not necessarily processed each frame, added own counter for delayed precession of vertex-clight calculation; Added possibility to page in a bitmap in case an object which has never been rendered before is supposed to cast light visible by the player
|
||||||
|
main/sounds.h, main/weapon.c: Fix weapon selection sounds fpr pc shareware and do not allow selecting weapons not available in this content (i.e. if obtained by cheat)
|
||||||
|
|
||||||
20110601
|
20110601
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -217,20 +217,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
|
|
||||||
#define SOUND_VOLATILE_WALL_HISS 151 // need a hiss sound here.
|
#define SOUND_VOLATILE_WALL_HISS 151 // need a hiss sound here.
|
||||||
|
|
||||||
#ifdef SHAREWARE
|
#define SOUND_GOOD_SELECTION_PRIMARY (PCSharePig?155:153)
|
||||||
#define SOUND_GOOD_SELECTION_PRIMARY 155
|
|
||||||
#define SOUND_GOOD_SELECTION_SECONDARY 155
|
|
||||||
#define SOUND_ALREADY_SELECTED 155
|
|
||||||
#define SOUND_BAD_SELECTION 156
|
|
||||||
#define SOUND_CHEATER 156 // added by Victor Rachels
|
|
||||||
#else
|
|
||||||
#define SOUND_GOOD_SELECTION_PRIMARY 153
|
|
||||||
#define SOUND_BAD_SELECTION 156
|
#define SOUND_BAD_SELECTION 156
|
||||||
|
#define SOUND_GOOD_SELECTION_SECONDARY (PCSharePig?155:154) // Adam: New sound number here! MK, 01/30/95
|
||||||
#define SOUND_GOOD_SELECTION_SECONDARY 154 // Adam: New sound number here! MK, 01/30/95
|
|
||||||
#define SOUND_ALREADY_SELECTED 155 // Adam: New sound number here! MK, 01/30/95
|
#define SOUND_ALREADY_SELECTED 155 // Adam: New sound number here! MK, 01/30/95
|
||||||
#define SOUND_CHEATER 200 // moved by Victor Rachels
|
#define SOUND_CHEATER (PCSharePig?200:156) // moved by Victor Rachels
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SOUND_CLOAK_OFF 161 //sound when cloak goes away
|
#define SOUND_CLOAK_OFF 161 //sound when cloak goes away
|
||||||
#define SOUND_INVULNERABILITY_OFF 163 //sound when invulnerability goes away
|
#define SOUND_INVULNERABILITY_OFF 163 //sound when invulnerability goes away
|
||||||
|
|
|
@ -229,14 +229,14 @@ void do_weapon_select(int weapon_num, int secondary_flag)
|
||||||
char *weapon_name;
|
char *weapon_name;
|
||||||
|
|
||||||
|
|
||||||
#ifdef SHAREWARE // do special hud msg. for picking registered weapon in shareware version.
|
// do special hud msg. for picking registered weapon in shareware version.
|
||||||
if (weapon_num >= NUM_SHAREWARE_WEAPONS) {
|
if (PCSharePig)
|
||||||
weapon_name = secondary_flag?SECONDARY_WEAPON_NAMES(weapon_num):PRIMARY_WEAPON_NAMES(weapon_num);
|
if (weapon_num >= NUM_SHAREWARE_WEAPONS) {
|
||||||
HUD_init_message(HM_DEFAULT, "%s %s!", weapon_name,TXT_NOT_IN_SHAREWARE);
|
weapon_name = secondary_flag?SECONDARY_WEAPON_NAMES(weapon_num):PRIMARY_WEAPON_NAMES(weapon_num);
|
||||||
digi_play_sample( SOUND_BAD_SELECTION, F1_0 );
|
HUD_init_message(HM_DEFAULT, "%s %s!", weapon_name,TXT_NOT_IN_SHAREWARE);
|
||||||
return;
|
digi_play_sample( SOUND_BAD_SELECTION, F1_0 );
|
||||||
}
|
return;
|
||||||
#endif
|
}
|
||||||
|
|
||||||
if (!secondary_flag) {
|
if (!secondary_flag) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue