cpp/openttd-patchpack/source Changeset - r23482:de566f8c088d

Changeset - r23482:de566f8c088d

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

Patric Stout - 5 years ago 2019-03-19 21:23:09
truebrain@openttd.org

Remove: DOS support

In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.

Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.

Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.

By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.

Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.

82 files changed with 21 insertions and 1305 deletions:

Makefile.bundle.in

Makefile.src.in

README.md

config.lib

configure

os/dos/cwsdpmi/README.licensing

os/dos/cwsdpmi/cwsdpmi.exe

bin+del

os/dos/cwsdpmi/cwsdpmi.txt

173

os/dos/cwsdpmi/cwsdstub.exe

bin+del

os/dos/exe2coff/README.licensing

os/dos/exe2coff/copying

339

os/dos/exe2coff/copying.dj

os/dos/exe2coff/copying.lib

481

os/dos/exe2coff/exe2coff.c

os/dos/make_dos_binary_selfcontained.sh

source.list

src/core/endian_type.hpp

src/cpu.cpp

src/fileio.cpp

src/intro_gui.cpp

src/lang/afrikaans.txt

src/lang/arabic_egypt.txt

src/lang/basque.txt

src/lang/belarusian.txt

src/lang/brazilian_portuguese.txt

src/lang/bulgarian.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/english_AU.txt

src/lang/english_US.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/faroese.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/gaelic.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/greek.txt

src/lang/hebrew.txt

src/lang/hungarian.txt

src/lang/icelandic.txt

src/lang/indonesian.txt

src/lang/irish.txt

src/lang/italian.txt

src/lang/japanese.txt

src/lang/korean.txt

src/lang/latin.txt

src/lang/latvian.txt

src/lang/lithuanian.txt

src/lang/luxembourgish.txt

src/lang/malay.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/polish.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/serbian.txt

src/lang/simplified_chinese.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/spanish_MX.txt

src/lang/swedish.txt

src/lang/tamil.txt

src/lang/thai.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/lang/unfinished/chuvash.txt

src/lang/unfinished/frisian.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/urdu.txt

src/lang/vietnamese.txt

src/lang/welsh.txt

src/stdafx.h

src/video/allegro_v.cpp

0 comments (0 inline, 0 general)

Makefile.bundle.in

➞

Show inline comments

@@ @@ -89,12 +89,6 @@ ifdef MENU_DIR @@
 endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
 	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
 	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
 ### Packing the current bundle into several compressed file formats ###

Makefile.src.in

➞

Show inline comments

@@ @@ -270,10 +270,6 @@ endif @@
 ifdef STRIP
 	$(Q)$(STRIP) $@
 endif
 ifeq ($(OS), DOS)
 	$(E) '$(STAGE) Adding CWSDPMI stub to $@'
 	$(Q)$(ROOT_DIR)/os/dos/make_dos_binary_selfcontained.sh $(SRC_OBJS_DIR)/$@
 endif
 # Revision files

README.md

➞

Show inline comments

@@ @@ -152,7 +152,6 @@ OpenTTD has been ported to several platf @@
 not be very difficult to port it to a new platform. The currently working
 platforms are:
 - DOS (Allegro)
 - FreeBSD (SDL)
 - Haiku (SDL)
 - Linux (SDL or Allegro)
@@ @@ -555,17 +554,6 @@ Use '`make`', but do a '`./configure`' b @@
 A comprehensive GNU build environment is required to build the OS/2 version.
 See the docs/Readme_OS2.txt file for more information.
 ### DOS:
 A build environment with DJGPP is needed as well as libraries such as
 Allegro, zlib and libpng, which all can be downloaded from the DJGPP
 website. Compilation is straight forward: use '`make`', but do a '`./configure`'
 before the first build. The build binary will need cwsdpmi.exe to be in
 the same directory as the openttd executable. cwsdpmi.exe can be found in
 the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
 binary will be generated that does not need cwsdpmi.exe by adding the
 cswdstub.exe to the created OpenTTD binary.
 ### 7.1) Required/optional libraries
 The following libraries are used by OpenTTD for:
