diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index a974c31..def74f3 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -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; } - diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 6168b67..5c6128f 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -1681,6 +1681,9 @@ if(room == titleroom){ global.mapmarker = 0; global.mapmarkerx = 0; global.mapmarkery = 0; + global.mapposx = 3; + global.mapposy = 3; + reset_map(); } diff --git a/objects/oMGamma.object.gmx b/objects/oMGamma.object.gmx index 4443bbc..6affebd 100644 --- a/objects/oMGamma.object.gmx +++ b/objects/oMGamma.object.gmx @@ -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; diff --git a/objects/oMOmega.object.gmx b/objects/oMOmega.object.gmx index 820db3f..0964e67 100644 --- a/objects/oMOmega.object.gmx +++ b/objects/oMOmega.object.gmx @@ -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; diff --git a/objects/oMZeta.object.gmx b/objects/oMZeta.object.gmx index 1e6e44f..ab239a8 100644 --- a/objects/oMZeta.object.gmx +++ b/objects/oMZeta.object.gmx @@ -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;