cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 15:36:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes infinite loop issues with plant controller.

Browse Source
This commit is contained in:
Zuhayr
2015-02-13 10:56:52 +10:30
parent 066482de93
commit 232c2c93e2
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_controller.dm
+8 -3
View File
@@ -22,6 +22,10 @@
var/global/datum/controller/plants/plant_controller // Set in New().
/datum/controller/plants
var/plants_per_tick = PLANTS_PER_TICK
var/plant_tick_time = PLANT_TICK_TIME
var/list/product_descs = list() // Stores generated fruit descs.
var/list/next_plants = list() // All queued plants.
var/list/seeds = list() // All seed data stored here.
@@ -118,11 +122,12 @@ var/global/datum/controller/plants/plant_controller // Set in New().
var/processed = 0
while(1)
if(!processing)
sleep(PLANT_TICK_TIME)
sleep(plant_tick_time)
else
processed = 0
var/list/plants = next_plants
next_plants = list()
for(var/x=0;x<PLANTS_PER_TICK;x++)
for(var/x=0;x<plants_per_tick;x++)
if(!plants.len)
break
sleep(-1)
@@ -132,7 +137,7 @@ var/global/datum/controller/plants/plant_controller // Set in New().
processed++
if(plants.len)
next_plants |= plants
sleep(PLANT_TICK_TIME - processed)
sleep(plant_tick_time - processed)
/datum/controller/plants/proc/add_plant(var/obj/effect/plant/plant)
next_plants |= plant