From d18a98864a3a0b6d1c46de00a4fc085b947fbafd Mon Sep 17 00:00:00 2001 From: xxalpha Date: Wed, 24 Jun 2015 01:14:20 +0100 Subject: [PATCH] Remove optimization code. --- code/__DEFINES/flags.dm | 1 - code/game/atoms.dm | 2 +- code/game/machinery/camera/camera.dm | 1 - code/game/machinery/flasher.dm | 1 - code/game/objects/effects/aliens.dm | 1 - code/game/objects/items/devices/transfer_valve.dm | 1 - code/game/turfs/turf.dm | 14 ++++++-------- code/modules/assembly/bomb.dm | 2 +- code/modules/assembly/holder.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- .../mob/living/carbon/alien/special/facehugger.dm | 2 +- code/modules/mob/mob_defines.dm | 2 +- 12 files changed, 12 insertions(+), 19 deletions(-) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index d0328896e12..2996b1af708 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -17,7 +17,6 @@ #define ABSTRACT 128 // for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way #define FPRINT 256 // takes a fingerprint #define ON_BORDER 512 // item has priority to check when entering or leaving -#define PROXMOVE 2048 // Will the code check us when we move or when something moves near us? #define HEADBANGPROTECT 4096 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 03e5ce007b0..f6a52f40e54 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -131,7 +131,7 @@ /atom/proc/CheckExit() return 1 -/atom/proc/HasProximity(atom/movable/AM as mob|obj) //Requires the PROXMOVE flag to work. +/atom/proc/HasProximity(atom/movable/AM as mob|obj) return /atom/proc/emp_act(var/severity) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 30c7c0c1cd3..c6748849914 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -7,7 +7,6 @@ idle_power_usage = 5 active_power_usage = 10 layer = 5 - flags = FPRINT | PROXMOVE var/health = 50 var/list/network = list("SS13") diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 73d4f99cea0..1b6be79b004 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -21,7 +21,6 @@ anchored = 0 base_state = "pflash" density = 1 - flags = FPRINT | PROXMOVE /obj/machinery/flasher/New() bulb = new /obj/item/device/flash/handheld(src) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index f21580d3ffd..a9d3579ea9d 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -324,7 +324,6 @@ anchored = 1 var/health = 100 var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive - flags = PROXMOVE /obj/structure/alien/egg/New() diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 36a24f19518..128c6c071bd 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -9,7 +9,6 @@ var/mob/attacher = null var/valve_open = 0 var/toggle = 1 - flags = FPRINT | PROXMOVE /obj/item/device/transfer_valve/IsAssemblyHolder() return 1 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 9cdb9e71dcc..71d40ca2dd4 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -98,14 +98,12 @@ O.lastarea = get_area(O.loc) // O.update_gravity(O.mob_has_gravity()) - if(M && M.flags & PROXMOVE) - var/loopsanity = 100 - for(var/atom/A in range(1)) - if(loopsanity == 0) - break - loopsanity-- - if((A && M) && A.flags & PROXMOVE) - A.HasProximity(M, 1) + var/loopsanity = 100 + for(var/atom/A in range(1)) + if(loopsanity == 0) + break + loopsanity-- + A.HasProximity(M, 1) /turf/proc/is_plasteel_floor() return 0 diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 13abcfa1078..f92ef7dcf84 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -6,7 +6,7 @@ w_class = 3.0 throw_speed = 2 throw_range = 4 - flags = CONDUCT | PROXMOVE + flags = CONDUCT var/status = 0 //0 - not readied //1 - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index e34335d202d..1769315acab 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "holder" item_state = "assembly" - flags = CONDUCT | PROXMOVE + flags = CONDUCT throwforce = 5 w_class = 2.0 throw_speed = 2 diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index bd846f352e7..07395b77e10 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -6,7 +6,7 @@ g_amt = 200 origin_tech = "magnets=1" attachable = 1 - flags = PROXMOVE + var/scanning = 0 var/timing = 0 var/time = 10 diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 0419b35935a..c053d20c090 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -15,7 +15,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon_state = "facehugger" item_state = "facehugger" w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4 - flags = MASKINTERNALS | PROXMOVE + flags = MASKINTERNALS throw_range = 5 tint = 3 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 0320ed38873..c9883f02afe 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -2,7 +2,7 @@ density = 1 layer = 4 animate_movement = 2 - flags = HEAR | PROXMOVE + flags = HEAR hud_possible = list(ANTAG_HUD) pressure_resistance = 8 var/datum/mind/mind