projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup file options for debug mode
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 23e37276319a986454f5062c206d6ce67572a898..06f49afaa59f96ad55991955757f5c3df5748ce6 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-633,10
+633,13
@@
// default value for undefined password
#define UNDEFINED_PASSWORD "[undefined]"
// default value for undefined password
#define UNDEFINED_PASSWORD "[undefined]"
-// default value for undefined parameter
+// default value for undefined string parameter
+#define ARG_UNDEFINED_STRING "[undefined]"
+
+// default value for default string parameter
#define ARG_DEFAULT "[DEFAULT]"
#define ARG_DEFAULT "[DEFAULT]"
-// default values for undefined
configuration file parameters
+// default values for undefined
numerical parameter (as string and integer)
#define ARG_UNDEFINED "-1000000"
#define ARG_UNDEFINED_VALUE (-1000000)
#define ARG_UNDEFINED "-1000000"
#define ARG_UNDEFINED_VALUE (-1000000)
@@
-706,13
+709,6
@@
#define FALLBACK_TEXT_FILENAME "fallback.txt"
#define FALLBACK_TEXT_FILENAME "fallback.txt"
-#define LOG_OUT_BASENAME "stdout.txt"
-#define LOG_ERR_BASENAME "stderr.txt"
-
-#define LOG_OUT_ID 0
-#define LOG_ERR_ID 1
-#define NUM_LOGS 2
-
#define STRING_PARENT_DIRECTORY ".."
#define STRING_TOP_DIRECTORY "/"
#define STRING_PARENT_DIRECTORY ".."
#define STRING_TOP_DIRECTORY "/"
@@
-1027,6
+1023,7
@@
struct ProgramInfo
char *userdata_subdir; // personal user game data directory
char *userdata_path; // resulting full path to game data directory
char *userdata_subdir; // personal user game data directory
char *userdata_path; // resulting full path to game data directory
+ char *program_basename;
char *program_title;
char *window_title;
char *program_title;
char *window_title;
@@
-1034,9
+1031,9
@@
struct ProgramInfo
char *cookie_prefix;
char *cookie_prefix;
- char *log_filename
[NUM_LOGS]; // log filenames for out/err
messages
- FILE *log_file
[NUM_LOGS]; // log file handles for out/err
files
- FILE *log_file_default
[NUM_LOGS]; // default log file handles (out/err)
+ char *log_filename
; // filename for log
messages
+ FILE *log_file
; // file handle for log
files
+ FILE *log_file_default
; // default log file handle
int version_super;
int version_major;
int version_super;
int version_major;
@@
-1944,7
+1941,7
@@
extern int FrameCounter;
// function definitions
// function definitions
-void InitProgramInfo(char *, char *, char *, char *, char *, char *,
+void InitProgramInfo(char *, char *, char *, char *, char *, char *,
char *,
char *, int);
void InitNetworkInfo(boolean, boolean, boolean, char *, int);
void InitRuntimeInfo(void);
char *, int);
void InitNetworkInfo(boolean, boolean, boolean, char *, int);
void InitRuntimeInfo(void);