OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Backported the classnames-are-names changes from the FP code.

Browse source 
SVN r97 (trunk)
This commit is contained in:
Randy Heit 2006-05-10 02:40:43 +00:00
commit d878c2e7d6
108 changed files with 1476 additions and 1053 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_interaction.cpp
View file

@ -702,8 +702,8 @@ void P_AutoUseHealth(player_t *player, int saveHealth)
{
int i;
int count;
const TypeInfo *normalType = TypeInfo::FindType ("ArtiHealth");
const TypeInfo *superType = TypeInfo::FindType ("ArtiSuperHealth");
const PClass *normalType = PClass::FindClass (NAME_ArtiHealth);
const PClass *superType = PClass::FindClass (NAME_ArtiSuperHealth);
AInventory *normalItem = player->mo->FindInventory (normalType);
AInventory *superItem = player->mo->FindInventory (superType);
int normalAmount, superAmount;
@ -773,11 +773,11 @@ void P_AutoUseHealth(player_t *player, int saveHealth)
void P_AutoUseStrifeHealth (player_t *player)
{
static const char *healthnames[2] = { "MedicalKit", "MedPatch" };
static const ENamedName healthnames[2] = { NAME_MedicalKit, NAME_MedPatch };
for (int i = 0; i < 2; ++i)
{
const TypeInfo *type = TypeInfo::FindType (healthnames[i]);
const PClass *type = PClass::FindClass (healthnames[i]);
while (player->health < 50)
{