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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From: Stefan Ritter <xeno@thehappy.de>
Subject: PNG files are now in /u/s/pixmaps, so we had to fix the paths in source
--- a/win/gl/gl_font.c
+++ b/win/gl/gl_font.c
@@ -47,25 +47,25 @@
{
case 8:
if (! sdlgl_font_8)
- sdlgl_font_8 = sdlgl_load_tileset("glfont8.png", 8,8, 1,0,
+ sdlgl_font_8 = sdlgl_load_tileset("/usr/share/pixmaps/glhack/glfont8.png", 8,8, 1,0,
NULL,NULL);
return sdlgl_font_8;
case 14:
if (! sdlgl_font_14)
- sdlgl_font_14 = sdlgl_load_tileset("glfont14.png", 8,14, 1,0,
+ sdlgl_font_14 = sdlgl_load_tileset("/usr/share/pixmaps/glhack/glfont14.png", 8,14, 1,0,
NULL,NULL);
return sdlgl_font_14;
case 20:
if (! sdlgl_font_20)
- sdlgl_font_20 = sdlgl_load_tileset("glfont20.png", 10,20, 1,0,
+ sdlgl_font_20 = sdlgl_load_tileset("/usr/share/pixmaps/glhack/glfont20.png", 10,20, 1,0,
NULL,NULL);
return sdlgl_font_20;
case 22:
if (! sdlgl_font_22)
- sdlgl_font_22 = sdlgl_load_tileset("glfont22.png", 12,22, 1,0,
+ sdlgl_font_22 = sdlgl_load_tileset("/usr/share/pixmaps/glhack/glfont22.png", 12,22, 1,0,
NULL,NULL);
return sdlgl_font_22;
--- a/win/gl/gl_tile.c
+++ b/win/gl/gl_tile.c
@@ -134,11 +134,11 @@
* removed and freed.
*/
if (iflags.wc_tile_height == 16)
- sdlgl_tiles = sdlgl_load_tileset("gltile16.png", 16,16, 0,0, NULL,NULL);
+ sdlgl_tiles = sdlgl_load_tileset("/usr/share/pixmaps/glhack/gltile16.png", 16,16, 0,0, NULL,NULL);
else if (iflags.wc_tile_height == 64)
- sdlgl_tiles = sdlgl_load_tileset("gltile64.png", 48,64, 0,0, NULL,NULL);
+ sdlgl_tiles = sdlgl_load_tileset("/usr/share/pixmaps/glhack/gltile64.png", 48,64, 0,0, NULL,NULL);
else
- sdlgl_tiles = sdlgl_load_tileset("gltile32.png", 32,32, 0,0, NULL,NULL);
+ sdlgl_tiles = sdlgl_load_tileset("/usr/share/pixmaps/glhack/gltile32.png", 32,32, 0,0, NULL,NULL);
assert(sdlgl_tiles);
}
@@ -152,7 +152,7 @@
int x, y;
int w1, h1, w2, h2;
- logo_set = sdlgl_load_tileset("gllogo.png", 16,16, 0,0, &logo_w, &logo_h);
+ logo_set = sdlgl_load_tileset("/usr/share/pixmaps/glhack/gllogo.png", 16,16, 0,0, &logo_w, &logo_h);
assert(logo_set);
@@ -308,7 +308,7 @@
do_load_tileset();
}
- rip_set = sdlgl_load_tileset("glrip.png", 30,30, 0,1, &rip_w, &rip_h);
+ rip_set = sdlgl_load_tileset("/usr/share/pixmaps/glhack/glrip.png", 30,30, 0,1, &rip_w, &rip_h);
assert(rip_set);
|
