projects / packages / kulic.git / blame
| 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 | } | |
| 120a0a3b | 31 | |
| 03fbe21f | 32 | --- kulic-1.1-orig/src/GMenuBack.cpp 2009-12-29 15:53:05.699238367 +0100 |
| 120a0a3b ZU |
33 | +++ kulic-1.1/src/GMenuBack.cpp 2009-12-29 17:27:23.268671770 +0100 |
| 34 | @@ -43,8 +43,7 @@ | |
| 03fbe21f ZU |
35 | |
| 36 | if (ini.hudba) | |
| 120a0a3b | 37 | if ((m_dat = load_datafile("sfx/menu.dat")) == NULL) |
| 03fbe21f ZU |
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"); | |
| 120a0a3b | 40 | + m_dat = load_datafile(PACKAGE_DATA_DIR "/sfx/menu.dat"); |
| 03fbe21f ZU |
41 | |
| 42 | ||
| 43 | ||
| 44 | --- kulic-1.1-orig/src/GRUN.cpp 2009-12-29 15:53:05.699238367 +0100 | |
| 120a0a3b ZU |
45 | +++ kulic-1.1/src/GRUN.cpp 2009-12-29 17:30:45.285526484 +0100 |
| 46 | @@ -279,11 +279,10 @@ | |
| 03fbe21f ZU |
47 | |
| 48 | fonts = load_datafile("gfx/view/fonts.dat"); | |
| 120a0a3b | 49 | if (fonts == NULL) |
| 03fbe21f ZU |
50 | - if ((fonts = load_datafile("/usr/local/share/kulic/gfx/view/fonts.dat")) == NULL) |
| 51 | - if ((fonts = load_datafile("/usr/share/kulic/gfx/view/fonts.dat")) == NULL) { | |
| 52 | - cerr << "chybi fonts.dat" << endl; | |
| 53 | - return false; | |
| 54 | - } | |
| 120a0a3b ZU |
55 | + if ((fonts = load_datafile(PACKAGE_DATA_DIR "/gfx/view/fonts.dat")) == NULL) { |
| 56 | + cerr << "chybi fonts.dat" << endl; | |
| 57 | + return false; | |
| 58 | + } | |
| 03fbe21f ZU |
59 | |
| 60 | if (!m_sshoots.LoadSFX()) { | |
| 61 | cerr << "Chybi soubor shoots.dat" << endl; | |
| 62 | --- kulic-1.1-orig/src/GSShoots.cpp 2009-12-29 15:53:05.699238367 +0100 | |
| 120a0a3b ZU |
63 | +++ kulic-1.1/src/GSShoots.cpp 2009-12-29 17:36:58.131947319 +0100 |
| 64 | @@ -24,9 +24,8 @@ | |
| 03fbe21f ZU |
65 | { |
| 66 | if (!ini.zvuky) return true; | |
| 120a0a3b | 67 | if((m_soundsatd = load_datafile("sfx/shoots.dat")) == NULL) |
| 03fbe21f ZU |
68 | - if((m_soundsatd = load_datafile("/usr/local/share/kulic/sfx/shoots.dat")) == NULL) |
| 69 | - if((m_soundsatd = load_datafile("/usr/share/kulic/sfx/shoots.dat")) == NULL) | |
| 120a0a3b ZU |
70 | - return true; |
| 71 | + if((m_soundsatd = load_datafile(PACKAGE_DATA_DIR "/sfx/shoots.dat")) == NULL) | |
| 72 | + return true; | |
| 03fbe21f ZU |
73 | |
| 74 | for (int i = 0; i < MAX_SAMPLES; i++) | |
| 75 | if((m_voices[i] = allocate_voice((SAMPLE *)m_soundsatd[i].dat)) == -1) |