From 8049264b1c6464efa5f621f93d4c2129c7cd02b9 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sat, 31 Jan 2015 19:07:20 -0500 Subject: [PATCH] Default_slot fixes. --- code/modules/client/preferences.dm | 2 +- code/modules/economy/Accounts.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e9a6950449e..0b09395ce8e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1336,7 +1336,7 @@ datum/preferences if("changeslot") load_character(user,text2num(href_list["num"])) - slot_name=text2num(href_list["num"]) + default_slot=text2num(href_list["num"]) close_load_dialog(user) if("tab") diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index 8864fda4940..4b8a4f4502d 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -60,7 +60,7 @@ var/global/list/all_money_accounts = list() */ /proc/create_account(var/mob/living/carbon/human/H, var/starting_funds = 0, var/obj/machinery/account_database/source_db, ) - var/DBQuery/query = dbcon.NewQuery("SELECT account_number,account_pin,account_balance FROM characters WHERE ckey='[sql_sanitize_text(H.ckey)]' AND slot='[H.client.prefs.slot_name]'") + var/DBQuery/query = dbcon.NewQuery("SELECT account_number,account_pin,account_balance FROM characters WHERE ckey='[sql_sanitize_text(H.ckey)]' AND slot='[H.client.prefs.default_slot]'") if(!query.Execute()) var/err = query.ErrorMsg() log_game("SQL ERROR retrieving bank account information. Error : \[[err]\]\n") @@ -77,7 +77,7 @@ var/global/list/all_money_accounts = list() M.remote_access_pin = rand(1111, 111111) M.money = 1000 M.account_number = rand(111111, 999999) - var/DBQuery/query2 = dbcon.NewQuery("UPDATE characters SET account_number='[M.account_number]',account_pin='[M.remote_access_pin]', account_balance='[M.money]' WHERE ckey='[sql_sanitize_text(H.ckey)]' AND slot='[H.client.prefs.slot_name]'") + var/DBQuery/query2 = dbcon.NewQuery("UPDATE characters SET account_number='[M.account_number]',account_pin='[M.remote_access_pin]', account_balance='[M.money]' WHERE ckey='[sql_sanitize_text(H.ckey)]' AND slot='[H.client.prefs.default_slot]'") if(!query2.Execute()) var/err = query2.ErrorMsg() log_game("SQL ERROR creating bank account. Error : \[[err]\]\n")