@@ -1974,13 +1974,12 @@ TownNameGenerator * const _town_name_gen
};
#define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
uint32 GetOldTownName(uint32 townnameparts, byte old_town_name_type)
{
uint32 a = 0;
switch (old_town_name_type) {
case 0: case 3: /* English, American */
/* Already OK */
return townnameparts;
case 1: /* French */
/* For some reason 86 needs to be subtracted from townnameparts
@@ -1170,13 +1170,13 @@ bool NetworkUDPSearchServer() {
}
return (_network_detected_serverport>0);
#else // ENABLE_NETWORK
#else // not ENABLE_NETWORK
// stubs
void NetworkInitialize(const char *hostname) {}
void NetworkShutdown() {}
void NetworkListen(int port) {}
void NetworkConnect(const char *hostname, int port) {}
@@ -1184,8 +1184,8 @@ void NetworkReceive() {}
void NetworkSend() {}
void NetworkSendCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback) {}
void NetworkProcessCommands() {}
void NetworkStartSync() {}
void NetworkUDPListen(int port) {}
void NetworkUDPReceive() {}
bool NetworkUDPSearchServer() {}
bool NetworkUDPSearchServer() { return false; }
#endif // ENABLE_NETWORK
@@ -488,13 +488,13 @@ int ttd_main(int argc, char* argv[])
switch(i) {
case 'm': ttd_strlcpy(musicdriver, mgo.opt, sizeof(musicdriver)); break;
case 's': ttd_strlcpy(sounddriver, mgo.opt, sizeof(sounddriver)); break;
case 'v': ttd_strlcpy(videodriver, mgo.opt, sizeof(videodriver)); break;
case 'n': {
network = 1;
if ((bool)mgo.opt) {
if (mgo.opt) {
network_conn = mgo.opt;
network++;
else
network_conn = NULL;
} break;
@@ -108,7 +108,7 @@ static bool DMusicMidiIsSongPlaying()
static void DMusicMidiSetVolume(byte vol)
SetVolume(vol);
#endif
\ No newline at end of file
@@ -559,13 +559,13 @@ static void FindResolutions()
_num_resolutions = n;
static char *Win32GdiStart(char **parm)
static const char *Win32GdiStart(char **parm)
memset(&_wnd, 0, sizeof(_wnd));
_wnd.cursor_visible = true;
RegisterWndClass();
Status change: