mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +01:00
Fixed all the runtimes.
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
* WARNING, only supports /mob and /obj.
|
||||
*/
|
||||
|
||||
#define DEBUG_OBJECT_POOL 0
|
||||
#define DEBUG_OBJECT_POOL 1
|
||||
#define MAINTAINING_OBJECT_POOL_COUNT 20
|
||||
|
||||
var/list/masterPool = list()
|
||||
@@ -100,11 +100,10 @@ var/list/masterPool = list()
|
||||
|
||||
if (isnull(masterPool[Object.type]))
|
||||
#if DEBUG_OBJECT_POOL
|
||||
world << "DEBUG_OBJECT_POOL: [Object.type] pool is empty, recreating list."
|
||||
world << "DEBUG_OBJECT_POOL: [Object.type] pool is empty, recreating pool."
|
||||
#endif
|
||||
|
||||
masterPool[Object.type] = list()
|
||||
// A way to limit
|
||||
else if (length(masterPool[Object.type]) > MAINTAINING_OBJECT_POOL_COUNT)
|
||||
#if DEBUG_OBJECT_POOL
|
||||
world << "DEBUG_OBJECT_POOL: returnToPool([Object.type]) exceeds [num2text(MAINTAINING_OBJECT_POOL_COUNT)] discarding..."
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
Bump(atom/A as mob|obj|turf|area)
|
||||
if(A == firer)
|
||||
loc = A.loc
|
||||
//loc = A.loc
|
||||
return 0 //cannot shoot yourself
|
||||
|
||||
if(bumped) return 0
|
||||
@@ -182,6 +182,7 @@
|
||||
if(!istype(src, /obj/item/projectile/beam/lightning))
|
||||
density = 0
|
||||
invisibility = 101
|
||||
//del(src)
|
||||
returnToPool(src)
|
||||
return 1
|
||||
|
||||
@@ -199,6 +200,7 @@
|
||||
if(kill_count < 1)
|
||||
//del(src)
|
||||
returnToPool(src)
|
||||
return
|
||||
kill_count--
|
||||
spawn while(src)
|
||||
if((!( current ) || loc == current))
|
||||
|
||||
@@ -206,6 +206,9 @@ var/list/beam_master = list()
|
||||
return
|
||||
step_towards(src, current) //Move~
|
||||
|
||||
if (isnull(loc))
|
||||
return
|
||||
|
||||
if(kill_count < 1)
|
||||
//del(src)
|
||||
returnToPool(src)
|
||||
|
||||
Reference in New Issue
Block a user