1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff -Naur -x.hg ecwolf.old/src/wl_iwad.cpp ecwolf/src/wl_iwad.cpp
--- ecwolf.old/src/wl_iwad.cpp 2016-10-29 12:08:37.510265126 +0200
+++ ecwolf/src/wl_iwad.cpp 2016-10-29 13:09:29.469624116 +0200
@@ -481,7 +481,7 @@
int defaultIWad = config.GetSetting("DefaultIWad")->GetInteger();
bool useProgdir = false;
- FResourceFile *datawadRes = FResourceFile::OpenResourceFile(datawad, NULL, true);
+ FResourceFile *datawadRes = FResourceFile::OpenResourceFile("/usr/share/ecwolf/ecwolf.pk3", NULL, true);
if(!datawadRes)
{
useProgdir = true;
@@ -544,7 +544,7 @@
}
while(split != 0);
- LookForGameData(datawadRes, basefiles, "/usr/local/share/games/wolf3d");
+ LookForGameData(datawadRes, basefiles, "/usr/share/wolf3d");
// Look for a steam install. (Basically from ZDoom)
{
@@ -639,7 +639,7 @@
selectedGame = &iwadTypes[base.Type];
if(!useProgdir)
- wadfiles.Push(datawad);
+ wadfiles.Push("/usr/share/ecwolf/ecwolf.pk3");
else
wadfiles.Push(progdir + PATH_SEPARATOR + datawad);
for(unsigned int i = 0;i < base.Path.Size();++i)
|