summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-09-05 18:08:36 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-09-05 18:08:36 +0200
commit27e74e26dbcf1a7a68fe90b1fa3ca72e3c8da07b (patch)
tree2af5e37f747940952a173d86fe051f894cc91a37 /src
parent324416df92a5192be02e9a1285a623c37c01ef77 (diff)
Adds map for player2, player_db cached as 'any'.
Diffstat (limited to 'src')
-rw-r--r--src/login/query/lgn_sign_in.erl4
-rw-r--r--src/map/map_handler.erl14
-rw-r--r--src/map/map_shim.erl8
3 files changed, 19 insertions, 7 deletions
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index e0952ed..662e273 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -53,7 +53,7 @@ fetch_data (Input) ->
% Having this be cached my be both useless and a security issue.
PlayerID = shr_timed_cache:fetch(login_db, any, Username),
- Player = shr_timed_cache:fetch(player_db, PlayerID, PlayerID),
+ Player = shr_timed_cache:fetch(player_db, any, PlayerID),
#query_state
{
@@ -104,7 +104,7 @@ commit_update (QueryState) ->
),
ok = shr_database:commit(Query),
- shr_timed_cache:update(player_db, PlayerID, PlayerID, UpdatedPlayer),
+ shr_timed_cache:update(player_db, any, PlayerID, UpdatedPlayer),
'ok'.
diff --git a/src/map/map_handler.erl b/src/map/map_handler.erl
index 0866315..e4bcb60 100644
--- a/src/map/map_handler.erl
+++ b/src/map/map_handler.erl
@@ -27,7 +27,19 @@ start (TimedCachesManagerPid) ->
<<"0">>,
any,
any,
- map_shim:generate_random_map()
+ map_shim:generate_random_map(0, <<"0">>)
+ )
+ end,
+ case shr_database:fetch(map_db, <<"1">>, admin) of
+ {ok, _} -> ok;
+ not_found ->
+ shr_database:insert_at
+ (
+ map_db,
+ <<"1">>,
+ any,
+ any,
+ map_shim:generate_random_map(1, <<"1">>)
)
end,
shr_timed_caches_manager:new_cache(TimedCachesManagerPid, map_db, none),
diff --git a/src/map/map_shim.erl b/src/map/map_shim.erl
index de87bc2..a7f00cc 100644
--- a/src/map/map_shim.erl
+++ b/src/map/map_shim.erl
@@ -7,7 +7,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate_random_map/0]).
+-export([generate_random_map/2]).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -52,8 +52,8 @@ demo_map () ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate_random_map () -> map_map:type().
-generate_random_map () ->
- Map = map_map:from_list(0, <<"0">>, 32, 32, demo_map()),
+-spec generate_random_map (non_neg_integer(), binary()) -> map_map:type().
+generate_random_map (ID, Owner) ->
+ Map = map_map:from_list(ID, Owner, 32, 32, demo_map()),
Map.