diff --git a/source/asteroids.cpp b/source/asteroids.cpp
index aab85a6..acff86b 100755
--- a/source/asteroids.cpp
+++ b/source/asteroids.cpp
@@ -1,5 +1,6 @@
 #include <SDL2/SDL.h>
 #include <vector>
+#include <string>
 
 #define MARGE_DALT 20
 #define MARGE_BAIX 460
@@ -32,7 +33,7 @@ struct triangle
   float velocitat;
 };
 
-std::vector<ipunt> ivector(MAX_IPUNTS);
+typedef std::vector<ipunt> ivector();
 
 struct poligon
 {
@@ -47,18 +48,19 @@ struct poligon
   bool esta;
 };
 
-pvirt = array[1..38400] of byte;
+std::vector<Uint8> pvirt(38400);
 
-var nau:triangle;pol:poligon;
-    ang:real;
-    ch:char;
-    Dx,Dy:word;
-    i,aux:byte;
-    dist:integer;
-    puntaux:punt;
-    orni:array [1..MAX_ORNIS] of poligon;
-    virt:^pvirt;
-    bales:array [1..MAX_BALES] of poligon;
+triangle nau;
+poligon pol;
+float ang;
+std::string ch;
+Uint16 Dx, Dy;
+Uint8 i, aux;
+int dist;
+punt puntaux;
+std::vector<poligon> orni(MAX_ORNIS);
+std::vector<poligon> bales(MAX_BALES);
+virt : ^pvirt;
 
 procedure volca;
 var i:word;