lcs/lcs-4.04.0-datafiles-locations.patch

   1 diff --git a/src/game.cpp b/src/game.cpp
   2 index 9a512ce..0161f90 100644
   3 --- a/src/game.cpp
   4 +++ b/src/game.cpp
   5 @@ -593,7 +593,9 @@ void end_game(int err)
   6  bool initialize_vehicletypes()
   7  {
   8     CMarkup vtfile;
   9 -   if(!vtfile.Load("art/vehicles.xml"))
  10 +   if(!vtfile.Load("art/vehicles.xml")
  11 +                  && !vtfile.Load("/usr/share/lcs/art/vehicles.xml")
  12 +                  && !vtfile.Load("/usr/local/share/lcs/art/vehicles.xml"))
  13     { //File is missing or not valid XML.
  14        addstr("FAILED to load vehicles.xml!");
  15        getch();
  16 @@ -617,7 +619,9 @@ bool initialize_vehicletypes()
  17  bool initialize_cliptypes()
  18  {
  19     CMarkup ctfile;
  20 -   if(!ctfile.Load("art/clips.xml"))
  21 +  if(!ctfile.Load("art/clips.xml")
  22 +                  && !ctfile.Load("/usr/share/lcs/art/clips.xml")
  23 +                  && !ctfile.Load("/usr/local/share/lcs/art/clips.xml"))
  24     { //File is missing or not valid XML.
  25        addstr("FAILED to load clips.xml!");
  26        getch();
  27 @@ -637,7 +641,9 @@ bool initialize_cliptypes()
  28  bool initialize_weapontypes()
  29  {
  30     CMarkup wtfile;
  31 -   if(!wtfile.Load("art/weapons.xml"))
  32 +   if(!wtfile.Load("art/weapons.xml")
  33 +                  && !wtfile.Load("/usr/share/lcs/art/weapons.xml")
  34 +                  && !wtfile.Load("/usr/local/share/lcs/art/weapons.xml"))
  35     { //File is missing or not valid XML.
  36        addstr("FAILED to load weapons.xml!");
  37        getch();
  38 @@ -658,7 +664,9 @@ bool initialize_armortypes()
  39  {
  40     //Armors
  41     CMarkup atfile;
  42 -   if(!atfile.Load("art/armors.xml"))
  43 +   if(!atfile.Load("art/armors.xml")
  44 +                  && !atfile.Load("/usr/share/lcs/art/armors.xml")
  45 +                  && !atfile.Load("/usr/local/share/lcs/art/armors.xml"))
  46     { //File is missing or not valid XML.
  47        addstr("FAILED to load armors.xml!");
  48        getch();
  49 @@ -674,7 +682,9 @@ bool initialize_armortypes()
  50     }
  51
  52     //Masks
  53 -   if(!atfile.Load("art/masks.xml"))
  54 +   if(!atfile.Load("art/masks.xml")
  55 +                  && !atfile.Load("/usr/share/lcs/art/masks.xml")
  56 +                  && !atfile.Load("/usr/local/share/lcs/art/masks.xml"))
  57     { //File is missing or not valid XML.
  58        addstr("FAILED to load masks.xml!");
  59        getch();
  60 @@ -714,7 +724,9 @@ bool initialize_armortypes()
  61  bool initialize_loottypes()
  62  {
  63     CMarkup ltfile;
  64 -   if(!ltfile.Load("art/loot.xml"))
  65 +   if(!ltfile.Load("art/loot.xml")
  66 +                  && !ltfile.Load("/usr/share/lcs/art/loot.xml")
  67 +                  && !ltfile.Load("/usr/local/share/lcs/art/loot.xml"))
  68     { //File is missing or not valid XML.
  69        addstr("FAILED to load loot.xml!");
  70        getch();