Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed|libdoom: Cheats not working in multiplayer
There were numerous logic issues in the cheat code handling which interpreted cheats entered via the console differently to those entered using keyboard input event sequences. All cheats are now actioned by console commands which the original games' keyboard input event sequences are mapped to. It no longer matters how a cheat is entered. All P_Give* functions have been reworked and cleaned up so as to standardize on the internal APIs. Todo: Do the same for libheretic and libhexen...
- Loading branch information
1 parent
dfb1f74
commit b9fdf4f
Showing
5 changed files
with
592 additions
and
631 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,111 @@ | ||
| /**\file | ||
| *\section License | ||
| * License: GPL | ||
| * Online License Link: http://www.gnu.org/licenses/gpl.html | ||
| /** @file p_inter.h | ||
| * | ||
| *\author Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| *\author Copyright © 2005-2013 Daniel Swanson <danij@dengine.net> | ||
| *\author Copyright © 1993-1996 by id Software, Inc. | ||
| * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net> | ||
| * @authors Copyright © 1993-1996 by id Software, Inc. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * <small>This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. This program is distributed in the hope that it | ||
| * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
| * Public License for more details. You should have received a copy of the GNU | ||
| * General Public License along with this program; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA</small> | ||
| */ | ||
|
|
||
| #ifndef LIBDOOM_P_INTER_H | ||
| #define LIBDOOM_P_INTER_H | ||
|
|
||
| #ifndef __JDOOM__ | ||
| # error "Using jDoom headers without __JDOOM__" | ||
| #endif | ||
|
|
||
| /** | ||
| * @param player Player to receive the power. | ||
| * @param powerType Power type to give. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, | ||
| * Boston, MA 02110-1301 USA | ||
| * @return @c true iff the power was given. | ||
| */ | ||
| boolean P_GivePower(player_t *player, powertype_t powerType); | ||
|
|
||
| /** | ||
| * p_inter.h: | ||
| * @param player Player to relieve of the power. | ||
| * @param powerType Power type to take. | ||
| * | ||
| * @return @c true iff the power was taken. | ||
| */ | ||
| boolean P_TakePower(player_t *player, powertype_t powerType); | ||
|
|
||
| #ifndef __P_INTER_H__ | ||
| #define __P_INTER_H__ | ||
| /** | ||
| * @param player Player to toggle a power for. | ||
| * @param powerType Power type to toggle. | ||
| * | ||
| * @return @c true iff the power was toggled. | ||
| */ | ||
| boolean P_TogglePower(player_t *player, powertype_t powerType); | ||
|
|
||
| #ifndef __JDOOM__ | ||
| # error "Using jDoom headers without __JDOOM__" | ||
| #endif | ||
| /** | ||
| * Give key(s) to the specified player. If a key is successfully given a short | ||
| * "bonus flash" screen tint animation is played and a HUE_ON_PICKUP_KEY event | ||
| * is generated (which optionally reveals the HUD if hidden). If the specified | ||
| * key(s) are already owned then nothing will happen (and false is returned). | ||
| * | ||
| * @param player Player to receive the key(s). | ||
| * @param keyType Key type to give. Use @c NUM_KEY_TYPES to give ALL keys. | ||
| * | ||
| * @return @c true iff at least one new key was given (not already owned). | ||
| */ | ||
| boolean P_GiveKey(player_t *player, keytype_t keyType); | ||
|
|
||
| boolean P_GivePower(player_t *plr, int); | ||
| boolean P_TakePower(player_t *plr, int power); | ||
| void P_GiveKey(player_t *plr, keytype_t keyType); | ||
| boolean P_GiveBody(player_t *plr, int num); | ||
| void P_GiveBackpack(player_t *plr); | ||
| boolean P_GiveWeapon(player_t *plr, weapontype_t weapon, boolean dropped, const char* pickupMessage, int pickupSound); | ||
| boolean P_GiveArmorType(player_t* plr, int type, int points); | ||
| /** | ||
| * Give ammo(s) to the specified player. If a ammo is successfully given the | ||
| * player 'brain' may decide to change weapon (depends on the user's config) | ||
| * and a HUE_ON_PICKUP_AMMO event is generated (which optionally reveals the | ||
| * HUD if hidden). If the specified ammo(s) are already owned then nothing will | ||
| * happen (and false is returned). | ||
| * | ||
| * @note The final number of rounds the player will receive depends on both the | ||
| * ammount given and how many the player can carry. Use @ref P_GiveBackpack() | ||
| * to equip the player with a backpack, thereby increasing this capacity. | ||
| * | ||
| * @param player Player to receive the ammo(s). | ||
| * @param ammoType Ammo type to give. Use @c NUM_AMMO_TYPES to give ALL ammos. | ||
| * Giving the special 'unlimited ammo' type @c AT_NOAMMO will | ||
| * always succeed, however no sideeffects will occur. | ||
| * @param numClips Number of clip loads (@em not rounds!). Use @c 0 to give | ||
| * only half of one clip. Use @c -1 to give as many clips as | ||
| * necessary to fully replenish stock. | ||
| * | ||
| * @return @c true iff at least one new round was given (not already owned). | ||
| */ | ||
| boolean P_GiveAmmo(player_t *player, ammotype_t ammoType, int numClips); | ||
|
|
||
| #endif | ||
| /** | ||
| * @param player Player to receive the health. | ||
| * | ||
| * @return @c true iff at least some of the health was given. | ||
| */ | ||
| boolean P_GiveHealth(player_t *player, int amount); | ||
|
|
||
| /** | ||
| * @param player Player to receive the backpack. | ||
| */ | ||
| void P_GiveBackpack(player_t *player); | ||
|
|
||
| /** | ||
| * The weapon name may have a MF_DROPPED flag ored in. | ||
| */ | ||
| boolean P_GiveWeapon(player_t *player, weapontype_t weapon, boolean dropped); | ||
|
|
||
| /** | ||
| * @return @c true iff the armor was given. | ||
| */ | ||
| boolean P_GiveArmor(player_t *player, int type, int points); | ||
|
|
||
| #endif // LIBDOOM_P_INTER_H |
Oops, something went wrong.