From ee14b3035fab267de4adf6f1515c7128c38fa609 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Tue, 17 Oct 2017 20:36:36 +0200
Subject: [PATCH] changes to compile on Android/iOS

---
 init.cpp     | 2 +-
 polygons.cpp | 2 +-
 shmup.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.cpp b/init.cpp
index 64e4f95f..b94c3842 100644
--- a/init.cpp
+++ b/init.cpp
@@ -455,7 +455,7 @@ string buildScoreDescription() {
   
   s += XLAT("HyperRogue for Android");
   s += " ( " VER "), http://www.roguetemple.com/z/hyper/\n";
-  s += XLAT("Date: %1 time: %2 s ", buf, getgametime());
+  s += XLAT("Date: %1 time: %2 s ", buf, getgametime_s());
   s += XLAT("distance: %1\n", its(celldist(cwt.c)));
   // s += buf2;
   if(cheater) s += XLAT("Cheats: ") + its(cheater) + "\n";
diff --git a/polygons.cpp b/polygons.cpp
index 7b4cdf81..550c8ea8 100644
--- a/polygons.cpp
+++ b/polygons.cpp
@@ -406,7 +406,7 @@ void drawpolyline(const polytodraw& p) {
 #endif
 
 #if CAP_XGD==1
-  gdpush(1); gdpush(col); gdpush(outline); gdpush(polyi);
+  gdpush(1); gdpush(p.col); gdpush(pp.outline); gdpush(polyi);
   for(int i=0; i<polyi; i++) gdpush(polyx[i]), gdpush(polyy[i]);
 #elif CAP_SDLGFX==1
   filledPolygonColorI(s, polyx, polyy, polyi, p.col);
diff --git a/shmup.cpp b/shmup.cpp
index 789f8eff..7444cb47 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -3321,7 +3321,7 @@ void clearMonsters() {
 void clearMemory() {
   clearMonsters();
   gmatrix.clear();
-  traplist = {};
+  while(!traplist.empty()) traplist.pop();
   curtime = 0;
   nextmove = 0;
   nextdragon = 0;