diff options
| author | tron <tron@openttd.org> | 2005-02-23 09:13:12 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-02-23 09:13:12 +0000 |
| commit | f55bde6ee41eacde0fe3aab20b82af4fa99bdfcc (patch) | |
| tree | ac3b31a0a17904ab3682202b886b12acab039b14 | |
| parent | 50ac80cb4c08d76c57b540744e7394ebd3ccc300 (diff) | |
| download | openttd-f55bde6ee41eacde0fe3aab20b82af4fa99bdfcc.tar.xz | |
(svn r1910) Move two variables out of variables.h which are only used locally
| -rw-r--r-- | dedicated.c | 6 | ||||
| -rw-r--r-- | ttd.c | 8 | ||||
| -rw-r--r-- | variables.h | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/dedicated.c b/dedicated.c index 608b0f429..4ddd7c7a2 100644 --- a/dedicated.c +++ b/dedicated.c @@ -49,8 +49,8 @@ static void *_dedicated_video_mem; 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 @@ void DedicatedFork(void) 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); } } @@ -491,13 +491,15 @@ int ttd_main(int argc, char* argv[]) 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 @@ int ttd_main(int argc, char* argv[]) sprintf(musicdriver,"null"); sprintf(sounddriver,"null"); sprintf(videodriver,"dedicated"); - _dedicated_enabled = true; + dedicated = true; } break; case 'f': { _dedicated_forks = true; @@ -590,7 +592,7 @@ int ttd_main(int argc, char* argv[]) 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 diff --git a/variables.h b/variables.h index ef0ff1ad1..07d23013c 100644 --- a/variables.h +++ b/variables.h @@ -449,9 +449,5 @@ VARDEF byte _railtype_selected_in_replace_gui; /* Forking stuff */ VARDEF bool _dedicated_forks; -VARDEF bool _dedicated_enabled; -#ifdef UNIX - VARDEF pid_t _dedicated_pid; -#endif #endif /* VARIABLES_H */ |