Reverted change that broke project file

pull/2/head
milesthenerd 6 years ago
parent 9923532438
commit 1edb32e209

@ -5862,4 +5862,4 @@
<TutorialName></TutorialName> <TutorialName></TutorialName>
<TutorialPage>0</TutorialPage> <TutorialPage>0</TutorialPage>
</TutorialState> </TutorialState>
</assets> </assets>

@ -31,6 +31,8 @@ canSend = false;
connected = false; connected = false;
queenHealthWait = false; queenHealthWait = false;
queenDead = false; queenDead = false;
seedSent = false;
seedReceived = false;
var type; var type;
type = network_socket_tcp; type = network_socket_tcp;
var file = file_text_open_read(working_directory + "\ipaddress.txt"); var file = file_text_open_read(working_directory + "\ipaddress.txt");
@ -281,7 +283,6 @@ if(!is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
var result = network_send_packet(socket, buffer, buffer_tell(buffer)); var result = network_send_packet(socket, buffer, buffer_tell(buffer));
} }
} }
</string> </string>
</argument> </argument>
</arguments> </arguments>
@ -363,32 +364,20 @@ if(!is_undefined(oQueen.phase)){
} }
} }
/* if(oControl.seed != 0 &amp;&amp; !is_undefined(oControl.seed) &amp;&amp; !seedSent){
if(room == rm_a7b11 &amp;&amp; !queenHealthSet){ seedSent = true;
queenHealthSet = true; buffer_delete(buffer);
global.queenhealthPrev = oQueenHead.myhealth; var size, type, alignment;
global.queenphasePrev = oQueen.phase; size = 1024;
show_debug_message("queen health initialized"); type = buffer_grow;
} else if(room == rm_a7c01){ alignment = 1;
queenHealthSet = false; buffer = buffer_create(size, type, alignment);
} buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 3);
if(queenHealthSet){ buffer_write(buffer, buffer_f64, oControl.seed);
if(room != rm_a7b11){ buffer_write(buffer, buffer_u8, global.clientID);
queenHealthWait = true; popup_text("Seed sent");
global.queenphasePrev = oQueen.phase;
} else if(room == rm_a7b11 &amp;&amp; (room_last == rm_subscreen || room_last == maproom || room_last == subscreenroom)){
if(queenHealthWait){
queenHealthWait = false;
oQueen.phase = global.queenphasePrev;
global.queenhealthPrev = oQueenHead.myhealth;
}
}
if(room == rm_a7b11 &amp;&amp; phase == oQueen.phase){
oQueenHead.myhealth = global.queenhealthPrev;
}
} }
*/
if(keyboard_check_pressed(vk_f2)){ if(keyboard_check_pressed(vk_f2)){
instance_destroy(); instance_destroy();
@ -500,6 +489,18 @@ switch(type_event){
} }
} }
break;
case 4:
seed = buffer_read(_buffer, buffer_f64);
var clientID = buffer_read(_buffer, buffer_u8);
if(clientID != global.clientID){
if(oControl.seed != seed &amp;&amp; !seedReceived){
oControl.seed = seed;
seedReceived = true;
popup_text("Seed received");
}
}
break;
} }
} }

Loading…
Cancel
Save