From 07ed6f122352e2fe726efedbaf2a776e82d5ecb3 Mon Sep 17 00:00:00 2001 From: Pete Goodfellow Date: Wed, 27 Mar 2013 21:23:02 +0000 Subject: [PATCH] Moved hud.dm to code/datums. Updated the dme. --- code/{game => datums}/hud.dm | 161 ++++++++++++++++------------------- tgstation.dme | 2 +- 2 files changed, 76 insertions(+), 87 deletions(-) rename code/{game => datums}/hud.dm (66%) diff --git a/code/game/hud.dm b/code/datums/hud.dm similarity index 66% rename from code/game/hud.dm rename to code/datums/hud.dm index a1a41912f46..6e0fea7e1ba 100644 --- a/code/game/hud.dm +++ b/code/datums/hud.dm @@ -21,7 +21,7 @@ #define ui_storage1 "9:18,1:5" #define ui_storage2 "10:20,1:5" -#define ui_alien_head "4:12,1:5" //aliens +#define ui_alien_head "4:12,1:5" //aliens #define ui_alien_oclothing "5:14,1:5" //aliens #define ui_inv1 "6:16,1:5" //borgs @@ -38,7 +38,7 @@ #define ui_movi "13:26,1:5" #define ui_acti "12:24,1:5" #define ui_zonesel "14:28,1:5" -#define ui_acti_alt "14:28,1:5" //alternative intent switcher for when the interface is hidden (F12) +#define ui_acti_alt "14:28,1:5" //alternative intent switcher for when the interface is hidden (F12) #define ui_borg_pull "12:24,2:7" #define ui_borg_module "13:26,2:7" @@ -59,9 +59,9 @@ #define ui_temp "14:28,6:13" #define ui_health "14:28,7:15" #define ui_internal "14:28,8:17" - //borgs -#define ui_borg_health "14:28,6:13" //borgs have the health display where humans have the pressure damage indicator. -#define ui_alien_health "14:28,6:13" //aliens have the health display where humans have the pressure damage indicator. + //borgs +#define ui_borg_health "14:28,6:13" //borgs have the health display where humans have the pressure damage indicator. +#define ui_alien_health "14:28,6:13" //aliens have the health display where humans have the pressure damage indicator. //Pop-up inventory #define ui_shoes "2:8,1:5" @@ -76,10 +76,8 @@ #define ui_head "2:8,4:11" -//#define ui_headset "SOUTH,8" #define ui_hand "6:14,1:5" #define ui_hstore1 "5,5" -//#define ui_resist "EAST+1,SOUTH-1" #define ui_sleep "EAST+1, NORTH-13" #define ui_rest "EAST+1, NORTH-14" @@ -95,70 +93,69 @@ var/datum/global_hud/global_hud = new() var/list/vimpaired var/list/darkMask - New() - //420erryday psychedellic colours screen overlay for when you are high - druggy = new /obj/screen() - druggy.screen_loc = "WEST,SOUTH to EAST,NORTH" - druggy.icon_state = "druggy" - druggy.layer = 17 - druggy.mouse_opacity = 0 +/datum/global_hud/New() + //420erryday psychedellic colours screen overlay for when you are high + druggy = new /obj/screen() + druggy.screen_loc = "WEST,SOUTH to EAST,NORTH" + druggy.icon_state = "druggy" + druggy.layer = 17 + druggy.mouse_opacity = 0 - //that white blurry effect you get when you eyes are damaged - blurry = new /obj/screen() - blurry.screen_loc = "WEST,SOUTH to EAST,NORTH" - blurry.icon_state = "blurry" - blurry.layer = 17 - blurry.mouse_opacity = 0 + //that white blurry effect you get when you eyes are damaged + blurry = new /obj/screen() + blurry.screen_loc = "WEST,SOUTH to EAST,NORTH" + blurry.icon_state = "blurry" + blurry.layer = 17 + blurry.mouse_opacity = 0 - var/obj/screen/O - var/i - //that nasty looking dither you get when you're short-sighted - vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen) - O = vimpaired[1] - O.screen_loc = "1,1 to 5,15" - O = vimpaired[2] - O.screen_loc = "5,1 to 10,5" - O = vimpaired[3] - O.screen_loc = "6,11 to 10,15" - O = vimpaired[4] - O.screen_loc = "11,1 to 15,15" + var/obj/screen/O + var/i + //that nasty looking dither you get when you're short-sighted + vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen) + O = vimpaired[1] + O.screen_loc = "1,1 to 5,15" + O = vimpaired[2] + O.screen_loc = "5,1 to 10,5" + O = vimpaired[3] + O.screen_loc = "6,11 to 10,15" + O = vimpaired[4] + O.screen_loc = "11,1 to 15,15" - //welding mask overlay black/dither - darkMask = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen,/obj/screen,/obj/screen,/obj/screen,/obj/screen) - O = darkMask[1] - O.screen_loc = "3,3 to 5,13" - O = darkMask[2] - O.screen_loc = "5,3 to 10,5" - O = darkMask[3] - O.screen_loc = "6,11 to 10,13" - O = darkMask[4] - O.screen_loc = "11,3 to 13,13" - O = darkMask[5] - O.screen_loc = "1,1 to 15,2" - O = darkMask[6] - O.screen_loc = "1,3 to 2,15" - O = darkMask[7] - O.screen_loc = "14,3 to 15,15" - O = darkMask[8] - O.screen_loc = "3,14 to 13,15" + //welding mask overlay black/dither + darkMask = newlist(/obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen) + O = darkMask[1] + O.screen_loc = "3,3 to 5,13" + O = darkMask[2] + O.screen_loc = "5,3 to 10,5" + O = darkMask[3] + O.screen_loc = "6,11 to 10,13" + O = darkMask[4] + O.screen_loc = "11,3 to 13,13" + O = darkMask[5] + O.screen_loc = "1,1 to 15,2" + O = darkMask[6] + O.screen_loc = "1,3 to 2,15" + O = darkMask[7] + O.screen_loc = "14,3 to 15,15" + O = darkMask[8] + O.screen_loc = "3,14 to 13,15" - for(i=1,i<=4,i++) - O = vimpaired[i] - O.icon_state = "dither50" - O.layer = 17 - O.mouse_opacity = 0 + for(i = 1, i <= 4, i++) + O = vimpaired[i] + O.icon_state = "dither50" + O.layer = 17 + O.mouse_opacity = 0 - O = darkMask[i] - O.icon_state = "dither50" - O.layer = 17 - O.mouse_opacity = 0 - - for(i=5,i<=8,i++) - O = darkMask[i] - O.icon_state = "black" - O.layer = 17 - O.mouse_opacity = 0 + O = darkMask[i] + O.icon_state = "dither50" + O.layer = 17 + O.mouse_opacity = 0 + for(i = 5, i <= 8, i++) + O = darkMask[i] + O.icon_state = "black" + O.layer = 17 + O.mouse_opacity = 0 /datum/hud @@ -185,11 +182,12 @@ datum/hud/New(mob/owner) mymob = owner instantiate() ..() - return /datum/hud/proc/hidden_inventory_update() - if(!mymob) return + if(!mymob) + return + if(ishuman(mymob)) var/mob/living/carbon/human/H = mymob if(H.handcuffed) @@ -213,8 +211,11 @@ datum/hud/New(mob/owner) if(H.wear_mask) H.wear_mask.screen_loc = null if(H.head) H.head.screen_loc = null + /datum/hud/proc/persistant_inventory_update() - if(!mymob) return + if(!mymob) + return + if(ishuman(mymob)) var/mob/living/carbon/human/H = mymob if(hud_shown) @@ -234,38 +235,26 @@ datum/hud/New(mob/owner) /datum/hud/proc/instantiate() - if(!ismob(mymob)) return 0 - if(!mymob.client) return 0 + if(!ismob(mymob)) + return 0 + if(!mymob.client) + return 0 + var/ui_style = ui_style2icon(mymob.client.prefs.UI_style) if(ishuman(mymob)) human_hud(ui_style) // Pass the player the UI style chosen in preferences - else if(ismonkey(mymob)) monkey_hud(ui_style) - else if(isbrain(mymob)) brain_hud(ui_style) - else if(islarva(mymob)) larva_hud() - else if(isalien(mymob)) alien_hud() - else if(isAI(mymob)) ai_hud() - else if(isrobot(mymob)) robot_hud() - -// else if(ishivebot(mymob)) -// hivebot_hud() - -// else if(ishivemainframe(mymob)) -// hive_mainframe_hud() - else if(isobserver(mymob)) - ghost_hud() - - return + ghost_hud() \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index cf351ee3ad6..21d104556d1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -73,6 +73,7 @@ #include "code\datums\datacore.dm" #include "code\datums\datumvars.dm" #include "code\datums\disease.dm" +#include "code\datums\hud.dm" #include "code\datums\limbs.dm" #include "code\datums\mind.dm" #include "code\datums\mixed.dm" @@ -176,7 +177,6 @@ #include "code\game\atoms_movable.dm" #include "code\game\communications.dm" #include "code\game\dna.dm" -#include "code\game\hud.dm" #include "code\game\shuttle_engines.dm" #include "code\game\skincmd.dm" #include "code\game\smoothwall.dm"