Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Numerous bug fixes, improvements and clean up to common playsim code.…
… Added minor new feature(s) to HUD and inventory (auto-hiding HUD in jDoom. When finalized will implement in the other games). Commonised several customizability features/options not present in all supported games. The menu headers are somewhat disorganised due to the fact that I have removed the new menu code as it is not yet ready and reinstated the "old" menu for now.
- Loading branch information
danij
committed
Jul 31, 2006
1 parent
f682b85
commit 9d8c222
Showing
99 changed files
with
3,107 additions
and
2,639 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
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
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 |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* DE1: $Id: cl_def.h 3323 2006-06-13 17:25:33Z skyjake $ | ||
| * Copyright (C) 2005 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * | ||
| * 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: http://www.opensource.org/ | ||
| */ | ||
|
|
||
| /* | ||
| * g_controls.h: Common code for game controls | ||
| * | ||
| */ | ||
|
|
||
| #ifndef __COMMON_CONTROLS_H__ | ||
| #define __COMMON_CONTROLS_H__ | ||
|
|
||
| #include "p_ticcmd.h" | ||
| #include "mn_def.h" | ||
|
|
||
| #define CTLCFG_TYPE void | ||
|
|
||
| CTLCFG_TYPE SCControlConfig(int option, void *data); | ||
|
|
||
| // Control flags. | ||
| #define CLF_ACTION 0x1 // The control is an action (+/- in front). | ||
| #define CLF_REPEAT 0x2 // Bind down + repeat. | ||
|
|
||
| typedef struct { | ||
| char *command; // The command to execute. | ||
| int flags; | ||
| int bindClass; // Class it should be bound into | ||
| int defKey; // | ||
| int defMouse; // Zero means there is no default. | ||
| int defJoy; // | ||
| } Control_t; | ||
|
|
||
| extern const Control_t controls[]; | ||
|
|
||
| // Game registered bindClasses | ||
| enum { | ||
| GBC_CLASS1 = NUM_DDBINDCLASSES, | ||
| GBC_CLASS2, | ||
| GBC_CLASS3, | ||
| GBC_MENUHOTKEY, | ||
| GBC_CHAT, | ||
| GBC_MESSAGE | ||
| }; | ||
|
|
||
| extern const Control_t *grabbing; | ||
|
|
||
| void G_ControlRegister(void); | ||
| void G_DefaultBindings(void); | ||
| void G_BindClassRegistration(void); | ||
|
|
||
| void G_BuildTiccmd(ticcmd_t *cmd, float elapsedTime); | ||
| void G_MergeTiccmd(ticcmd_t *dest, ticcmd_t *src); | ||
|
|
||
| void G_LookAround(void); | ||
| boolean G_AdjustControlState(event_t* ev); | ||
| void G_ResetMousePos(void); | ||
|
|
||
| #endif |
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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* DE1: $Id: template.c 2645 2006-01-21 12:58:39Z skyjake $ | ||
| * Copyright (C) 1999- Activision | ||
| * | ||
| * This program is covered by the HERETIC / HEXEN (LIMITED USE) source | ||
| * code license; you can redistribute it and/or modify it under the terms | ||
| * of the HERETIC / HEXEN source code license as published by Activision. | ||
| * | ||
| * THIS MATERIAL IS NOT MADE OR SUPPORTED BY ACTIVISION. | ||
| * | ||
| * WARRANTY INFORMATION. | ||
| * This program is provided as is. Activision and it's affiliates make no | ||
| * warranties of any kind, whether oral or written , express or implied, | ||
| * including any warranty of merchantability, fitness for a particular | ||
| * purpose or non-infringement, and no other representations or claims of | ||
| * any kind shall be binding on or obligate Activision or it's affiliates. | ||
| * | ||
| * LICENSE CONDITIONS. | ||
| * You shall not: | ||
| * | ||
| * 1) Exploit this Program or any of its parts commercially. | ||
| * 2) Use this Program, or permit use of this Program, on more than one | ||
| * computer, computer terminal, or workstation at the same time. | ||
| * 3) Make copies of this Program or any part thereof, or make copies of | ||
| * the materials accompanying this Program. | ||
| * 4) Use the program, or permit use of this Program, in a network, | ||
| * multi-user arrangement or remote access arrangement, including any | ||
| * online use, except as otherwise explicitly provided by this Program. | ||
| * 5) Sell, rent, lease or license any copies of this Program, without | ||
| * the express prior written consent of Activision. | ||
| * 6) Remove, disable or circumvent any proprietary notices or labels | ||
| * contained on or within the Program. | ||
| * | ||
| * You should have received a copy of the HERETIC / HEXEN source code | ||
| * license along with this program (Ravenlic.txt); if not: | ||
| * http://www.ravensoft.com/ | ||
| */ | ||
|
|
||
| /* | ||
| * p_inventory.h: Common code for player inventory | ||
| * | ||
| */ | ||
|
|
||
| #ifndef __COMMON_INVENTORY_H__ | ||
| #define __COMMON_INVENTORY_H__ | ||
|
|
||
| extern boolean artiskip; | ||
| extern boolean usearti; | ||
| extern int inv_ptr; | ||
|
|
||
| boolean P_GiveArtifact(player_t *player, artitype_e arti, mobj_t *mo); | ||
|
|
||
| void P_InventoryRemoveArtifact(player_t *player, int slot); | ||
| boolean P_InventoryUseArtifact(player_t *player, artitype_e arti); | ||
| void P_InventoryNextArtifact(player_t *player); | ||
|
|
||
| #if __JHERETIC__ | ||
| void P_InventoryCheckReadyArtifact(player_t *player); | ||
| #endif | ||
|
|
||
| boolean P_UseArtifactOnPlayer(player_t *player, artitype_e arti); | ||
|
|
||
| DEFCC(CCmdInventory); | ||
|
|
||
| #endif |
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
Oops, something went wrong.