cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

change null to 0 in lighting/lighting_source.dm

Browse Source
This commit is contained in:
LetterJay
2016-12-25 02:30:04 -06:00
parent 1ced4344a4
commit b18e2848ae
6 changed files with 83 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@
T = get_step(new_turf, diagonal) T = get_step(new_turf, diagonal)
if (T) // In case we're on the map's border. if (T) // In case we're on the map's border.
if (!T.corners) if (!T.corners)
T.corners = list(null, null, null, null) T.corners = list(0,0,0,0)
masters[T] = diagonal masters[T] = diagonal
i = LIGHTING_CORNER_DIAGONAL.Find(turn(diagonal, 180)) i = LIGHTING_CORNER_DIAGONAL.Find(turn(diagonal, 180))
@@ -63,7 +63,7 @@
T = get_step(new_turf, horizontal) T = get_step(new_turf, horizontal)
if (T) // Ditto. if (T) // Ditto.
if (!T.corners) if (!T.corners)
T.corners = list(null, null, null, null) T.corners = list(0,0,0,0)
masters[T] = ((T.x > x) ? EAST : WEST) | ((T.y > y) ? NORTH : SOUTH) // Get the dir based on coordinates. masters[T] = ((T.x > x) ? EAST : WEST) | ((T.y > y) ? NORTH : SOUTH) // Get the dir based on coordinates.
i = LIGHTING_CORNER_DIAGONAL.Find(turn(masters[T], 180)) i = LIGHTING_CORNER_DIAGONAL.Find(turn(masters[T], 180))
@@ -73,7 +73,7 @@
T = get_step(new_turf, vertical) T = get_step(new_turf, vertical)
if (T) if (T)
if (!T.corners) if (!T.corners)
T.corners = list(null, null, null, null) T.corners = list(0,0,0,0)
masters[T] = ((T.x > x) ? EAST : WEST) | ((T.y > y) ? NORTH : SOUTH) // Get the dir based on coordinates. masters[T] = ((T.x > x) ? EAST : WEST) | ((T.y > y) ? NORTH : SOUTH) // Get the dir based on coordinates.
i = LIGHTING_CORNER_DIAGONAL.Find(turn(masters[T], 180)) i = LIGHTING_CORNER_DIAGONAL.Find(turn(masters[T], 180))

8
code/modules/lighting/lighting_source.dm
View File

@@ -262,10 +262,12 @@
effect_str.Cut() effect_str.Cut()
/datum/light_source/proc/recalc_corner(var/datum/lighting_corner/C) /datum/light_source/proc/recalc_corner(var/datum/lighting_corner/C)
if (effect_str.Find(C)) // Already have one. if(!C)
REMOVE_CORNER(C) return
if (effect_str.Find(C)) // Already have one.
REMOVE_CORNER(C)
APPLY_CORNER(C) APPLY_CORNER(C)
/datum/light_source/proc/smart_vis_update() /datum/light_source/proc/smart_vis_update()
var/list/datum/lighting_corner/corners = list() var/list/datum/lighting_corner/corners = list()

4
code/modules/lighting/lighting_turf.dm
View File

@@ -105,7 +105,7 @@
/turf/proc/generate_missing_corners() /turf/proc/generate_missing_corners()
lighting_corners_initialised = TRUE lighting_corners_initialised = TRUE
if (!corners) if (!corners)
corners = list(null, null, null, null) corners = list(0,0,0,0)
for (var/i = 1 to 4) for (var/i = 1 to 4)
if (corners[i]) // Already have a corner on this direction. if (corners[i]) // Already have a corner on this direction.
@@ -119,7 +119,7 @@
if (!lighting_corners_initialised) if (!lighting_corners_initialised)
if (!corners) if (!corners)
corners = list(null, null, null, null) corners = list(0,0,0,0)
for (var/i = 1 to 4) for (var/i = 1 to 4)
if (corners[i]) // Already have a corner on this direction. if (corners[i]) // Already have a corner on this direction.

