From 7b6256a72fcfa7fe44e131f079949780f27fc407 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Mon, 13 Jul 2015 16:04:24 -0400 Subject: [PATCH] nitrpg: `from_json` constructors use the autoinit constructor Signed-off-by: Jean Privat --- contrib/nitrpg/src/achievements.nit | 6 +----- contrib/nitrpg/src/events.nit | 4 +--- contrib/nitrpg/src/game.nit | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/contrib/nitrpg/src/achievements.nit b/contrib/nitrpg/src/achievements.nit index c799b86..9b18a6b 100644 --- a/contrib/nitrpg/src/achievements.nit +++ b/contrib/nitrpg/src/achievements.nit @@ -97,11 +97,7 @@ class Achievement # # Used to load achievements from storage. init from_json(game: Game, json: JsonObject) do - self.game = game - id = json["id"].to_s - name = json["name"].to_s - desc = json["desc"].to_s - reward = json["reward"].as(Int) + init(game, json["id"].to_s, json["name"].to_s, json["desc"].to_s, json["reward"].as(Int)) end redef fun to_json do diff --git a/contrib/nitrpg/src/events.nit b/contrib/nitrpg/src/events.nit index dde2c55..d1ba25a 100644 --- a/contrib/nitrpg/src/events.nit +++ b/contrib/nitrpg/src/events.nit @@ -89,11 +89,9 @@ class GameEvent # # Used to load events from json storage. init from_json(game: Game, json: JsonObject) do - self.game = game + init(game, json["kind"].to_s, json["data"].as(JsonObject)) internal_id = json["internal_id"].to_s - kind = json["kind"].to_s time = new ISODate.from_string(json["time"].to_s) - data = json["data"].as(JsonObject) end redef fun to_json do diff --git a/contrib/nitrpg/src/game.nit b/contrib/nitrpg/src/game.nit index 1ab143e..a8175a8 100644 --- a/contrib/nitrpg/src/game.nit +++ b/contrib/nitrpg/src/game.nit @@ -212,8 +212,7 @@ class Player # # Used to load players from saved data. init from_json(game: Game, json: JsonObject) do - self.game = game - name = json["name"].to_s + init(game, json["name"].to_s) nitcoins = json["nitcoins"].as(Int) end -- 1.7.9.5