- activated weapon code and reverted quick graphics test.

Weapons do not work yet, though.
This commit is contained in:
Christoph Oelckers 2020-10-31 07:11:57 +01:00
parent e33c7d54ac
commit 7f921be824
2 changed files with 9 additions and 14 deletions

View file

@ -400,10 +400,6 @@ void drawscary() {
void DrawHud(float smooth) {
/*
if(pMenu.gShowMenu && !(pMenu.getCurrentMenu() instanceof MenuInterfaceSet))
return;
if (!player[pyrn].dead)
drawweapons(pyrn);
if (player[pyrn].spiked == 1)
@ -411,8 +407,7 @@ void drawscary() {
if (scarytime >= 0)
drawscary();
drawInterface(player[pyrn]);
*/
//drawInterface(player[pyrn]);
}
END_WH_NS

View file

@ -241,22 +241,22 @@ LISTMENU "SkillMenu"
position 130, 50
Linespacing 16
WH1SkillItem "#01933", "$SKILL_EASY", "e", "StartGame", 0
WH1SkillItem "#01934", "$SKILL_NORMAL", "m", "StartGame", 1
WH1SkillItem "#00510", "$SKILL_EASY", "e", "StartGame", 0
WH1SkillItem "#00511", "$SKILL_NORMAL", "m", "StartGame", 1
selecteditem
WH1SkillItem "#01935", "$SKILL_HARD", "h", "StartGame", 2
WH1SkillItem "#01936", "$SKILL_VERY_HARD", "v", "StartGame", 3
WH1SkillItem "#00512", "$SKILL_HARD", "h", "StartGame", 2
WH1SkillItem "#00513", "$SKILL_VERY_HARD", "v", "StartGame", 3
}
ifgame(Witchaven2)
{
CaptionItem "$MNU_DIFFICULTY"
Position 120, 40
Linespacing 22
WH2SkillItem "#01932", "$SKILL_EASY", "e", "StartGame", 0
WH2SkillItem "#01933", "$SKILL_NORMAL", "m", "StartGame", 1
WH2SkillItem "#00510", "$SKILL_EASY", "e", "StartGame", 0
WH2SkillItem "#00511", "$SKILL_NORMAL", "m", "StartGame", 1
selecteditem
WH2SkillItem "#01934", "$SKILL_HARD", "h", "StartGame", 2
WH2SkillItem "#01935", "$SKILL_VERY_HARD", "v", "StartGame", 3
WH2SkillItem "#00512", "$SKILL_HARD", "h", "StartGame", 2
WH2SkillItem "#00513", "$SKILL_VERY_HARD", "v", "StartGame", 3
}
}