Merge pull request #37000 from tgstation/KorPhaeron-patch-2

Update compile options to make 512 support official
This commit is contained in:
Jordan Brown
2018-04-11 16:12:27 -04:00
committed by CitadelStationBot
parent 4063781baf
commit 704b42411a
7 changed files with 4 additions and 51 deletions
@@ -98,11 +98,6 @@
var/list/new_overlay_types = tile_graphic()
var/list/atmos_overlay_types = src.atmos_overlay_types // Cache for free performance
#if DM_VERSION >= 513
#warning 512 is stable now for sure, remove the old code
#endif
#if DM_VERSION >= 512
if (atmos_overlay_types)
for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
vars["vis_contents"] -= overlay
@@ -112,17 +107,6 @@
vars["vis_contents"] += new_overlay_types - atmos_overlay_types //don't add overlays that already exist
else
vars["vis_contents"] += new_overlay_types
#else
if (atmos_overlay_types)
for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
cut_overlay(overlay)
if (new_overlay_types.len)
if (atmos_overlay_types)
add_overlay(new_overlay_types - atmos_overlay_types) //don't add overlays that already exist
else
add_overlay(new_overlay_types)
#endif
UNSETEMPTY(new_overlay_types)
src.atmos_overlay_types = new_overlay_types
+2 -2
View File
@@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
. = ..() //calls mob.Login()
#if DM_VERSION >= 512
if (byond_version >= 512)
if (!byond_build || byond_build < 1386)
message_admins("<span class='adminnotice'>[key_name(src)] has been detected as spoofing their byond version. Connection rejected.</span>")
@@ -261,7 +261,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
else
qdel(src)
return
#endif
if(SSinput.initialized)
set_macros()
@@ -382,15 +382,7 @@
else
var/md5 = md5(AM.name)
for (var/i in 1 to 32)
#if DM_VERSION >= 513
#warning 512 is definitely stable now, remove the old code
#endif
#if DM_VERSION >= 512
. += hex2num(md5[i])
#else
. += hex2num(copytext(md5,i,i+1))
#endif
. = . % 9
AM.pixel_x = ((.%3)*6)
AM.pixel_y = -8 + (round( . / 3)*8)