--- a/dedicated.c Wed Feb 23 00:07:03 2005 +0000
+++ b/dedicated.c Wed Feb 23 09:13:12 2005 +0000
@@ -49,8 +49,8 @@
void DedicatedFork(void)
{
/* Fork the program */
- _dedicated_pid = fork();
- switch (_dedicated_pid) {
+ pid_t pid = fork();
+ switch (pid) {
case -1:
perror("Unable to fork");
exit(1);
@@ -76,7 +76,7 @@
default:
// We're the parent
printf("Loading dedicated server...\n");
- printf(" - Forked to background with pid %d\n", _dedicated_pid);
+ printf(" - Forked to background with pid %d\n", pid);
exit(0);
}
}
--- a/ttd.c Wed Feb 23 00:07:03 2005 +0000
+++ b/ttd.c Wed Feb 23 09:13:12 2005 +0000
@@ -491,13 +491,15 @@
char musicdriver[16], sounddriver[16], videodriver[16];
int resolution[2] = {0,0};
uint startdate = -1;
+ bool dedicated;
+
musicdriver[0] = sounddriver[0] = videodriver[0] = 0;
_game_mode = GM_MENU;
_switch_mode = SM_MENU;
_switch_mode_errorstr = INVALID_STRING_ID;
_dedicated_forks = false;
- _dedicated_enabled = false;
+ dedicated = false;
// The last param of the following function means this:
// a letter means: it accepts that param (e.g.: -h)
@@ -519,7 +521,7 @@
sprintf(musicdriver,"null");
sprintf(sounddriver,"null");
sprintf(videodriver,"dedicated");
- _dedicated_enabled = true;
+ dedicated = true;
} break;
case 'f': {
_dedicated_forks = true;
@@ -590,7 +592,7 @@
if (resolution[0]) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; }
if (startdate != (uint)-1) _patches.starting_date = startdate;
- if (_dedicated_forks && !_dedicated_enabled)
+ if (_dedicated_forks && !dedicated)
_dedicated_forks = false;
// enumerate language files
--- a/variables.h Wed Feb 23 00:07:03 2005 +0000
+++ b/variables.h Wed Feb 23 09:13:12 2005 +0000
@@ -449,9 +449,5 @@
/* Forking stuff */
VARDEF bool _dedicated_forks;
-VARDEF bool _dedicated_enabled;
-#ifdef UNIX
- VARDEF pid_t _dedicated_pid;
-#endif
#endif /* VARIABLES_H */