Files
@ r4891:548da56c10b9
Branch filter:
Location: cpp/openttd-patchpack/source/video/dedicated_v.c - annotation
r4891:548da56c10b9
6.9 KiB
text/x-c
(svn r6835) - Fix: Pressing ^D (EOF) at a dedicated console caused it to repeat the last command, instead of doing nothing.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | r2186:5ee653b1b5e1 r2186:5ee653b1b5e1 r2189:2faee8988cf3 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2195:f40560511b07 r2189:2faee8988cf3 r2189:2faee8988cf3 r2189:2faee8988cf3 r2189:2faee8988cf3 r2189:2faee8988cf3 r2189:2faee8988cf3 r2189:2faee8988cf3 r4300:642b2431578b r2195:f40560511b07 r2177:986b22f06f5d r2497:4f8fde59a2e8 r2497:4f8fde59a2e8 r2497:4f8fde59a2e8 r2497:4f8fde59a2e8 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2181:0086b2d70384 r2181:0086b2d70384 r2181:0086b2d70384 r2181:0086b2d70384 r2177:986b22f06f5d r2177:986b22f06f5d r2261:e6fb9fd7ed61 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2177:986b22f06f5d r2210:ed1be54700ae r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2210:ed1be54700ae r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2210:ed1be54700ae r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r4599:2f12a6c3e10d r2180:a46dc84e7817 r2177:986b22f06f5d r2180:a46dc84e7817 r2180:a46dc84e7817 r2180:a46dc84e7817 r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r4599:2f12a6c3e10d r2177:986b22f06f5d r4599:2f12a6c3e10d r2177:986b22f06f5d r2177:986b22f06f5d r4891:548da56c10b9 r2177:986b22f06f5d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r4599:2f12a6c3e10d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2228:cc9d133c0351 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r4848:23347d73ba8f r4848:23347d73ba8f r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r4300:642b2431578b r4300:642b2431578b r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2228:cc9d133c0351 r2177:986b22f06f5d r2177:986b22f06f5d r2228:cc9d133c0351 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2180:a46dc84e7817 r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2177:986b22f06f5d r2195:f40560511b07 r2195:f40560511b07 | /* $Id$ */
#include "../stdafx.h"
#ifdef ENABLE_NETWORK
#include "../openttd.h"
#include "../debug.h"
#include "../functions.h"
#include "../gfx.h"
#include "../network.h"
#include "../window.h"
#include "../console.h"
#include "../variables.h"
#include "../genworld.h"
#include "dedicated_v.h"
#ifdef BEOS_NET_SERVER
#include <net/socket.h>
#endif
#ifdef __OS2__
# include <sys/time.h> /* gettimeofday */
# include <sys/types.h>
# include <unistd.h>
# include <conio.h>
# define INCL_DOS
# include <os2.h>
# define STDIN 0 /* file descriptor for standard input */
/**
* Switches OpenTTD to a console app at run-time, instead of a PM app
* Necessary to see stdout, etc. */
static void OS2_SwitchToConsoleMode(void)
{
PPIB pib;
PTIB tib;
DosGetInfoBlocks(&tib, &pib);
// Change flag from PM to VIO
pib->pib_ultype = 3;
}
#endif
#ifdef UNIX
# include <sys/time.h> /* gettimeofday */
# include <sys/types.h>
# include <unistd.h>
# include <signal.h>
# define STDIN 0 /* file descriptor for standard input */
/* Signal handlers */
static void DedicatedSignalHandler(int sig)
{
_exit_game = true;
signal(sig, DedicatedSignalHandler);
}
#endif
#ifdef WIN32
#include <windows.h> /* GetTickCount */
#include <conio.h>
#include <time.h>
static HANDLE _hInputReady, _hWaitForInputHandling;
static HANDLE _hThread; // Thread to close
static char _win_console_thread_buffer[200];
/* Windows Console thread. Just loop and signal when input has been received */
static void WINAPI CheckForConsoleInput(void)
{
while (true) {
fgets(_win_console_thread_buffer, lengthof(_win_console_thread_buffer), stdin);
/* Signal input waiting that input is read and wait for it being handled
* SignalObjectAndWait() should be used here, but it's unsupported in Win98< */
SetEvent(_hInputReady);
WaitForSingleObject(_hWaitForInputHandling, INFINITE);
}
}
static void CreateWindowsConsoleThread(void)
{
DWORD dwThreadId;
/* Create event to signal when console input is ready */
_hInputReady = CreateEvent(NULL, false, false, NULL);
_hWaitForInputHandling = CreateEvent(NULL, false, false, NULL);
if (_hInputReady == NULL || _hWaitForInputHandling == NULL) error("Cannot create console event!");
_hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)CheckForConsoleInput, NULL, 0, &dwThreadId);
if (_hThread == NULL) error("Cannot create console thread!");
DEBUG(driver, 1) ("Windows console thread started...");
}
static void CloseWindowsConsoleThread(void)
{
CloseHandle(_hThread);
CloseHandle(_hInputReady);
CloseHandle(_hWaitForInputHandling);
DEBUG(driver, 1) ("Windows console thread shut down...");
}
#endif
static void *_dedicated_video_mem;
extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm);
extern void SwitchMode(int new_mode);
static const char *DedicatedVideoStart(const char * const *parm)
{
_screen.width = _screen.pitch = _cur_resolution[0];
_screen.height = _cur_resolution[1];
_dedicated_video_mem = malloc(_cur_resolution[0]*_cur_resolution[1]);
_debug_net_level = 6;
_debug_misc_level = 0;
#ifdef WIN32
// For win32 we need to allocate an console (debug mode does the same)
CreateConsole();
CreateWindowsConsoleThread();
SetConsoleTitle("OpenTTD Dedicated Server");
#endif
#ifdef __OS2__
// For OS/2 we also need to switch to console mode instead of PM mode
OS2_SwitchToConsoleMode();
#endif
DEBUG(driver, 1)("Loading dedicated server...");
return NULL;
}
static void DedicatedVideoStop(void)
{
#ifdef WIN32
CloseWindowsConsoleThread();
#endif
free(_dedicated_video_mem);
}
static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
static bool DedicatedVideoChangeRes(int w, int h) { return false; }
static void DedicatedVideoFullScreen(bool fs) {}
#if defined(UNIX) || defined(__OS2__)
static bool InputWaiting(void)
{
struct timeval tv;
fd_set readfds;
tv.tv_sec = 0;
tv.tv_usec = 1;
FD_ZERO(&readfds);
FD_SET(STDIN, &readfds);
/* don't care about writefds and exceptfds: */
return select(STDIN + 1, &readfds, NULL, NULL, &tv) > 0;
}
static uint32 GetTime(void)
{
struct timeval tim;
gettimeofday(&tim, NULL);
return tim.tv_usec / 1000 + tim.tv_sec * 1000;
}
#else
static bool InputWaiting(void)
{
return WaitForSingleObject(_hInputReady, 1) == WAIT_OBJECT_0;
}
static uint32 GetTime(void)
{
return GetTickCount();
}
#endif
static void DedicatedHandleKeyInput(void)
{
static char input_line[200] = "";
if (!InputWaiting()) return;
if (_exit_game) return;
#if defined(UNIX) || defined(__OS2__)
if (fgets(input_line, lengthof(input_line), stdin) == NULL) return;
#else
/* Handle console input, and singal console thread, it can accept input again */
strncpy(input_line, _win_console_thread_buffer, lengthof(input_line));
SetEvent(_hWaitForInputHandling);
#endif
/* XXX - strtok() does not 'forget' \n\r if it is the first character! */
strtok(input_line, "\r\n"); // Forget about the final \n (or \r)
{ /* Remove any special control characters */
uint i;
for (i = 0; i < lengthof(input_line); i++) {
if (input_line[i] == '\n' || input_line[i] == '\r') // cut missed beginning '\0'
input_line[i] = '\0';
if (input_line[i] == '\0')
break;
if (!IS_INT_INSIDE(input_line[i], ' ', 256))
input_line[i] = ' ';
}
}
IConsoleCmdExec(input_line); // execute command
}
static void DedicatedVideoMainLoop(void)
{
uint32 next_tick;
uint32 cur_ticks;
next_tick = GetTime() + 30;
/* Signal handlers */
#ifdef UNIX
signal(SIGTERM, DedicatedSignalHandler);
signal(SIGINT, DedicatedSignalHandler);
signal(SIGQUIT, DedicatedSignalHandler);
#endif
// Load the dedicated server stuff
_is_network_server = true;
_network_dedicated = true;
_network_playas = PLAYER_SPECTATOR;
_local_player = PLAYER_SPECTATOR;
/* If SwitchMode is SM_LOAD, it means that the user used the '-g' options */
if (_switch_mode != SM_LOAD) {
StartNewGameWithoutGUI(GENERATE_NEW_SEED);
SwitchMode(_switch_mode);
_switch_mode = SM_NONE;
} else {
_switch_mode = SM_NONE;
/* First we need to test if the savegame can be loaded, else we will end up playing the
* intro game... */
if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) {
/* Loading failed, pop out.. */
DEBUG(net, 0)("Loading requested map failed. Aborting.");
_networking = false;
} else {
/* We can load this game, so go ahead */
SwitchMode(SM_LOAD);
}
}
// Done loading, start game!
if (!_networking) {
DEBUG(net, 1)("Dedicated server could not be launched. Aborting.");
return;
}
while (!_exit_game) {
InteractiveRandom(); // randomness
if (!_dedicated_forks)
DedicatedHandleKeyInput();
cur_ticks = GetTime();
if (cur_ticks >= next_tick) {
next_tick += 30;
GameLoop();
_screen.dst_ptr = _dedicated_video_mem;
UpdateWindows();
}
CSleep(1);
}
}
const HalVideoDriver _dedicated_video_driver = {
DedicatedVideoStart,
DedicatedVideoStop,
DedicatedVideoMakeDirty,
DedicatedVideoMainLoop,
DedicatedVideoChangeRes,
DedicatedVideoFullScreen,
};
#endif /* ENABLE_NETWORK */
|