-float SpawnEvent_Send(entity to, int sf);
-entity Spawn_FilterOutBadSpots(entity firstspot, float mindist, float teamcheck);
-entity SelectSpawnPoint (float anypoint);
-void spawnfunc_info_player_deathmatch();
-void spawnpoint_use();
-#endif
+bool SpawnEvent_Send(entity this, entity to, int sf);
+entity Spawn_FilterOutBadSpots(entity this, entity firstspot, float mindist, float teamcheck, bool targetcheck);
+entity SelectSpawnPoint(entity this, bool anypoint);
+spawnfunc(info_player_deathmatch);
+void spawnpoint_use(entity this, entity actor, entity trigger);
+
+USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector current));
+.spawn_evalfunc_t spawn_evalfunc;