From e7b9f186359903c5629f136386aa7a55abac95f2 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 24 Apr 2015 16:59:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../everlastingsummer/ViewActivity.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java index 5a9306e..f66c3a6 100644 --- a/src/com/annimon/everlastingsummer/ViewActivity.java +++ b/src/com/annimon/everlastingsummer/ViewActivity.java @@ -10,6 +10,7 @@ import com.annimon.everlastingsummer.ast.Variables; import android.annotation.SuppressLint; import android.app.Activity; import android.content.ContentResolver; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.media.MediaPlayer; @@ -50,6 +51,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch private TextView textview; private MediaPlayer musicPlayer, soundPlayer; + private MapPlaces places; private Characters characters; private Map spriteInContainer; private DisplayMetrics displayMetrics; @@ -80,6 +82,8 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch characters = new CharactersES(); characters.makeNamesKnown(); + places = new MapPlacesES(); + final Intent intent = getIntent(); final SaveInfo save = intent.getParcelableExtra(EXTRA_SAVE); try { @@ -333,6 +337,22 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch characters.setName(whoid, name); } + public void disableAllZones() { + places.disableAllZones(); + } + + public void disableCurrentZone() { + places.disableCurrentZone(); + } + + public void setZone(String name, String label) { + places.setZone(name, label); + } + + public void showMap() { + places.showMap(this); + } + public void menu(final Menu menu) { Dialogs.with(this).showGameMenu(menu, new DialogInterface.OnClickListener() { @Override