@@ @@ -752,16 +740,6 @@ License 2.1, and partly under the (3-cla @@
 terms can be found in src/3rdparty/os2/getaddrinfo.c resp.
 src/3rdparty/os2/getnameinfo.c.
 The exe2coff implementation in os/dos/exe2coff is available under the
 GPL, with a number of additional terms. See os/dos/exe2coff/copying and
 os/dos/exe2coff/copying.dj for the exact licensing terms.
 The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
 custom binary-only license that prohibits modification. The exact
 licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
 for these files can be downloaded at its author site, at
 http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip.
 CONTRIBUTING.md is adapted from
 [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md)
 under the [Creative Commons Attribution 3.0 Unported

config.lib

➞

Show inline comments

@@ @@ -553,10 +553,10 @@ check_params() { @@
 	# Check if all params have valid values
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
 	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HAIKU, SUNOS, CYGWIN, MINGW, and OS2
 	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
 		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ @@ -623,7 +623,7 @@ check_params() { @@
 	detect_sse_capable_architecture
 	if [ "$enable_static" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "DOS" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 			enable_static="2"
 		else
 			enable_static="0"
@@ @@ -633,8 +633,8 @@ check_params() { @@
 	if [ "$enable_static" != "0" ]; then
 		log 1 "checking static... yes"
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ]; then
 			log 1 "WARNING: static is only known to work on Windows, DOS, and MacOSX"
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ]; then
 			log 1 "WARNING: static is only known to work on Windows, and MacOSX"
 			log 1 "WARNING: use static at your own risk on this platform"
 			sleep 5
@@ @@ -644,7 +644,7 @@ check_params() { @@
 	fi
 	if [ "$enable_unicode" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "DOS" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 			enable_unicode="2"
 		else
 			enable_unicode="0"
@@ @@ -784,10 +784,7 @@ check_params() { @@
 		log 1 "checking console application... enabled"
 	fi
 	if [ "$enable_network" = "1" ] && [ "$os" = "DOS" ]; then
 		log 1 "checking network... DOS, skipping"
 		enable_network=0
 	elif [ "$enable_network" != "0" ]; then
     if [ "$enable_network" != "0" ]; then
 		log 1 "checking network... found"
 	else
 		log 1 "checking network... disabled"
@@ @@ -1023,10 +1020,6 @@ check_params() { @@
 		grfcodec=""
 	fi
 	if [ "$os" = "DOS" ]; then
 		with_threads="0"
 	fi
 	if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then
 		if [ "$with_application_bundle" = "1" ]; then
 			with_application_bundle="0"
@@ @@ -1129,7 +1122,7 @@ check_params() { @@
 	fi
 	if [ "$personal_dir" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "DOS" ] || [ "$os" = "HAIKU" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "HAIKU" ]; then
 			personal_dir="OpenTTD"
 		elif [ "$os" = "OSX" ]; then
 			personal_dir="Documents/OpenTTD"
@@ @@ -1603,11 +1596,11 @@ make_cflags_and_ldflags() { @@
 		fi
 	fi
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "OS2" ]; then
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "OSX" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 	fi
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ]; then
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ]; then
 		LIBS="$LIBS -lc"
 	fi
@@ @@ -2328,7 +2321,7 @@ detect_awk() { @@
 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, SUNOS, CYGWIN, MINGW, OS2, and DOS
+		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, SUNOS, CYGWIN, MINGW, and OS2
 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
@@ @@ -2345,7 +2338,6 @@ detect_os() { @@
 					/cygwin/       { print "CYGWIN";    exit}
 					/mingw/        { print "MINGW";     exit}
 					/os2/          { print "OS2";       exit}
 					/dos/          { print "DOS";       exit}
 		'`
 		if [ -z "$os" ]; then
@@ @@ -2369,7 +2361,7 @@ detect_os() { @@
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, HAIKU, SUNOS, CYGWIN, MINGW, and OS2"
 			exit 1
 		fi
@@ @@ -3453,7 +3445,7 @@ showhelp() { @@
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
 	echo "                                 DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
 	echo "                                 NETBSD/HPUX/SUNOS/CYGWIN/"
-	echo "                                 MINGW/OS2/DOS/HAIKU"
 	echo "                                 MINGW/OS2/HAIKU"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"

configure

➞

Show inline comments

@@ @@ -75,7 +75,7 @@ save_params @@
 make_cflags_and_ldflags
 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ]; then
 if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ]; then
 	EXE=".exe"
 fi
@@ @@ -116,7 +116,6 @@ AWKCOMMAND=' @@
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 		if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 		if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 		if ($0 == "HAIKU"       && "'$os'" != "HAIKU")             { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }

os/dos/cwsdpmi/README.licensing

➞

Show inline comments

deleted file

os/dos/cwsdpmi/cwsdpmi.exe

➞

Show inline comments

		deleted file
		binary diff not shown

os/dos/cwsdpmi/cwsdpmi.txt

➞

Show inline comments

deleted file

os/dos/cwsdpmi/cwsdstub.exe

➞

Show inline comments

		deleted file
		binary diff not shown

os/dos/exe2coff/README.licensing

➞

Show inline comments

deleted file

os/dos/exe2coff/copying

➞

Show inline comments

deleted file

os/dos/exe2coff/copying.dj

➞

Show inline comments

deleted file

os/dos/exe2coff/copying.lib

➞

Show inline comments

deleted file

os/dos/exe2coff/exe2coff.c

➞

Show inline comments

deleted file

os/dos/make_dos_binary_selfcontained.sh

➞

Show inline comments

deleted file

source.list

➞

Show inline comments

@@ @@ -1114,10 +1114,7 @@ music/midifile.cpp @@
 	#if WIN32
 		music/win32_m.cpp
 	#else
 		#if DOS
 		#else
 			music/extmidi.cpp
 		#end
 		music/extmidi.cpp
 	#end
 	#if HAIKU
 		music/bemidi.cpp

src/core/endian_type.hpp

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ @@
 #define TTD_BIG_ENDIAN 1
 /* Windows has always LITTLE_ENDIAN */
-#if defined(_WIN32) || defined(__OS2__) || defined(__HAIKU__) || defined(__DJGPP__)
 #if defined(_WIN32) || defined(__OS2__) || defined(__HAIKU__)
 #	define TTD_ENDIAN TTD_LITTLE_ENDIAN
 #elif defined(OSX)
 #	include <sys/types.h>

src/cpu.cpp

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ unsigned __int64 ottd_rdtsc(); @@
 #endif
 /* rdtsc for all other *nix-en (hopefully). Use GCC syntax */
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__DJGPP__) && !defined(RDTSC_AVAILABLE)
 #if (defined(__i386__) || defined(__x86_64__)) && !defined(RDTSC_AVAILABLE)
 uint64 ottd_rdtsc()
+{
 	uint32 high, low;

src/fileio.cpp

➞

Show inline comments

@@ @@ -1000,10 +1000,6 @@ static bool ChangeWorkingDirectoryToExec @@
 	char *s = strrchr(tmp, PATHSEPCHAR);
 	if (s != NULL) {
 		*s = '\0';
 #if defined(__DJGPP__)
 		/* If we want to go to the root, we can't use cd C:, but we must use '/' */
 		if (s > tmp && *(s - 1) == ':') chdir("/");
 #endif
 		if (chdir(tmp) != 0) {
 			DEBUG(misc, 0, "Directory with the binary does not exist?");
 		} else {
@@ @@ -1056,7 +1052,7 @@ void DetermineBasePaths(const char *exe) @@
 	AppendPathSeparator(tmp, lastof(tmp));
 	_searchpaths[SP_PERSONAL_DIR_XDG] = stredup(tmp);
 #endif
-#if defined(DOS) || defined(OS2) || !defined(WITH_PERSONAL_DIR)
 #if defined(OS2) || !defined(WITH_PERSONAL_DIR)
 	_searchpaths[SP_PERSONAL_DIR] = NULL;
 #else
 #ifdef __HAIKU__

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -299,8 +299,6 @@ void AskExitGame() @@
 		SetDParam(0, STR_OSNAME_OS2);
 #elif defined(SUNOS)
 		SetDParam(0, STR_OSNAME_SUNOS);
 #elif defined(DOS)
 		SetDParam(0, STR_OSNAME_DOS);
 #else
 		SetDParam(0, STR_OSNAME_UNIX);
 #endif

src/lang/afrikaans.txt

➞

Show inline comments

@@ @@ -1767,7 +1767,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/arabic_egypt.txt

➞

Show inline comments

@@ @@ -1439,7 +1439,6 @@ STR_QUIT_NO :{BLACK}لا @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :ويندوز
 STR_OSNAME_DOS                                                  :دوس
 STR_OSNAME_UNIX                                                 :يونكس
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :هايكو

src/lang/basque.txt

➞

Show inline comments

@@ @@ -1679,7 +1679,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/belarusian.txt

➞

Show inline comments

@@ @@ -2092,7 +2092,6 @@ STR_QUIT_NO :{BLACK}Не @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/brazilian_portuguese.txt

➞

Show inline comments

@@ @@ -1783,7 +1783,6 @@ STR_QUIT_NO :{BLACK}Não @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/bulgarian.txt

➞

Show inline comments

@@ @@ -1715,7 +1715,6 @@ STR_QUIT_NO :{BLACK}Не @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :ДОС
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/catalan.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/croatian.txt

➞

Show inline comments

@@ @@ -1895,7 +1895,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/czech.txt

➞

Show inline comments

@@ @@ -1861,7 +1861,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unixu
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/danish.txt

➞

Show inline comments

@@ @@ -1799,7 +1799,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/dutch.txt

➞

Show inline comments

@@ @@ -1799,7 +1799,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/english.txt

➞

Show inline comments

@@ @@ -1799,7 +1799,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/english_AU.txt

➞

Show inline comments

@@ @@ -1743,7 +1743,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/english_US.txt

➞

Show inline comments

@@ @@ -1797,7 +1797,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/esperanto.txt

➞

Show inline comments

@@ @@ -1426,7 +1426,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Vindozo
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unikso
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/estonian.txt

➞

Show inline comments

@@ @@ -1827,7 +1827,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/faroese.txt

➞

Show inline comments

@@ @@ -1590,7 +1590,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/finnish.txt

➞

Show inline comments

@@ @@ -1799,7 +1799,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/french.txt

➞

Show inline comments

@@ @@ -1794,7 +1794,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/gaelic.txt

➞

Show inline comments

@@ @@ -1977,7 +1977,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/galician.txt

➞

Show inline comments

@@ @@ -1770,7 +1770,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/german.txt

➞

Show inline comments

@@ @@ -1788,7 +1788,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/greek.txt

➞

Show inline comments

@@ @@ -1890,7 +1890,6 @@ STR_QUIT_NO :{BLACK}Όχι @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/hebrew.txt

➞

Show inline comments

@@ @@ -1792,7 +1792,6 @@ STR_QUIT_NO :{BLACK}לא @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :חלונות
 STR_OSNAME_DOS                                                  :דוס
 STR_OSNAME_UNIX                                                 :יוניקס
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :הייקו

src/lang/hungarian.txt

➞

Show inline comments

@@ @@ -1863,7 +1863,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/icelandic.txt

➞

Show inline comments

@@ @@ -1631,7 +1631,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/indonesian.txt

➞

Show inline comments

@@ @@ -1776,7 +1776,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/irish.txt

➞

Show inline comments

@@ @@ -1766,7 +1766,6 @@ STR_QUIT_NO :{BLACK}Níl @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/italian.txt

➞

Show inline comments

@@ @@ -1817,7 +1817,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/japanese.txt

➞

Show inline comments

@@ @@ -1766,7 +1766,6 @@ STR_QUIT_NO :{BLACK}いいえ @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/korean.txt

➞

Show inline comments

@@ @@ -1800,7 +1800,6 @@ STR_QUIT_NO :{BLACK}아니요 @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :{G=f}Windows
 STR_OSNAME_DOS                                                  :{G=f}DOS
 STR_OSNAME_UNIX                                                 :{G=f}Unix
 STR_OSNAME_OSX                                                  :{G=f}OS{NBSP}X
 STR_OSNAME_HAIKU                                                :{G=f}Haiku

src/lang/latin.txt

➞

Show inline comments

@@ @@ -1967,7 +1967,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/latvian.txt

➞

Show inline comments

@@ @@ -1713,7 +1713,6 @@ STR_QUIT_NO :{BLACK}Nē @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/lithuanian.txt

➞

Show inline comments

@@ @@ -1985,7 +1985,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/luxembourgish.txt

➞

Show inline comments

@@ @@ -1769,7 +1769,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/malay.txt

➞

Show inline comments

@@ @@ -1527,7 +1527,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Tetingkap
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/norwegian_bokmal.txt

➞

Show inline comments

@@ @@ -1802,7 +1802,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/norwegian_nynorsk.txt

➞

Show inline comments

@@ @@ -1689,7 +1689,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/polish.txt

➞

Show inline comments

@@ @@ -2167,7 +2167,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/portuguese.txt

➞

Show inline comments

@@ @@ -1794,7 +1794,6 @@ STR_QUIT_NO :{BLACK}Não @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/romanian.txt

➞

Show inline comments

@@ @@ -1747,7 +1747,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/russian.txt

➞

Show inline comments

@@ @@ -1951,7 +1951,6 @@ STR_QUIT_NO :{BLACK}Нет @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/serbian.txt

➞

Show inline comments

@@ @@ -1973,7 +1973,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/simplified_chinese.txt

➞

Show inline comments

@@ @@ -1776,7 +1776,6 @@ STR_QUIT_NO :{BLACK}否 @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/slovak.txt

➞

Show inline comments

@@ @@ -1834,7 +1834,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/slovenian.txt

➞

Show inline comments

@@ @@ -1920,7 +1920,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/spanish.txt

➞

Show inline comments

@@ @@ -1779,7 +1779,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/spanish_MX.txt

➞

Show inline comments

@@ @@ -1794,7 +1794,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/swedish.txt

➞

Show inline comments

@@ @@ -1787,7 +1787,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/tamil.txt

➞

Show inline comments

@@ @@ -1536,7 +1536,6 @@ STR_QUIT_NO :{BLACK}இல்லை @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/thai.txt

➞

Show inline comments

@@ @@ -1717,7 +1717,6 @@ STR_QUIT_NO :{BLACK}ไม่ @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :ระบบปฏิบัติการ Haiku

src/lang/traditional_chinese.txt

➞

Show inline comments

@@ @@ -1766,7 +1766,6 @@ STR_QUIT_NO :{BLACK}否 @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/turkish.txt

➞

Show inline comments

@@ @@ -1792,7 +1792,6 @@ STR_QUIT_NO :{BLACK}Hayır @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/ukrainian.txt

➞

Show inline comments

@@ @@ -1927,7 +1927,6 @@ STR_QUIT_NO :{BLACK}Ні @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/unfinished/chuvash.txt

➞

Show inline comments

@@ @@ -662,7 +662,6 @@ STR_QUIT_NO :{BLACK}Ҫук @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/unfinished/frisian.txt

➞

Show inline comments

@@ @@ -1700,7 +1700,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/unfinished/persian.txt

➞

Show inline comments

@@ @@ -1483,7 +1483,6 @@ STR_QUIT_NO :{BLACK}خیر @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :هایکو

src/lang/unfinished/urdu.txt

➞

Show inline comments

@@ @@ -1380,7 +1380,6 @@ STR_QUIT_NO :{BLACK}نہیں @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :ونڈوز
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :یونیکس
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/vietnamese.txt

➞

Show inline comments

@@ @@ -1782,7 +1782,6 @@ STR_QUIT_NO :{BLACK}Không đồng ý @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/lang/welsh.txt

➞

Show inline comments

@@ @@ -1769,7 +1769,6 @@ STR_QUIT_NO @@
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_HAIKU                                                :Haiku

src/stdafx.h

➞

Show inline comments

@@ @@ -242,15 +242,6 @@ @@
 #endif /* defined(_MSC_VER) */
 #if defined(DOS)
 	/* The DOS port does not have all signals/signal functions. */
 	#define strsignal(sig) ""
 	/* Use 'no floating point' for bus errors; SIGBUS does not exist
 	 * for DOS, SIGNOFP for other platforms. So it's fairly safe
 	 * to interchange those. */
 	#define SIGBUS SIGNOFP
 #endif
 /* NOTE: the string returned by these functions is only valid until the next
  * call to the same function and is not thread- or reentrancy-safe */
 #if !defined(STRGEN) && !defined(SETTINGSGEN)
@@ @@ -436,10 +427,7 @@ void NORETURN CDECL error(const char *st @@
 	#define OTTD_ASSERT
 #endif
 #if defined(__DJGPP__)
 	/* DJGPP doesn't have C++ conformant _stricmp... */
 	#define _stricmp stricmp
 #elif defined(OPENBSD)
 #if defined(OPENBSD)
 	/* OpenBSD uses strcasecmp(3) */
 	#define _stricmp strcasecmp
 #endif

src/video/allegro_v.cpp

➞

Show inline comments

@@ @@ -440,12 +440,6 @@ const char *VideoDriver_Allegro::Start(c @@
 	signal(SIGSEGV, NULL);
 #endif
 #if defined(DOS)
 	/* Force DOS builds to ALWAYS use full screen as
 	 * it can't do windowed. */
 	_fullscreen = true;
 #endif
 	GetVideoModes();
 	if (!CreateMainSurface(_cur_resolution.width, _cur_resolution.height)) {
 		return "Failed to set up Allegro video";
@@ @@ -461,7 +455,7 @@ void VideoDriver_Allegro::Stop() @@
 	if (--_allegro_instance_count == 0) allegro_exit();
+}
-#if defined(UNIX) || defined(__OS2__) || defined(DOS)
 #if defined(UNIX) || defined(__OS2__)
 # include <sys/time.h> /* gettimeofday */
 static uint32 GetTime()
@@ @@ -548,9 +542,6 @@ bool VideoDriver_Allegro::ChangeResoluti @@
 bool VideoDriver_Allegro::ToggleFullscreen(bool fullscreen)
+{
 #ifdef DOS
 	return false;
 #else
 	_fullscreen = fullscreen;
 	GetVideoModes(); // get the list of available video modes
 	if (_num_resolutions == 0 || !this->ChangeResolution(_cur_resolution.width, _cur_resolution.height)) {
@@ @@ -559,7 +550,6 @@ bool VideoDriver_Allegro::ToggleFullscre @@
 		return false;
+	}
 	return true;
 #endif
+}
 bool VideoDriver_Allegro::AfterBlitterChange()

0 comments (0 inline, 0 general)