diff options
| author | Simon Howard | 2008-09-17 19:56:12 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-09-17 19:56:12 +0000 |
| commit | 8cdc173252c479b8a7448da9ccd48f32eeb0c427 (patch) | |
| tree | 98bd5d61d9c802f34c7444b6bf8cf7ad035d1395 /src/heretic/sb_bar.c | |
| parent | 3dc8f945820e08c698d4aed66f4f7bf4a9eb9401 (diff) | |
| download | chocolate-doom-8cdc173252c479b8a7448da9ccd48f32eeb0c427.tar.gz chocolate-doom-8cdc173252c479b8a7448da9ccd48f32eeb0c427.tar.bz2 chocolate-doom-8cdc173252c479b8a7448da9ccd48f32eeb0c427.zip | |
Remove definitions from heretic/doomdef.h that are in common code.
Replace "shareware" variable with gamemode, as in doom code. Merge angle
definitions into common code.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1240
Diffstat (limited to 'src/heretic/sb_bar.c')
| -rw-r--r-- | src/heretic/sb_bar.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/heretic/sb_bar.c b/src/heretic/sb_bar.c index 6414bb8f..3b6434b3 100644 --- a/src/heretic/sb_bar.c +++ b/src/heretic/sb_bar.c @@ -1275,7 +1275,7 @@ static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat) { player->weaponowned[i] = true; } - if (shareware) + if (gamemode == shareware) { player->weaponowned[wp_skullrod] = false; player->weaponowned[wp_phoenixrod] = false; @@ -1377,7 +1377,8 @@ static void CheatArtifact3Func(player_t * player, Cheat_t * cheat) { // All artifacts for (i = arti_none + 1; i < NUMARTIFACTS; i++) { - if (shareware && (i == arti_superhealth || i == arti_teleport)) + if (gamemode == shareware + && (i == arti_superhealth || i == arti_teleport)) { continue; } @@ -1391,7 +1392,8 @@ static void CheatArtifact3Func(player_t * player, Cheat_t * cheat) else if (type > arti_none && type < NUMARTIFACTS && count > 0 && count < 10) { - if (shareware && (type == arti_superhealth || type == arti_teleport)) + if (gamemode == shareware + && (type == arti_superhealth || type == arti_teleport)) { P_SetMessage(player, TXT_CHEATARTIFACTSFAIL, false); return; |