Fix greeting window malfunction (#7847)

* Fixes

* Log the change

* Remove unused var
This commit is contained in:
Erki
2019-12-29 23:51:03 +02:00
committed by Werner
parent fd8ca07c3e
commit 72abb195bc
6 changed files with 14 additions and 16 deletions

View File

@@ -73,6 +73,4 @@
var/obj/screen/plane_master/parallax_dustmaster/parallax_dustmaster = null
var/obj/screen/plane_master/parallax_spacemaster/parallax_spacemaster = null
var/initialized = FALSE
var/authed = TRUE
var/authed = TRUE

View File

@@ -358,9 +358,9 @@
return m
//Do auth shit
else
. = ..()
src.InitClient()
src.InitPrefs()
. = ..()
/client/proc/InitPrefs()
//preferences datum - also holds some persistant data for the client (because we may as well keep these datums to a minimum)
@@ -385,8 +385,6 @@
server_greeting.display_to_client(src)
/client/proc/InitClient()
if(initialized)
return
to_chat(src, "<span class='alert'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</span>")
//Admin Authorisation
@@ -447,8 +445,6 @@
fetch_unacked_warning_count()
initialized = TRUE
//////////////
//DISCONNECT//
//////////////

View File

@@ -25,8 +25,6 @@
var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled
/mob/abstract/new_player/Login()
client.InitClient()
client.InitPrefs()
update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
to_chat(src, "<div class='info'>Game ID: <div class='danger'>[game_id]</div></div>")

View File

@@ -51,11 +51,14 @@
if(newkey)
client.key = newkey // Try seeting ckey
directory[c.ckey] = c
// If mob exists for that ckey, then BYOND will transfer client to it.
// Init the client and give it a new_player mob.
// Note that modifying the key variable does not invoke client/New() or client/Login() again.
c.InitClient()
c.InitPrefs()
if(istype(c.mob, /mob/abstract/unauthed))
c.mob = new /mob/abstract/new_player() // Else we just treat them as new player
c.InitClient() // And now we shall continue client initilization (permissions and stuff)
c.InitPrefs() // We init prefs just in case mob transfer didn't
c.mob = new /mob/abstract/new_player()
unauthed -= token
/mob/abstract/unauthed/Topic(href, href_list)

View File

@@ -24,8 +24,6 @@
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).",ckey=key_name(src))
/mob/Login()
client.InitClient()
client.InitPrefs() // Init perfs in case they wasn't initilized
player_list |= src
update_Login_details()
SSfeedback.update_status()