move crosshairs directory to its own packages path
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5823 e016b1c5-ed68-44aa-a2f7-31cac88cffde
|
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 336 B |
|
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 339 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 416 B After Width: | Height: | Size: 416 B |
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
|
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 489 B |
|
Before Width: | Height: | Size: 166 B After Width: | Height: | Size: 166 B |
|
Before Width: | Height: | Size: 321 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 347 B |
@@ -1065,7 +1065,7 @@ void writecfg()
|
|||||||
extern Texture *crosshairs[CROSSHAIR_NUM];
|
extern Texture *crosshairs[CROSSHAIR_NUM];
|
||||||
loopi(CROSSHAIR_NUM) if(crosshairs[i] && crosshairs[i]!=notexture)
|
loopi(CROSSHAIR_NUM) if(crosshairs[i] && crosshairs[i]!=notexture)
|
||||||
{
|
{
|
||||||
const char *fname = crosshairs[i]->name+strlen("packages/misc/crosshairs/");
|
const char *fname = crosshairs[i]->name+strlen("packages/crosshairs/");
|
||||||
if(i==CROSSHAIR_DEFAULT) f->printf("loadcrosshair %s\n", fname);
|
if(i==CROSSHAIR_DEFAULT) f->printf("loadcrosshair %s\n", fname);
|
||||||
else f->printf("loadcrosshair %s %s\n", fname, crosshairnames[i]);
|
else f->printf("loadcrosshair %s %s\n", fname, crosshairnames[i]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -159,9 +159,9 @@ Texture *crosshairs[CROSSHAIR_NUM] = { NULL }; // weapon specific crosshairs
|
|||||||
|
|
||||||
Texture *loadcrosshairtexture(const char *c)
|
Texture *loadcrosshairtexture(const char *c)
|
||||||
{
|
{
|
||||||
defformatstring(p)("packages/misc/crosshairs/%s", c);
|
defformatstring(p)("packages/crosshairs/%s", c);
|
||||||
Texture *crosshair = textureload(p, 3);
|
Texture *crosshair = textureload(p, 3);
|
||||||
if(crosshair==notexture) crosshair = textureload("packages/misc/crosshairs/default.png", 3);
|
if(crosshair==notexture) crosshair = textureload("packages/crosshairs/default.png", 3);
|
||||||
return crosshair;
|
return crosshair;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||