diff --git a/AM2R.project.gmx b/AM2R.project.gmx
index e5c213b..d82dfa7 100644
--- a/AM2R.project.gmx
+++ b/AM2R.project.gmx
@@ -5521,6 +5521,7 @@
+
@@ -6593,6 +6594,7 @@
+
diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx
index e272448..e15375c 100644
--- a/Configs/Default.config.gmx
+++ b/Configs/Default.config.gmx
@@ -25,7 +25,7 @@
2
1
28
- AM2R
+ Multitroid 1.2.1
0
@@ -62,9 +62,9 @@
False
2
Configs\Default\android\icons\ouyaIcon.png
- lojical
+ milesthenerd
com
- AM2R
+ multitroid
24
false
@@ -220,7 +220,7 @@
false
true
0
- AM2R Multitroid 1.2
+ AM2R Multitroid 1.2.1
True
0
@@ -362,7 +362,7 @@
1024
false
- AM2R Multitroid 1.2
+ AM2R Multitroid 1.2.1
0
0
https://www.reddit.com/r/AM2R/
diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx
index 38cbb17..b1a62cf 100644
--- a/objects/oClient.object.gmx
+++ b/objects/oClient.object.gmx
@@ -657,9 +657,12 @@ if(mapChanged){
1
var v = 0;
for(var f=0; f<array_length_1d(global.event); f++){
- if(f > 350 || f == 102){
+ if(f > 350){
break;
}
+ if(f == 102){
+ global.eventPrev[f] = global.event[f];
+ }
if(global.eventPrev[f] != global.event[f]){
global.eventChanges[v, 0] = global.event[f];
global.eventChanges[v, 1] = f;
@@ -2005,7 +2008,7 @@ switch(type_event){
if(seed != _seed){
seed = _seed;
show_debug_message("seed received");
- popup_text("Seed received");
+ popup_seed("Seed received");
}
}
break;
@@ -2103,15 +2106,15 @@ switch(type_event){
if (global.currentsuit == 0) sprite_index = scr_suit_sprites(sFront,sFront_fusion);
if (global.currentsuit == 1) sprite_index = scr_suit_sprites(sVFront,sFront_fusion);
if (global.currentsuit == 2) sprite_index = scr_suit_sprites(sGFront,sFront_fusion);
- global.enablecontrol = 0;
canbehit = 0;
- oControl.displaygui = 0;
xVel = 0;
yVel = 0;
xAcc = 0;
yAcc = 0;
}
}
+ global.enablecontrol = 0;
+ oControl.displaygui = 0;
popup_text_ext("Ship reached", 120);
}
if(eventArr[f, 0] == 2 && clientID != global.clientID){
diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx
index 046dd58..33c2434 100644
--- a/objects/oControl.object.gmx
+++ b/objects/oControl.object.gmx
@@ -321,7 +321,7 @@ global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", true, 1);
global.am2r_version = "V1.5.2"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities.
-global.multitroid_version = "V1.2";
+global.multitroid_version = "V1.2.1";
// Android
global.gamestarted = 0;
diff --git a/objects/oPopupTextSeed.object.gmx b/objects/oPopupTextSeed.object.gmx
new file mode 100644
index 0000000..8d1fcd2
--- /dev/null
+++ b/objects/oPopupTextSeed.object.gmx
@@ -0,0 +1,131 @@
+
+
diff --git a/scripts/popup_seed.gml b/scripts/popup_seed.gml
new file mode 100644
index 0000000..8685c80
--- /dev/null
+++ b/scripts/popup_seed.gml
@@ -0,0 +1,4 @@
+/// popup_seed
+with (oPopupTextSeed) instance_destroy();
+var t = instance_create(0, 0, oPopupTextSeed);
+t.text = argument0;
\ No newline at end of file