Skip to content

Commit

Permalink
replaces slashes for linux/mac correct pathes.
Browse files Browse the repository at this point in the history
***1000 commit***
▒▒▒▒▒▒▄▀▀▓▓▓▀█▒▒▒▒▒▒
▒▒▒▒▄▀▓▓▄██████▄▒▒▒▒
▒▒▒▄█▄█▀░░▄░▄░█▀▒▒▒▒
▒▒▄▀░██▄░░▀░▀░▀▄▒▒▒▒
▒▒▀▄░░▀░▄█▄▄░░▄█▄▒▒▒
▒▒▒▒▀█▄▄░░▀▀▀█▀▒▒▒▒▒
▒▒▒▄▀▓▓▓▀██▀▀█▄▀▀▄▒▒
▒▒█▓▓▄▀▀▀▄█▄▓▓▀█░█▒▒
▒▒▀▄█░░░░░█▀▀▄▄▀█▒▒▒
▒▒▒▄▀▀▄▄▄██▄▄█▀▓▓█▒▒
▒▒█▀▓█████████▓▓▓█▒▒
▒▒█▓▓██▀▀▀▒▒▒▀▄▄█▀▒▒
▒▒▒▀▀▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒
  • Loading branch information
spiiin committed Sep 1, 2017
1 parent 7d0bf2c commit f29ebd2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions CadEditor/Utils.cs
Expand Up @@ -672,10 +672,10 @@ public static void loadEnemyPictures(ref ImageList objectSprites, ref Image[] ob
const int OBJECTS_COUNT = 256; //limit for now
var objSpritesDir = ConfigScript.getObjTypesPicturesDir();
var objSpritesDirGeneric = "obj_sprites";
var templ = objSpritesDir + "\\object{0}.png";
var templGeneric = objSpritesDirGeneric + "\\object{0}.png";
var templBig = objSpritesDir + "\\object{0}b.png";
var templGenericBig = objSpritesDirGeneric + "\\object{0}b.png";
var templ = objSpritesDir + "/object{0}.png";
var templGeneric = objSpritesDirGeneric + "/object{0}.png";
var templBig = objSpritesDir + "/object{0}b.png";
var templGenericBig = objSpritesDirGeneric + "/object{0}b.png";
objectSprites.Images.Clear();
objectSpritesBig = new Image[256];
for (int i = 0; i < OBJECTS_COUNT; i++)
Expand All @@ -687,17 +687,17 @@ public static void loadEnemyPictures(ref ImageList objectSprites, ref Image[] ob
{
objectSprites.Images.Add(Image.FromFile(fname));
}
else if (File.Exists("..\\" + fname))
else if (File.Exists("../" + fname))
{
objectSprites.Images.Add(Image.FromFile("..\\" + fname));
objectSprites.Images.Add(Image.FromFile("../" + fname));
}
else if (File.Exists(fnameGeneric))
{
objectSprites.Images.Add(Image.FromFile(fnameGeneric));
}
else if (File.Exists("..\\" + fnameGeneric))
else if (File.Exists("../" + fnameGeneric))
{
objectSprites.Images.Add(Image.FromFile("..\\" + fnameGeneric));
objectSprites.Images.Add(Image.FromFile("../" + fnameGeneric));
}

//
Expand All @@ -707,17 +707,17 @@ public static void loadEnemyPictures(ref ImageList objectSprites, ref Image[] ob
{
objectSpritesBig[i] = Image.FromFile(fnameBig);
}
else if (File.Exists("..\\" + fnameBig))
else if (File.Exists("../" + fnameBig))
{
objectSpritesBig[i] = Image.FromFile("..\\" + fnameBig);
objectSpritesBig[i] = Image.FromFile("../" + fnameBig);
}
else if (File.Exists(fnameGenericBig))
{
objectSpritesBig[i] = Image.FromFile(fnameGenericBig);
}
else if (File.Exists("..\\" + fnameGenericBig))
else if (File.Exists("../" + fnameGenericBig))
{
objectSpritesBig[i] = Image.FromFile("..\\" + fnameGenericBig);
objectSpritesBig[i] = Image.FromFile("../" + fnameGenericBig);
}
else
{
Expand Down

0 comments on commit f29ebd2

Please sign in to comment.