From 974d80a800df271cfc3672df8825e1a11bbb81aa Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 25 Oct 2008 13:43:05 +0000 Subject: [PATCH] make loadcrosshair cmd backward compatible git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3240 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/command.cpp | 4 ++-- source/src/renderhud.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/command.cpp b/source/src/command.cpp index a4e0b21c..5b254aba 100644 --- a/source/src/command.cpp +++ b/source/src/command.cpp @@ -823,8 +823,8 @@ void writecfg() fprintf(f, "// automatically written on exit, DO NOT MODIFY\n// delete this file to have defaults.cfg overwrite these settings\n// modify settings in game, or put settings in autoexec.cfg to override anything\n\n"); fprintf(f, "name %s\nskin %d\n", player1->name, player1->nextskin); extern Texture *defaultcrosshair, *crosshairs[NUMGUNS]; - fprintf(f, "loadcrosshair -1 %s\n", defaultcrosshair->name+strlen("packages/misc/crosshairs/")); - loopi(NUMGUNS) if(crosshairs[i]) fprintf(f, "loadcrosshair %d %s\n", i, crosshairs[i]->name+strlen("packages/misc/crosshairs/")); + fprintf(f, "loadcrosshair %s\n", defaultcrosshair->name+strlen("packages/misc/crosshairs/")); + loopi(NUMGUNS) if(crosshairs[i]) fprintf(f, "loadcrosshair %s %d\n", crosshairs[i]->name+strlen("packages/misc/crosshairs/"), i); extern int lowfps, highfps; fprintf(f, "fpsrange %d %d\n", lowfps, highfps); fprintf(f, "\n"); diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 7e3dc3e1..dee21c57 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -134,11 +134,11 @@ Texture *loadcrosshairtexture(const char *c) return crosshair; } -void loadcrosshair(char *w, char *c) +void loadcrosshair(char *c, char *w) { int weapon = atoi(w); if(weapon>NUMGUNS) return; - if(weapon<0) defaultcrosshair = loadcrosshairtexture(c); + if(weapon<0 || strlen(w)==0) defaultcrosshair = loadcrosshairtexture(c); else crosshairs[weapon] = loadcrosshairtexture(c); }