]>
Commit | Line | Data |
---|---|---|
03fbe21f ZU |
1 | --- kulic-1.1-orig/src/GMAP.cpp 2009-12-29 15:53:05.699238367 +0100 |
2 | +++ kulic-1.1/src/GMAP.cpp 2009-12-29 15:55:54.510065847 +0100 | |
3 | @@ -443,9 +443,9 @@ | |
4 | ||
5 | sprintf(s, "maps/map%d.wav", mapa); | |
6 | if ((m_music = load_wav(s)) == NULL) { | |
7 | - sprintf(s, "/usr/local/share/kulic/maps/map%d.wav", mapa); | |
8 | + sprintf(s, "%s/maps/map%d.wav", PACKAGE_DATA_DIR, mapa); | |
9 | if ((m_music = load_wav(s)) == NULL) { | |
10 | - sprintf(s, "/usr/share/kulic/maps/map%d.wav", mapa); | |
11 | + sprintf(s, "%s/maps/map%d.wav", PACKAGE_DATA_DIR, mapa); | |
12 | m_music = load_wav(s); | |
13 | } | |
14 | } | |
15 | --- kulic-1.1-orig/src/HGFX.cpp 2009-12-29 15:53:05.696945688 +0100 | |
16 | +++ kulic-1.1/src/HGFX.cpp 2009-12-29 15:59:16.616075254 +0100 | |
17 | @@ -42,11 +42,11 @@ | |
18 | bmp = load_bitmap(filename, pal); | |
19 | if (bmp == NULL) { | |
20 | char filename2[255]; | |
21 | - sprintf(filename2, "/usr/local/share/kulic/%s", filename); | |
22 | + sprintf(filename2, "%s/%s", PACKAGE_DATA_DIR, filename); | |
23 | bmp = load_bitmap(filename2, pal); | |
24 | ||
25 | if (bmp == NULL) { | |
26 | - sprintf(filename2, "/usr/share/kulic/%s", filename); | |
27 | + sprintf(filename2, "%s/%s", PACKAGE_DATA_DIR, filename); | |
28 | bmp = load_bitmap(filename2, pal); | |
29 | } | |
30 | } | |
31 | --- kulic-1.1-orig/src/GMenuBack.cpp 2009-12-29 15:53:05.699238367 +0100 | |
32 | +++ kulic-1.1/src/GMenuBack.cpp 2009-12-29 16:06:48.989269541 +0100 | |
33 | @@ -42,9 +42,11 @@ | |
34 | } | |
35 | ||
36 | if (ini.hudba) | |
37 | - if ((m_dat = load_datafile("sfx/menu.dat")) == NULL) | |
38 | - if ((m_dat = load_datafile("/usr/local/share/kulic/sfx/menu.dat")) == NULL) | |
39 | - m_dat = load_datafile("/usr/share/kulic/sfx/menu.dat"); | |
40 | + if ((m_dat = load_datafile("sfx/menu.dat")) == NULL) { | |
41 | + char tmpfilename[255]; | |
42 | + sprintf(tmpfilename,"%s/%s",PACKAGE_DATA_DIR,"sfx/menu.dat"); | |
43 | + m_dat = load_datafile(tmpfilename); | |
44 | + } | |
45 | ||
46 | ||
47 | ||
48 | --- kulic-1.1-orig/src/GRUN.cpp 2009-12-29 15:53:05.699238367 +0100 | |
49 | +++ kulic-1.1/src/GRUN.cpp 2009-12-29 16:09:10.802890853 +0100 | |
50 | @@ -278,12 +278,14 @@ | |
51 | ||
52 | ||
53 | fonts = load_datafile("gfx/view/fonts.dat"); | |
54 | - if (fonts == NULL) | |
55 | - if ((fonts = load_datafile("/usr/local/share/kulic/gfx/view/fonts.dat")) == NULL) | |
56 | - if ((fonts = load_datafile("/usr/share/kulic/gfx/view/fonts.dat")) == NULL) { | |
57 | - cerr << "chybi fonts.dat" << endl; | |
58 | - return false; | |
59 | - } | |
60 | + if (fonts == NULL) { | |
61 | + char tmpfilename[255]; | |
62 | + sprintf(tmpfilename,"%s/%s",PACKAGE_DATA_DIR,"gfx/view/fonts.dat"); | |
63 | + if ((fonts = load_datafile(tmpfilename)) == NULL) { | |
64 | + cerr << "chybi fonts.dat" << endl; | |
65 | + return false; | |
66 | + } | |
67 | + } | |
68 | ||
69 | if (!m_sshoots.LoadSFX()) { | |
70 | cerr << "Chybi soubor shoots.dat" << endl; | |
71 | --- kulic-1.1-orig/src/GSShoots.cpp 2009-12-29 15:53:05.699238367 +0100 | |
72 | +++ kulic-1.1/src/GSShoots.cpp 2009-12-29 16:19:03.306164607 +0100 | |
73 | @@ -23,10 +23,12 @@ | |
74 | bool GSShoots::LoadSFX() | |
75 | { | |
76 | if (!ini.zvuky) return true; | |
77 | - if((m_soundsatd = load_datafile("sfx/shoots.dat")) == NULL) | |
78 | - if((m_soundsatd = load_datafile("/usr/local/share/kulic/sfx/shoots.dat")) == NULL) | |
79 | - if((m_soundsatd = load_datafile("/usr/share/kulic/sfx/shoots.dat")) == NULL) | |
80 | + if((m_soundsatd = load_datafile("sfx/shoots.dat")) == NULL) { | |
81 | + char tmpfilename[255]; | |
82 | + sprintf(tmpfilename,"%s/%s",PACKAGE_DATA_DIR,"sfx/shoots.dat"); | |
83 | + if((m_soundsatd = load_datafile(tmpfilename)) == NULL) | |
84 | return true; | |
85 | + } | |
86 | ||
87 | for (int i = 0; i < MAX_SAMPLES; i++) | |
88 | if((m_voices[i] = allocate_voice((SAMPLE *)m_soundsatd[i].dat)) == -1) |