freelords-path.patch

   1 diff -urN freelords.org/src/common/armyset.cpp freelords/src/common/armyset.cpp
   2 --- freelords.org/src/common/armyset.cpp        Sat Feb 17 15:11:25 2001
   3 +++ freelords/src/common/armyset.cpp    Sat Feb 17 15:29:29 2001
   4 @@ -42,11 +42,11 @@
   5         int strength, moves, upkeep, production, defence, vitality, production_cost, HP;
   6
   7         // filename of the armydescription file
   8 -       QString file("../pic/army/");
   9 +       QString file("/usr/X11R6/share/freelords/army/");
  10         file += name + "/default";
  11
  12         // path to the pics of this armyset
  13 -       QString pic_path("../pic/army/");
  14 +       QString pic_path("/usr/X11R6/share/freelords/army/");
  15         pic_path += name;
  16
  17         // Open file
  18 @@ -73,7 +73,7 @@
  19                                moves, upkeep, production, production_cost);
  20
  21                 // filename of the armypicture to load
  22 -               QString str("../pic/army/");
  23 +               QString str("/usr/X11R6/share/freelords/army/");
  24                 str += name + "/" + pic_name;
  25                 army[i]->set_pixmap(pics->load(str));
  26
  27 diff -urN freelords.org/src/common/game_scenario.cpp freelords/src/common/game_scenario.cpp
  28 --- freelords.org/src/common/game_scenario.cpp  Sat Feb 17 15:11:25 2001
  29 +++ freelords/src/common/game_scenario.cpp      Sat Feb 17 15:28:35 2001
  30 @@ -63,7 +63,7 @@
  31
  32         // now let's load the correct mapset
  33         if ((map_type == RANDOM) || (map_type == PREVIOUS))
  34 -              mapdef->load_mapset("../pic/map/default/default");       // random map chosen
  35 +              mapdef->load_mapset("/usr/X11R6/share/freelords/map/default/default");   // random map chosen
  36         else mapdef->load_mapset(mapdef->extract_mapset(map_file));
  37
  38         load_armyset();
  39 @@ -75,7 +75,7 @@
  40                 // create map + cities
  41                 if (map_type == RANDOM)
  42                 {
  43 -                       system("./genmap.py > random.map");     // execute random map generator
  44 +                       system("/usr/X11R6/share/freelords/genmap.py > random.map");    // execute random map generator
  45                         mapdef->random();                       // load the created map saved in random.map
  46                 }
  47                 if (map_type == LOADED) mapdef->load(map_file);
  48 diff -urN freelords.org/src/common/mapdef.cpp freelords/src/common/mapdef.cpp
  49 --- freelords.org/src/common/mapdef.cpp Sat Feb 17 15:11:25 2001
  50 +++ freelords/src/common/mapdef.cpp     Sat Feb 17 15:27:08 2001
  51 @@ -304,7 +304,7 @@
  52                 m->set_color(color);
  53                 mapset.append(m);
  54
  55 -               QString str("../pic/map/default/");
  56 +               QString str("/usr/X11R6/share/freelords/default/");
  57                 str += buffer;
  58                 str += "_";
  59
  60 diff -urN freelords.org/src/common/pics.cpp freelords/src/common/pics.cpp
  61 --- freelords.org/src/common/pics.cpp   Sat Feb 17 15:11:25 2001
  62 +++ freelords/src/common/pics.cpp       Sat Feb 17 15:26:45 2001
  63 @@ -30,11 +30,11 @@
  64
  65  Pics::Pics()
  66  {
  67 -       city = load("../pic/map/default/city.png");
  68 -       ruin = load("../pic/map/default/ruin.png");
  69 -       temple = load("../pic/map/default/temple.png");
  70 -       sword = load("../pic/various/sword.png");
  71 -       splash_screen = load("../pic/various/splash_screen.png");
  72 +       city = load("/usr/X11R6/share/freelords/map/default/city.png");
  73 +       ruin = load("/usr/X11R6/share/freelords/map/default/ruin.png");
  74 +       temple = load("/usr/X11R6/share/freelords/map/default/temple.png");
  75 +       sword = load("/usr/X11R6/share/freelords/various/sword.png");
  76 +       splash_screen = load("/usr/X11R6/share/freelords/various/splash_screen.png");
  77  }
  78
  79  Pics::~Pics()
  80 diff -urN freelords.org/src/graphic/hero_offer.cpp freelords/src/graphic/hero_offer.cpp
  81 --- freelords.org/src/graphic/hero_offer.cpp    Sat Feb 17 15:11:25 2001
  82 +++ freelords/src/graphic/hero_offer.cpp        Sat Feb 17 15:31:14 2001
  83 @@ -43,8 +43,8 @@
  84         b_reject = new QPushButton("&Reject", this);
  85         b_reject->setGeometry(width()-155, 70, 70, 25);
  86
  87 -       if (gender == MALE) system("./hero_male_names.py 1 > new_name");// generate a male name
  88 -       else system("./hero_female_names.py 1 > new_name");             // generate a female name
  89 +       if (gender == MALE) system("/usr/X11R6/share/freelords/hero_male_names.py 1 > new_name");// generate a male name
  90 +       else system("/usr/X11R6/share/freelords/hero_female_names.py 1 > new_name");            // generate a female name
  91
  92         ifstream name_file("new_name");                 // get name
  93
  94 diff -urN freelords.org/src/graphic/player_preferences.cpp freelords/src/graphic/player_preferences.cpp
  95 --- freelords.org/src/graphic/player_preferences.cpp    Sat Feb 17 15:11:25 2001
  96 +++ freelords/src/graphic/player_preferences.cpp        Sat Feb 17 15:30:17 2001
  97 @@ -16,7 +16,7 @@
  98  #include <qdir.h>
  99  #include <qlabel.h>
 100
 101 -#define PATH_ARMYSET "../pic/army/"
 102 +#define PATH_ARMYSET "/usr/X11R6/share/freelords/army/"
 103
 104  Player_preferences::Player_preferences(QWidget* parent, const char* name)
 105         :QGroupBox(4, QGroupBox::Vertical, "Player preferences", parent, name)
 106 diff -urN freelords.org/src/graphic/selector.cpp freelords/src/graphic/selector.cpp
 107 --- freelords.org/src/graphic/selector.cpp      Sat Feb 17 15:11:25 2001
 108 +++ freelords/src/graphic/selector.cpp  Sat Feb 17 15:27:28 2001
 109 @@ -17,7 +17,7 @@
 110  #include "selector.h"
 111
 112  Selector::Selector(QCanvas* canvas)
 113 -       :QCanvasSprite(new QCanvasPixmapArray("../pic/various/select%1.png", 2),
 114 +       :QCanvasSprite(new QCanvasPixmapArray("/usr/X11R6/share/freelords/various/select%1.png", 2),
 115                                                 canvas)
 116  {
 117           c = canvas;