zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 19:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r2794:

Browse source 
- Added Demolisher's APROP_Target/TracerTID [fixed] submission.
- Reverted r2783 because it was causing problems.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@965 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-09-16 09:06:42 +00:00
parent f19cdb49f3
commit 00845f2bb3
5 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/g_game.cpp
View file

@ -1345,10 +1345,7 @@ void G_PlayerReborn (int player)
if (gamestate != GS_TITLELEVEL)
{
actor->GiveDefaultInventory ();
// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
p->ReadyWeapon = NULL;
//p->ReadyWeapon = p->PendingWeapon;
p->ReadyWeapon = p->PendingWeapon;
}
//Added by MC: Init bot structure.

6
src/p_acs.cpp
View file

@ -2547,6 +2547,8 @@ enum
APROP_Notrigger = 23,
APROP_DamageFactor = 24,
APROP_MasterTID = 25,
APROP_TargetTID = 26,
APROP_TracerTID = 27
};
// These are needed for ACS's APROP_RenderStyle
@ -2786,6 +2788,8 @@ int DLevelScript::GetActorProperty (int tid, int property)
}
case APROP_Score: return actor->Score;
case APROP_MasterTID: return DoGetMasterTID (actor);
case APROP_TargetTID: return (actor->target != NULL)? actor->target->tid : 0;
case APROP_TracerTID: return (actor->tracer != NULL)? actor->tracer->tid : 0;
default: return 0;
}
}
@ -2817,6 +2821,8 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value)
case APROP_JumpZ:
case APROP_Score:
case APROP_MasterTID:
case APROP_TargetTID:
case APROP_TracerTID:
return (GetActorProperty(tid, property) == value);
// Boolean values need to compare to a binary version of value

6
src/p_pspr.cpp
View file

@ -794,15 +794,9 @@ void P_SetupPsprites(player_t *player)
{
player->psprites[i].state = NULL;
}
// [Spleen] Let P_MovePsprites handle calling P_BringUpWeapon,
// instead of P_SetupPsprites, to avoid raising it twice in one tic.
/*
// Spawn the ready weapon
player->PendingWeapon = player->ReadyWeapon;
P_BringUpWeapon (player);
*/
}
//------------------------------------------------------------------------

5
src/p_user.cpp
View file

@ -1103,10 +1103,7 @@ void APlayerPawn::GiveDefaultInventory ()
if (item != NULL && item->IsKindOf (RUNTIME_CLASS (AWeapon)) &&
static_cast<AWeapon*>(item)->CheckAmmo(AWeapon::EitherFire, false))
{
// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
player->PendingWeapon = static_cast<AWeapon *> (item);
player->ReadyWeapon = NULL;
//player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
}
}
di = di->Next;

4
src/svnrevision.h
View file

@ -3,5 +3,5 @@
// This file was automatically generated by the
// updaterevision tool. Do not edit by hand.
#define ZD_SVN_REVISION_STRING "2786"
#define ZD_SVN_REVISION_NUMBER 2786
#define ZD_SVN_REVISION_STRING "2794"
#define ZD_SVN_REVISION_NUMBER 2794