Fixed mappos crash (i hope)

cleaner
milesthenerd 5 years ago
parent 271a7ca8bd
commit 70cbe90b25

@ -64,13 +64,34 @@ state = undefined;
seed = undefined;
var type;
type = network_socket_tcp;
ini_open(working_directory + "\mod settings.ini");
ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1");
name = ini_read_string("ModSettings", "displayname", "name");
port = ini_read_real("ModSettings", "port", 64198);
reactorsequence = string_lower(ini_read_string("ModSettings", "reactorsequence", "synced"));
preferredcolor = string_lower(ini_read_string("ModSettings", "preferredcolor", "random"));
ini_close();
if(os_type == os_linux){
if(!(file_exists(working_directory + "\mod settings.ini"))){
//Create new file
ini_open(working_directory + "\mod settings.ini");
ini_write_string("ModSettings", "ipaddress", "127.0.0.1");
ini_write_string("ModSettings", "displayname", "name");
ini_write_real("ModSettings", "port", 64198);
ini_write_string("ModSettings", "reactorsequence", "synced");
ini_write_string("ModSettings", "preferredcolor", "random");
ini_close();
}
//Load vars
ini_open(working_directory + "\mod settings.ini");
ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1");
name = ini_read_string("ModSettings", "displayname", "name");
port = ini_read_real("ModSettings", "port", 64198);
reactorsequence = string_lower(ini_read_string("ModSettings", "reactorsequence", "synced"));
preferredcolor = string_lower(ini_read_string("ModSettings", "preferredcolor", "random"));
ini_close();
} else {
ini_open(working_directory + "\mod settings.ini");
ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1");
name = ini_read_string("ModSettings", "displayname", "name");
port = ini_read_real("ModSettings", "port", 64198);
reactorsequence = string_lower(ini_read_string("ModSettings", "reactorsequence", "synced"));
preferredcolor = string_lower(ini_read_string("ModSettings", "preferredcolor", "random"));
ini_close();
}
socket = network_create_socket(type);
isConnected = network_connect(socket, ipaddress, port);
@ -1014,15 +1035,14 @@ if(instance_exists(oQueen) && instance_exists(oQueenHead) && !is
var itemCount = 0;
for(var h=0; h<array_length_1d(global.item); h++){
var val = global.item[h];
if(val == 1 && h != 1){
itemCount++;
if(val == 1 && h != 1){
itemCount++;
}
}
}
if(itemCount != global.itemstaken){
global.itemstaken = itemCount;
}
</string>
</argument>
</arguments>

@ -1681,6 +1681,9 @@ if(room == titleroom){
global.mapmarker = 0;
global.mapmarkerx = 0;
global.mapmarkery = 0;
global.mapposx = 3;
global.mapposy = 3;
reset_map();
}
</string>
</argument>

@ -91,6 +91,11 @@ speedmulti = 1;
targetx = x;
targety = y;
dead = false;
myposx = floor(x / 320);
myposy = floor((y - 8) / 240);
mapposx = myposx + global.mapoffsetx;
mapposy = myposy + global.mapoffsety;
</string>
</argument>
</arguments>

@ -141,6 +141,11 @@ dmg = 0;
flashtime = 0;
laststate = 0;
dead = false;
myposx = floor(x / 320);
myposy = floor((y - 8) / 240);
mapposx = myposx + global.mapoffsetx;
mapposy = myposy + global.mapoffsety;
</string>
</argument>
</arguments>

@ -117,6 +117,11 @@ alarm[3] = 1;
alarm[9] = 1;
scan_log(14, get_text("ScanEvents", "ScanBioform"), 180, 0);
dead = false;
myposx = floor(x / 320);
myposy = floor((y - 8) / 240);
mapposx = myposx + global.mapoffsetx;
mapposy = myposy + global.mapoffsety;
</string>
</argument>
</arguments>

Loading…
Cancel
Save