From ac83477aacbb02f98206a9bf770c3bcb466aa8aa Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Thu, 4 Jul 2013 19:34:44 +0300
Subject: [PATCH] Qualche modifica.

---
 boom.project.gmx                 |   9 +-
 objects/o_radio_local.object.gmx | 153 -------------------------------
 objects/o_radio_palla.object.gmx |  42 ---------
 scripts/init.gml                 |   3 +-
 4 files changed, 5 insertions(+), 202 deletions(-)
 delete mode 100644 objects/o_radio_local.object.gmx

diff --git a/boom.project.gmx b/boom.project.gmx
index 97f3552..d791486 100644
--- a/boom.project.gmx
+++ b/boom.project.gmx
@@ -87,7 +87,6 @@
       </objects>
       <objects name="Radio">
         <object>objects\o_radio_palla</object>
-        <object>objects\o_radio_local</object>
         <object>objects\o_radio_palla_grande</object>
         <object>objects\o_radio_cubo</object>
         <object>objects\o_radio_triangolo</object>
@@ -107,10 +106,6 @@
         <object>objects\o_totem_H</object>
         <object>objects\o_totem_I</object>
         <object>objects\o_totem_J</object>
-        <objects name="Gomme">
-          <object>objects\o_gomma_piccola</object>
-          <object>objects\o_gomma_grande</object>
-        </objects>
       </objects>
       <objects name="Scuola">
         <objects name="Libri">
@@ -129,6 +124,10 @@
       <objects name="Paracadute">
         <object>objects\o_paracadute</object>
       </objects>
+      <objects name="Gomme">
+        <object>objects\o_gomma_piccola</object>
+        <object>objects\o_gomma_grande</object>
+      </objects>
     </objects>
     <objects name="Pezzi">
       <object>objects\o_wall_inv</object>
diff --git a/objects/o_radio_local.object.gmx b/objects/o_radio_local.object.gmx
deleted file mode 100644
index 5a52ea6..0000000
--- a/objects/o_radio_local.object.gmx
+++ /dev/null
@@ -1,153 +0,0 @@
-<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
-<object>
-  <spriteName>i_radio_arrow</spriteName>
-  <solid>-1</solid>
-  <visible>-1</visible>
-  <depth>0</depth>
-  <persistent>0</persistent>
-  <parentName>o_generale</parentName>
-  <maskName>&lt;undefined&gt;</maskName>
-  <events>
-    <event eventtype="5" enumb="76">
-      <action>
-        <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>9</kind>
-            <script>rollR</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
-    <event eventtype="5" enumb="75">
-      <action>
-        <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>9</kind>
-            <script>rollL</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
-    <event eventtype="9" enumb="79">
-      <action>
-        <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>9</kind>
-            <script>localrocket</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
-  </events>
-  <PhysicsObject>-1</PhysicsObject>
-  <PhysicsObjectSensor>0</PhysicsObjectSensor>
-  <PhysicsObjectShape>0</PhysicsObjectShape>
-  <PhysicsObjectDensity>0.800000011920929</PhysicsObjectDensity>
-  <PhysicsObjectRestitution>0</PhysicsObjectRestitution>
-  <PhysicsObjectGroup>1</PhysicsObjectGroup>
-  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
-  <PhysicsObjectAngularDamping>3</PhysicsObjectAngularDamping>
-  <PhysicsObjectFriction>15</PhysicsObjectFriction>
-  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
-  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
-  <PhysicsShapePoints>
-    <point>8,8</point>
-    <point>8,8</point>
-  </PhysicsShapePoints>
-</object>
diff --git a/objects/o_radio_palla.object.gmx b/objects/o_radio_palla.object.gmx
index 471215b..4bd8f91 100644
--- a/objects/o_radio_palla.object.gmx
+++ b/objects/o_radio_palla.object.gmx
@@ -92,48 +92,6 @@
         </arguments>
       </action>
     </event>
-    <event eventtype="9" enumb="79">
-      <action>
-        <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>9</kind>
-            <script>rocketup</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
   </events>
   <PhysicsObject>-1</PhysicsObject>
   <PhysicsObjectSensor>0</PhysicsObjectSensor>
diff --git a/scripts/init.gml b/scripts/init.gml
index f037ff6..9febe8c 100644
--- a/scripts/init.gml
+++ b/scripts/init.gml
@@ -1,7 +1,7 @@
 //Seleziona il primo oggetto.
 selected = 0;
 //Definisci qual è il numero massimo, ad esempio se arriva a stack_names[9] scrivi 9.
-totalitems = 26;
+totalitems = 25;
 //Definisci l'array con tutti i nomi degli oggetti da fare spawnare.
 stack_names[0] = o_squadra_sin;
 stack_names[1] = o_gomma_piccola;
@@ -29,7 +29,6 @@ stack_names[22] = o_radio_triangolo_2;
 stack_names[23] = o_squadra_des;
 stack_names[24] = o_wall_norm;
 stack_names[25] = o_radio_palla_grande;
-stack_names[26] = o_radio_local;
 //Disattiva il mouse normale visto che viene generato automaticamente.
 window_set_cursor(cr_none);
 //Apri il file di salvataggio, carica il record e chiudi il file.