make teleports work for spectators

closes #51
sauerbraten · Mar 17, 2022 · 9104dea · 9104dea
1 parent 382cf92
commit 9104dea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -61,6 +61,7 @@ apply-patches:
 	$(PATCH) < patches/nextfollowteam.patch
 	$(PATCH) < patches/proxy_setip.patch
 	$(PATCH) < patches/server_demo_name.patch
+	$(PATCH) < patches/spec_teleports.patch
 	unix2dos src/vcpp/sauerbraten.nsi
 	unix2dos src/vcpp/sauerbraten.vcxproj
 	cd src && make depend

diff --git a/patches/spec_teleports.patch b/patches/spec_teleports.patch
@@ -0,0 +1,19 @@
+diff --git src/fpsgame/entities.cpp src/fpsgame/entities.cpp
+index a492ca5..9ae842d 100644
+--- src/fpsgame/entities.cpp
++++ src/fpsgame/entities.cpp
+@@ -335,8 +335,13 @@ namespace entities
+
+     void checkitems(fpsent *d)
+     {
+-        if(d->state!=CS_ALIVE) return;
+         vec o = d->feetpos();
++        if(d->state==CS_SPECTATOR) loopv(ents)
++        {
++            extentity &e = *ents[i];
++            if(e.type==TELEPORT && e.o.dist(o)<16) trypickup(i, d);
++        }
++        if(d->state!=CS_ALIVE) return;
+         loopv(ents)
+         {
+             extentity &e = *ents[i];
diff --git a/src/fpsgame/entities.cpp b/src/fpsgame/entities.cpp
@@ -335,8 +335,13 @@ namespace entities
 
     void checkitems(fpsent *d)
     {
-        if(d->state!=CS_ALIVE) return;
         vec o = d->feetpos();
+        if(d->state==CS_SPECTATOR) loopv(ents)
+        {
+            extentity &e = *ents[i];
+            if(e.type==TELEPORT && e.o.dist(o)<16) trypickup(i, d);
+        }
+        if(d->state!=CS_ALIVE) return;
         loopv(ents)
         {
             extentity &e = *ents[i];