git-svn-id: https://svn.eduke32.com/eduke32@599 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-01-15 20:51:18 +00:00
parent 87a4f21cf3
commit 26dc1358ac
4 changed files with 5 additions and 2 deletions

View file

@ -559,7 +559,7 @@ int ssp(int i,unsigned int cliptype) //The set sprite function
void deletespriteEVENT(int s)
{
SetGameVarID(g_iReturnVarID,0, -1, -1);
OnEvent(EVENT_KILLIT, s, myconnectindex, -1);
OnEvent(EVENT_KILLIT, s, -1, -1);
if (!GetGameVarID(g_iReturnVarID, -1, -1))deletesprite(s);
}
#define deletesprite deletespriteEVENT

View file

@ -785,7 +785,8 @@ enum events {
EVENT_PROCESSINPUT,
EVENT_FAKEDOMOVETHINGS,
EVENT_DISPLAYROOMS,
EVENT_KILLIT
EVENT_KILLIT,
EVENT_LOADACTOR
};
// store global game definitions

View file

@ -4771,6 +4771,7 @@ static void AddDefaultDefinitions(void)
AddDefinition("EVENT_WEAPKEY8",EVENT_WEAPKEY8,LABEL_DEFINE);
AddDefinition("EVENT_WEAPKEY9",EVENT_WEAPKEY9,LABEL_DEFINE);
AddDefinition("EVENT_KILLIT",EVENT_KILLIT,LABEL_DEFINE);
AddDefinition("EVENT_LOADACTOR",EVENT_LOADACTOR,LABEL_DEFINE);
AddDefinition("NO",0,LABEL_DEFINE|LABEL_ACTION|LABEL_AI|LABEL_MOVE);

View file

@ -896,6 +896,7 @@ static void prelevel(char g)
nexti = nextspritestat[i];
ResetActorGameVars(i);
LoadActor(i);
OnEvent(EVENT_LOADACTOR, i, -1, -1);
if (sprite[i].lotag == -1 && (sprite[i].cstat&16))
{
g_player[0].ps->exitx = SX;