38
config/lavaRuinBlacklist.txt
View File

@@ -4,10 +4,10 @@
#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START #SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
##BIODOMES ##BIODOMES
#_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
#_maps/RandomRuins/LavaRuins/lavaland__biodome_beach.dmm _maps/RandomRuins/LavaRuins/lavaland__biodome_beach.dmm
#_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm _maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm
##RESPAWN ##RESPAWN
#_maps/RandomRuins/LavaRuins/lavaland_surface_prisoner_crash.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_prisoner_crash.dmm
@@ -16,20 +16,20 @@
#_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
##SIN ##SIN
#_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
##MISC ##MISC
#_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
#_maps/RandomRuins/LavaRuins/lavaland_gym.dmm _maps/RandomRuins/LavaRuins/lavaland_gym.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm _maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm

38
config/spaceRuinBlacklist.txt
View File

@@ -3,22 +3,22 @@
#A list of maps valid to blacklist can be found at _maps\RandomRuins\SpaceRuins\_maplisting.txt #A list of maps valid to blacklist can be found at _maps\RandomRuins\SpaceRuins\_maplisting.txt
#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START #SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
#_maps/RandomRuins/SpaceRuins/way_home.dmm _maps/RandomRuins/SpaceRuins/way_home.dmm
#_maps/RandomRuins/SpaceRuins/asteroid1.dmm _maps/RandomRuins/SpaceRuins/asteroid1.dmm
#_maps/RandomRuins/SpaceRuins/asteroid2.dmm _maps/RandomRuins/SpaceRuins/asteroid2.dmm
#_maps/RandomRuins/SpaceRuins/asteroid3.dmm _maps/RandomRuins/SpaceRuins/asteroid3.dmm
#_maps/RandomRuins/SpaceRuins/asteroid4.dmm _maps/RandomRuins/SpaceRuins/asteroid4.dmm
#_maps/RandomRuins/SpaceRuins/asteroid5.dmm _maps/RandomRuins/SpaceRuins/asteroid5.dmm
#_maps/RandomRuins/SpaceRuins/derelict1.dmm _maps/RandomRuins/SpaceRuins/derelict1.dmm
#_maps/RandomRuins/SpaceRuins/derelict2.dmm _maps/RandomRuins/SpaceRuins/derelict2.dmm
#_maps/RandomRuins/SpaceRuins/derelict3.dmm _maps/RandomRuins/SpaceRuins/derelict3.dmm
#_maps/RandomRuins/SpaceRuins/derelict4.dmm _maps/RandomRuins/SpaceRuins/derelict4.dmm
#_maps/RandomRuins/SpaceRuins/derelict5.dmm _maps/RandomRuins/SpaceRuins/derelict5.dmm
#_maps/RandomRuins/SpaceRuins/spacebar.dmm _maps/RandomRuins/SpaceRuins/spacebar.dmm
#_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
#_maps/RandomRuins/SpaceRuins/deepstorage.dmm _maps/RandomRuins/SpaceRuins/deepstorage.dmm
#_maps/RandomRuins/SpaceRuins/emptyshell.dmm _maps/RandomRuins/SpaceRuins/emptyshell.dmm
#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm _maps/RandomRuins/SpaceRuins/gasthelizards.dmm
#_maps/RandomRuins/SpaceRuins/intactemptyship.dmm _maps/RandomRuins/SpaceRuins/intactemptyship.dmm
#_maps/RandomRuins/SpaceRuins/mechtransport.dmm _maps/RandomRuins/SpaceRuins/mechtransport.dmm
#_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm _maps/RandomRuins/SpaceRuins/turretedoutpost.dmm

35
html/changelogs/Jay-PR-2.yml Normal file
View File

@@ -0,0 +1,35 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: "Jay"
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix "Fixes null read errors on lighting. (Hopefully. I haven't been able to extensively test this alone.)"