cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Since < 511 is no longer supported, I nuked all of the refs to it. (#3037)

Browse Source 
With the introduction of PR #3023 , 510 and lower are no longer supported. So I removed all compile time defines that were meant to allow for its support and bumped the compiler error guard.
This commit is contained in:
skull132
2017-07-15 17:03:24 +03:00
committed by GitHub
parent 4e8ee11c6e
commit b4a34d27f9
6 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/lighting/lighting_corner.dm
View File

@@ -105,7 +105,7 @@
needs_update = TRUE
update_overlays(FALSE)
SSlighting.corner_queue += src
else
else
update_overlays(TRUE)
/datum/lighting_corner/proc/update_overlays(var/now = FALSE)
@@ -119,17 +119,10 @@
else if (mx < LIGHTING_SOFT_THRESHOLD)
. = 0 // 0 means soft lighting.
#ifdef LIGHTING_USE_MEMORY_HACK
cache_r = lum_r * . + (rand(1,999)/100000) || LIGHTING_SOFT_THRESHOLD
cache_g = lum_g * . + (rand(1,999)/100000) || LIGHTING_SOFT_THRESHOLD
cache_b = lum_b * . + (rand(1,999)/100000) || LIGHTING_SOFT_THRESHOLD
cache_mx = mx
#else
cache_r = round(lum_r * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD
cache_g = round(lum_g * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD
cache_b = round(lum_b * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD
cache_mx = round(mx, LIGHTING_ROUND_VALUE)
#endif
for (var/TT in masters)
var/turf/T = TT
@@ -144,7 +137,7 @@
crash_with("Some fuck [force ? "force-" : ""]deleted a lighting corner.")
if (!force)
return QDEL_HINT_LETMELIVE
SSlighting.lighting_corners -= src
return ..()

15
code/modules/lighting/lighting_overlay.dm
View File

@@ -22,7 +22,7 @@
var/turf/T = loc // If this runtimes atleast we'll know what's creating overlays in things that aren't turfs.
T.lighting_overlay = src
T.luminosity = 0
needs_update = TRUE
SSlighting.overlay_queue += src
@@ -38,7 +38,7 @@
if (istype(T))
T.lighting_overlay = null
T.luminosity = 1
return ..()
// This is a macro PURELY so that the if below is actually readable.
@@ -71,8 +71,6 @@
var/max = max(cr.cache_mx, cg.cache_mx, cb.cache_mx, ca.cache_mx)
luminosity = max > LIGHTING_SOFT_THRESHOLD
// The RNG introduced by LIGHTING_USE_MEMORY_HACK makes this shortcut ineffective.
#ifndef LIGHTING_USE_MEMORY_HACK
var/rr = cr.cache_r
var/rg = cr.cache_g
var/rb = cr.cache_b
@@ -123,15 +121,6 @@
ar, ag, ab, 0,
0, 0, 0, 1
)
#else
color = list(
cr.cache_r, cr.cache_g, cr.cache_b, 0,
cg.cache_r, cg.cache_g, cg.cache_b, 0,
cb.cache_r, cb.cache_g, cb.cache_b, 0,
ca.cache_r, ca.cache_g, ca.cache_b, 0,
0, 0, 0, 1
)
#endif
// If we're on an openturf, update the shadower object too.
// We could queue an icon update for the entire OT, but this involves less overhead.