cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

more lightweight camera caching

Browse Source 
no loops

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2015-05-09 23:25:12 +01:00
parent 5b92057890
commit 895e78df1e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/computer/camera.dm
View File

@@ -1,11 +1,9 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/var/camera_cache_id = 1
/proc/invalidateCameraCache() /proc/invalidateCameraCache()
for(var/obj/machinery/computer/security/s in machines) camera_cache_id = (++camera_cache_id % 999999)
s.camera_cache = null
var/datum/alarm_handler/AHandler = new /datum/alarm_handler()
for(var/datum/alarm/A in AHandler.alarms)
A.cameras = null
/obj/machinery/computer/security /obj/machinery/computer/security
name = "security camera monitor" name = "security camera monitor"
@@ -15,6 +13,7 @@
var/last_pic = 1.0 var/last_pic = 1.0
var/list/network var/list/network
var/mapping = 0//For the overview file, interesting bit of code. var/mapping = 0//For the overview file, interesting bit of code.
var/cache_id = 0
circuit = /obj/item/weapon/circuitboard/security circuit = /obj/item/weapon/circuitboard/security
var/camera_cache = null var/camera_cache = null
@@ -43,7 +42,8 @@
data["current"] = null data["current"] = null
if(isnull(camera_cache)) if(camera_cache_id != cache_id)
cache_id = camera_cache_id
cameranet.process_sort() cameranet.process_sort()
var/cameras[0] var/cameras[0]

7
code/modules/alarm/alarm.dm
View File

@@ -18,6 +18,7 @@
var/list/sources = new() //List of sources triggering the alarm. Used to determine when the alarm should be cleared. var/list/sources = new() //List of sources triggering the alarm. Used to determine when the alarm should be cleared.
var/list/sources_assoc = new() //Associative list of source triggers. Used to efficiently acquire the alarm source. var/list/sources_assoc = new() //Associative list of source triggers. Used to efficiently acquire the alarm source.
var/list/cameras //List of cameras that can be switched to, if the player has that capability. var/list/cameras //List of cameras that can be switched to, if the player has that capability.
var/cache_id //ID for camera cache, changed by invalidateCameraCache().
var/area/last_area //The last acquired area, used should origin be lost (for example a destroyed borg containing an alarming camera). var/area/last_area //The last acquired area, used should origin be lost (for example a destroyed borg containing an alarming camera).
var/area/last_name //The last acquired name, used should origin be lost var/area/last_name //The last acquired name, used should origin be lost
var/area/last_camera_area //The last area in which cameras where fetched, used to see if the camera list should be updated. var/area/last_camera_area //The last area in which cameras where fetched, used to see if the camera list should be updated.
@@ -74,8 +75,12 @@
return last_name return last_name
/datum/alarm/proc/cameras() /datum/alarm/proc/cameras()
// reset camera cache
if(camera_cache_id != cache_id)
cameras = null
cache_id = camera_cache_id
// If the alarm origin has changed area, for example a borg containing an alarming camera, reset the list of cameras // If the alarm origin has changed area, for example a borg containing an alarming camera, reset the list of cameras
if(cameras && (last_camera_area != alarm_area())) else if(cameras && (last_camera_area != alarm_area()))
cameras = null cameras = null
// The list of cameras is also reset by /proc/invalidateCameraCache() // The list of cameras is also reset by /proc/invalidateCameraCache()