projects / packages / kulic.git / blame
| Commit | Line | Data |
|---|---|---|
| 493bff2e | 1 | diff -Nur kulic-1.1.orig/src/GMAP.cpp kulic-1.1/src/GMAP.cpp |
| 2 | --- kulic-1.1.orig/src/GMAP.cpp 2009-12-29 19:48:00.625210128 +0100 | |
| 3 | +++ kulic-1.1/src/GMAP.cpp 2009-12-29 19:49:35.228233239 +0100 | |
| 4 | @@ -443,11 +443,8 @@ | |
| 03fbe21f ZU |
5 | |
| 6 | sprintf(s, "maps/map%d.wav", mapa); | |
| 7 | if ((m_music = load_wav(s)) == NULL) { | |
| 8 | - sprintf(s, "/usr/local/share/kulic/maps/map%d.wav", mapa); | |
| 493bff2e | 9 | - if ((m_music = load_wav(s)) == NULL) { |
| 03fbe21f | 10 | - sprintf(s, "/usr/share/kulic/maps/map%d.wav", mapa); |
| 493bff2e | 11 | - m_music = load_wav(s); |
| 12 | - } | |
| 13 | + sprintf(s, PACKAGE_DATA_DIR "/maps/map%d.wav", mapa); | |
| 14 | + m_music = load_wav(s); | |
| 03fbe21f | 15 | } |
| 493bff2e | 16 | |
| 17 | return true; | |
| 18 | diff -Nur kulic-1.1.orig/src/GMenuBack.cpp kulic-1.1/src/GMenuBack.cpp | |
| 19 | --- kulic-1.1.orig/src/GMenuBack.cpp 2009-12-29 19:48:00.625210128 +0100 | |
| 20 | +++ kulic-1.1/src/GMenuBack.cpp 2009-12-29 19:50:22.241997105 +0100 | |
| 120a0a3b | 21 | @@ -43,8 +43,7 @@ |
| 03fbe21f ZU |
22 | |
| 23 | if (ini.hudba) | |
| 120a0a3b | 24 | if ((m_dat = load_datafile("sfx/menu.dat")) == NULL) |
| 03fbe21f ZU |
25 | - if ((m_dat = load_datafile("/usr/local/share/kulic/sfx/menu.dat")) == NULL) |
| 26 | - m_dat = load_datafile("/usr/share/kulic/sfx/menu.dat"); | |
| 120a0a3b | 27 | + m_dat = load_datafile(PACKAGE_DATA_DIR "/sfx/menu.dat"); |
| 03fbe21f ZU |
28 | |
| 29 | ||
| 30 | ||
| 493bff2e | 31 | diff -Nur kulic-1.1.orig/src/GRUN.cpp kulic-1.1/src/GRUN.cpp |
| 32 | --- kulic-1.1.orig/src/GRUN.cpp 2009-12-29 19:48:00.635210218 +0100 | |
| 33 | +++ kulic-1.1/src/GRUN.cpp 2009-12-29 19:54:05.044381028 +0100 | |
| 34 | @@ -280,8 +280,7 @@ | |
| 03fbe21f ZU |
35 | |
| 36 | fonts = load_datafile("gfx/view/fonts.dat"); | |
| 120a0a3b | 37 | if (fonts == NULL) |
| 03fbe21f ZU |
38 | - if ((fonts = load_datafile("/usr/local/share/kulic/gfx/view/fonts.dat")) == NULL) |
| 39 | - if ((fonts = load_datafile("/usr/share/kulic/gfx/view/fonts.dat")) == NULL) { | |
| 493bff2e | 40 | + if ((fonts = load_datafile(PACKAGE_DATA_DIR "/gfx/view/fonts.dat")) == NULL) { |
| 41 | cerr << "chybi fonts.dat" << endl; | |
| 42 | return false; | |
| 43 | } | |
| 44 | diff -Nur kulic-1.1.orig/src/GSShoots.cpp kulic-1.1/src/GSShoots.cpp | |
| 45 | --- kulic-1.1.orig/src/GSShoots.cpp 2009-12-29 19:48:00.628543452 +0100 | |
| 46 | +++ kulic-1.1/src/GSShoots.cpp 2009-12-29 19:51:03.251569090 +0100 | |
| 47 | @@ -24,8 +24,7 @@ | |
| 03fbe21f ZU |
48 | { |
| 49 | if (!ini.zvuky) return true; | |
| 120a0a3b | 50 | if((m_soundsatd = load_datafile("sfx/shoots.dat")) == NULL) |
| 03fbe21f ZU |
51 | - if((m_soundsatd = load_datafile("/usr/local/share/kulic/sfx/shoots.dat")) == NULL) |
| 52 | - if((m_soundsatd = load_datafile("/usr/share/kulic/sfx/shoots.dat")) == NULL) | |
| 493bff2e | 53 | + if((m_soundsatd = load_datafile(PACKAGE_DATA_DIR "/sfx/shoots.dat")) == NULL) |
| 54 | return true; | |
| 03fbe21f ZU |
55 | |
| 56 | for (int i = 0; i < MAX_SAMPLES; i++) | |
| 493bff2e | 57 | diff -Nur kulic-1.1.orig/src/HGFX.cpp kulic-1.1/src/HGFX.cpp |
| 58 | --- kulic-1.1.orig/src/HGFX.cpp 2009-12-29 19:48:00.631877001 +0100 | |
| 59 | +++ kulic-1.1/src/HGFX.cpp 2009-12-29 19:52:05.881010853 +0100 | |
| 60 | @@ -42,13 +42,8 @@ | |
| 61 | bmp = load_bitmap(filename, pal); | |
| 62 | if (bmp == NULL) { | |
| 63 | char filename2[255]; | |
| 64 | - sprintf(filename2, "/usr/local/share/kulic/%s", filename); | |
| 65 | + sprintf(filename2, PACKAGE_DATA_DIR "/%s", filename); | |
| 66 | bmp = load_bitmap(filename2, pal); | |
| 67 | - | |
| 68 | - if (bmp == NULL) { | |
| 69 | - sprintf(filename2, "/usr/share/kulic/%s", filename); | |
| 70 | - bmp = load_bitmap(filename2, pal); | |
| 71 | - } | |
| 72 | } | |
| 73 | ||
| 74 | if (bmp == NULL) return NULL; | |
| 75 | diff -Nur kulic-1.1.orig/src/HLIGHTS.cpp kulic-1.1/src/HLIGHTS.cpp | |
| 76 | --- kulic-1.1.orig/src/HLIGHTS.cpp 2009-12-29 19:48:00.631877001 +0100 | |
| 77 | +++ kulic-1.1/src/HLIGHTS.cpp 2009-12-29 19:52:21.091134110 +0100 | |
| 78 | @@ -697,13 +697,8 @@ | |
| 79 | bmp = load_bitmap(filename, pal); | |
| 80 | if (bmp == NULL) { | |
| 81 | char filename2[255]; | |
| 82 | - sprintf(filename2, "/usr/local/share/kulic/%s", filename); | |
| 83 | + sprintf(filename2, PACKAGE_DATA_DIR "/%s", filename); | |
| 84 | bmp = load_bitmap(filename2, pal); | |
| 85 | - | |
| 86 | - if (bmp == NULL) { | |
| 87 | - sprintf(filename2, "/usr/share/kulic/%s", filename); | |
| 88 | - bmp = load_bitmap(filename2, pal); | |
| 89 | - } | |
| 90 | } | |
| 91 | ||
| 92 | if (bmp == NULL) return NULL; | |
| 93 | diff -Nur kulic-1.1.orig/src/main.cc kulic-1.1/src/main.cc | |
| 94 | --- kulic-1.1.orig/src/main.cc 2009-12-29 19:48:00.635210218 +0100 | |
| 95 | +++ kulic-1.1/src/main.cc 2009-12-29 19:53:08.545716245 +0100 | |
| 96 | @@ -62,10 +62,8 @@ | |
| 97 | ||
| 98 | // prohledani map | |
| 99 | run.m_maps = run.SearchForMaps(""); | |
| 100 | - int m2 = run.SearchForMaps("/usr/local/share/kulic/"); | |
| 101 | - int m3 = run.SearchForMaps("/usr/share/kulic/"); | |
| 102 | + int m2 = run.SearchForMaps(PACKAGE_DATA_DIR "/"); | |
| 103 | if (m2 > run.m_maps) run.m_maps = m2; | |
| 104 | - if (m3 > run.m_maps) run.m_maps = m3; | |
| 105 | ||
| 106 | if (run.m_maps == 0) { | |
| 107 | allegro_message("No maps found"); |