print some useful info if hog not found, allow -help to work if no text available
This commit is contained in:
parent
4b3c900752
commit
d3e45e44ff
|
@ -1,3 +1,8 @@
|
|||
2003-04-07 Bradley Bell <btb@icculus.org>
|
||||
|
||||
* main/inferno.c: print some useful info if hog not found, allow
|
||||
-help to work if no text available
|
||||
|
||||
2003-04-07 Steffen Pohle <stpohle@gmx.net>
|
||||
|
||||
* arch/linux/Makefile.am: revert to previous version, so linux
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: inferno.c,v 1.59 2003-03-31 19:52:02 btb Exp $ */
|
||||
/* $Id: inferno.c,v 1.60 2003-04-07 23:29:28 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
@ -870,10 +870,13 @@ void print_commandline_help()
|
|||
if (!ifile) {
|
||||
ifile = cfopen("help.txb","rb");
|
||||
if (!ifile)
|
||||
Error("Cannot load help text file.");
|
||||
Warning("Cannot load help text file.");
|
||||
have_binary = 1;
|
||||
}
|
||||
|
||||
if (ifile)
|
||||
{
|
||||
|
||||
while (cfgets(line,LINE_LEN,ifile)) {
|
||||
|
||||
if (have_binary) {
|
||||
|
@ -894,6 +897,8 @@ void print_commandline_help()
|
|||
|
||||
cfclose(ifile);
|
||||
|
||||
}
|
||||
|
||||
// printf( " Diagnostic:\n\n");
|
||||
// printf( " -emul %s\n", "Certain video cards need this option in order to run game");
|
||||
// printf( " -ddemul %s\n", "If -emul doesn't work, use this option");
|
||||
|
@ -1219,7 +1224,14 @@ int main(int argc,char **argv)
|
|||
|
||||
if (! cfile_init("descent2.hog"))
|
||||
if (! cfile_init("d2demo.hog"))
|
||||
Error("Could not find a valid hog file (descent2.hog or d2demo.hog)");
|
||||
Warning("Could not find a valid hog file (descent2.hog or d2demo.hog)\nPossible locations are:\n"
|
||||
#ifdef __unix__
|
||||
"\t$HOME/.d2x\n"
|
||||
"\t" SHAREPATH "\n"
|
||||
#else
|
||||
"\tCurrent directory\n"
|
||||
#endif
|
||||
"Or use the -hogdir option to specify an alternate location.");
|
||||
load_text();
|
||||
|
||||
//print out the banner title
|
||||
|
|
Loading…
Reference in a new issue