Merge pull request #13 from joonicks/dev

bigchars moved to common/__
This commit is contained in:
joonicks 2018-12-18 13:42:15 +01:00 committed by GitHub
commit e72de679ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions

View File

@ -292,7 +292,7 @@
#define BOTDIR "" #define BOTDIR ""
#define MECHBASENAME "mech" #define MECHBASENAME "mech"
#define RANDDIR "common/" #define COMMONDIR "common/"
#define HELPDIR "help/" #define HELPDIR "help/"
#define CFGFILE BOTDIR MECHBASENAME ".conf" #define CFGFILE BOTDIR MECHBASENAME ".conf"
#define PIDFILE BOTDIR MECHBASENAME ".pid" #define PIDFILE BOTDIR MECHBASENAME ".pid"
@ -301,16 +301,16 @@
#define TRIVIASCOREFILE BOTDIR MECHBASENAME ".trivscore" #define TRIVIASCOREFILE BOTDIR MECHBASENAME ".trivscore"
#define TEMP ".temp" #define TEMP ".temp"
#define AWAYFILE RANDDIR "away.txt" #define AWAYFILE COMMONDIR "away.txt"
#define NICKSFILE RANDDIR "nick.txt" #define NICKSFILE COMMONDIR "nick.txt"
#define RANDKICKSFILE RANDDIR "kick.txt" #define RANDKICKSFILE COMMONDIR "kick.txt"
#define RANDTOPICSFILE RANDDIR "say.txt" #define RANDTOPICSFILE COMMONDIR "say.txt"
#define RANDSAYFILE RANDDIR "say.txt" #define RANDSAYFILE COMMONDIR "say.txt"
#define RANDINSULTFILE RANDDIR "insult.txt" #define RANDINSULTFILE COMMONDIR "insult.txt"
#define RANDPICKUPFILE RANDDIR "pickup.txt" #define RANDPICKUPFILE COMMONDIR "pickup.txt"
#define RAND8BALLFILE RANDDIR "8ball.txt" #define RAND8BALLFILE COMMONDIR "8ball.txt"
#define SIGNOFFSFILE RANDDIR "signoff.txt" #define SIGNOFFSFILE COMMONDIR "signoff.txt"
#define VERSIONFILE RANDDIR "version.txt" #define VERSIONFILE COMMONDIR "version.txt"
#define DEFAULT_IRC_PORT 6667 #define DEFAULT_IRC_PORT 6667

View File

@ -721,7 +721,7 @@ void do_bigsay(COMMAND_ARGS)
if (fontname && *rest != '-') if (fontname && *rest != '-')
goto reuse_font; goto reuse_font;
stringcpy(output,BIGSAY_DEFAULTFONT); stringcat(stringcpy(output,COMMONDIR),BIGSAY_DEFAULTFONT);
if (rest[0] == '-') if (rest[0] == '-')
{ {
@ -731,7 +731,7 @@ void do_bigsay(COMMAND_ARGS)
else else
if (STRCHR(temp,'/') == NULL) /* no filesystem perversions... */ if (STRCHR(temp,'/') == NULL) /* no filesystem perversions... */
{ {
stringcat(stringcpy(output,temp+1),".bigchars"); /* temp+1 = skip initial '-' */ stringcat(stringcat(stringcpy(output,COMMONDIR),temp+1),".bigchars"); /* temp+1 = skip initial '-' */
} }
} }
#ifdef DEBUG #ifdef DEBUG