diff --git a/packages/misc/crosshairs/cube.png b/packages/crosshairs/cube.png similarity index 100% rename from packages/misc/crosshairs/cube.png rename to packages/crosshairs/cube.png diff --git a/packages/misc/crosshairs/default.png b/packages/crosshairs/default.png similarity index 100% rename from packages/misc/crosshairs/default.png rename to packages/crosshairs/default.png diff --git a/packages/misc/crosshairs/dot.png b/packages/crosshairs/dot.png similarity index 100% rename from packages/misc/crosshairs/dot.png rename to packages/crosshairs/dot.png diff --git a/packages/misc/crosshairs/dot_wide.png b/packages/crosshairs/dot_wide.png similarity index 100% rename from packages/misc/crosshairs/dot_wide.png rename to packages/crosshairs/dot_wide.png diff --git a/packages/misc/crosshairs/o.png b/packages/crosshairs/o.png similarity index 100% rename from packages/misc/crosshairs/o.png rename to packages/crosshairs/o.png diff --git a/packages/misc/crosshairs/o_dot.png b/packages/crosshairs/o_dot.png similarity index 100% rename from packages/misc/crosshairs/o_dot.png rename to packages/crosshairs/o_dot.png diff --git a/packages/misc/crosshairs/o_x.png b/packages/crosshairs/o_x.png similarity index 100% rename from packages/misc/crosshairs/o_x.png rename to packages/crosshairs/o_x.png diff --git a/packages/misc/crosshairs/readme.txt b/packages/crosshairs/readme.txt similarity index 100% rename from packages/misc/crosshairs/readme.txt rename to packages/crosshairs/readme.txt diff --git a/packages/misc/crosshairs/red_dot.png b/packages/crosshairs/red_dot.png similarity index 100% rename from packages/misc/crosshairs/red_dot.png rename to packages/crosshairs/red_dot.png diff --git a/packages/misc/crosshairs/star.png b/packages/crosshairs/star.png similarity index 100% rename from packages/misc/crosshairs/star.png rename to packages/crosshairs/star.png diff --git a/packages/misc/crosshairs/teammate.png b/packages/crosshairs/teammate.png similarity index 100% rename from packages/misc/crosshairs/teammate.png rename to packages/crosshairs/teammate.png diff --git a/packages/misc/crosshairs/wide.png b/packages/crosshairs/wide.png similarity index 100% rename from packages/misc/crosshairs/wide.png rename to packages/crosshairs/wide.png diff --git a/packages/misc/crosshairs/x-dot.png b/packages/crosshairs/x-dot.png similarity index 100% rename from packages/misc/crosshairs/x-dot.png rename to packages/crosshairs/x-dot.png diff --git a/source/src/command.cpp b/source/src/command.cpp index daf10c82..10d2b623 100644 --- a/source/src/command.cpp +++ b/source/src/command.cpp @@ -1065,7 +1065,7 @@ void writecfg() extern Texture *crosshairs[CROSSHAIR_NUM]; 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); else f->printf("loadcrosshair %s %s\n", fname, crosshairnames[i]); } diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index b5a4862c..47bc2c47 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -159,9 +159,9 @@ Texture *crosshairs[CROSSHAIR_NUM] = { NULL }; // weapon specific crosshairs Texture *loadcrosshairtexture(const char *c) { - defformatstring(p)("packages/misc/crosshairs/%s", c); + defformatstring(p)("packages/crosshairs/%s", c); 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; }