From 26dc1358ac5fcce53f1776ba5a6172be28bd6108 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 15 Jan 2008 20:51:18 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@599
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/actors.c  | 2 +-
 polymer/eduke32/source/duke3d.h  | 3 ++-
 polymer/eduke32/source/gamedef.c | 1 +
 polymer/eduke32/source/premap.c  | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index a9fe738bd..f7aa7e918 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -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
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 8a21b257d..32d4d0a06 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -785,7 +785,8 @@ enum events {
     EVENT_PROCESSINPUT,
     EVENT_FAKEDOMOVETHINGS,
     EVENT_DISPLAYROOMS,
-    EVENT_KILLIT
+    EVENT_KILLIT,
+    EVENT_LOADACTOR
 };
 
 // store global game definitions
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index e50c99102..d94550930 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -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);
 
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index 69cf0fdd8..87085fb5e 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -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;