TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix weapon selection sounds fpr pc shareware and do not allow selecting weapons not available in this content (i.e. if obtained by cheat)

Browse source
This commit is contained in:
zicodxx 2011-06-04 13:17:54 +02:00
parent bc7089fd7e
commit 5d1cf695e2
3 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
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/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
--------

15
main/sounds.h
View file

@ -217,20 +217,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define SOUND_VOLATILE_WALL_HISS 151 // need a hiss sound here.
#ifdef SHAREWARE
#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_GOOD_SELECTION_PRIMARY (PCSharePig?155:153)
#define SOUND_BAD_SELECTION 156
#define SOUND_GOOD_SELECTION_SECONDARY 154 // Adam: New sound number here! MK, 01/30/95
#define SOUND_GOOD_SELECTION_SECONDARY (PCSharePig?155: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_CHEATER 200 // moved by Victor Rachels
#endif
#define SOUND_CHEATER (PCSharePig?200:156) // moved by Victor Rachels
#define SOUND_CLOAK_OFF 161 //sound when cloak goes away
#define SOUND_INVULNERABILITY_OFF 163 //sound when invulnerability goes away

16
main/weapon.c
View file

@ -229,14 +229,14 @@ void do_weapon_select(int weapon_num, int secondary_flag)
char *weapon_name;
#ifdef SHAREWARE // do special hud msg. for picking registered weapon in shareware version.
if (weapon_num >= NUM_SHAREWARE_WEAPONS) {
weapon_name = secondary_flag?SECONDARY_WEAPON_NAMES(weapon_num):PRIMARY_WEAPON_NAMES(weapon_num);
HUD_init_message(HM_DEFAULT, "%s %s!", weapon_name,TXT_NOT_IN_SHAREWARE);
digi_play_sample( SOUND_BAD_SELECTION, F1_0 );
return;
}
#endif
// do special hud msg. for picking registered weapon in shareware version.
if (PCSharePig)
if (weapon_num >= NUM_SHAREWARE_WEAPONS) {
weapon_name = secondary_flag?SECONDARY_WEAPON_NAMES(weapon_num):PRIMARY_WEAPON_NAMES(weapon_num);
HUD_init_message(HM_DEFAULT, "%s %s!", weapon_name,TXT_NOT_IN_SHAREWARE);
digi_play_sample( SOUND_BAD_SELECTION, F1_0 );
return;
}
if (!secondary_flag) {