--- a/bridge_map.h Thu Dec 28 17:30:06 2006 +0000
+++ b/bridge_map.h Fri Dec 29 10:13:35 2006 +0000
@@ -78,6 +78,19 @@
}
+static inline bool HasBridgeSnowOrDesert(TileIndex t)
+{
+ assert(IsBridgeTile(t));
+ return HASBIT(_m[t].m4, 7);
+}
+
+
+static inline void SetBridgeSnowOrDesert(TileIndex t, bool snow_or_desert)
+{
+ assert(IsBridgeTile(t));
+ SB(_m[t].m4, 7, 1, snow_or_desert);
+}
+
/**
* Finds the end of a bridge in the specified direction starting at a middle tile
*/
--- a/debug.c Thu Dec 28 17:30:06 2006 +0000
+++ b/debug.c Fri Dec 29 10:13:35 2006 +0000
@@ -25,20 +25,6 @@
int _debug_sl_level;
-void CDECL debug(const char *dbg, ...)
-{
- va_list va;
- const char *s;
- char buf[1024];
-
- va_start(va, dbg);
- s = va_arg(va, const char*);
- vsnprintf(buf, lengthof(buf), s, va);
- va_end(va);
- fprintf(stderr, "dbg: [%s] %s\n", dbg, buf);
- IConsoleDebug(dbg, buf);
-}
-
typedef struct DebugLevel {
const char *name;
int *level;
@@ -63,6 +49,39 @@
};
#undef DEBUG_LEVEL
+#if !defined(NO_DEBUG_MESSAGES)
+
+/** Functionized DEBUG macro for compilers that don't support
+ * variadic macros (__VA_ARGS__) such as...yes MSVC2003 and lower */
+#if defined(NO_VARARG_MACRO)
+void CDECL DEBUG(int name, int level, ...)
+{
+ va_list va;
+ const char *dbg;
+ const DebugLevel *dl = &debug_level[name];
+
+ if (level != 0 && *dl->level < level) return;
+ dbg = dl->name;
+ va_start(va, level);
+#else
+void CDECL debug(const char *dbg, ...)
+{
+ va_list va;
+ va_start(va, dbg);
+#endif /* NO_VARARG_MACRO */
+ {
+ const char *s;
+ char buf[1024];
+
+ s = va_arg(va, const char*);
+ vsnprintf(buf, lengthof(buf), s, va);
+ va_end(va);
+ fprintf(stderr, "dbg: [%s] %s\n", dbg, buf);
+ IConsoleDebug(dbg, buf);
+ }
+}
+#endif /* NO_DEBUG_MESSAGES */
+
void SetDebugString(const char *s)
{
int v;
--- a/debug.h Thu Dec 28 17:30:06 2006 +0000
+++ b/debug.h Fri Dec 29 10:13:35 2006 +0000
@@ -17,10 +17,43 @@
* 6.. - extremely detailed spamming
*/
+/* Of course MSVC 2003 and lower has no support for variadic macros
+ * so we need to work around this... *sigh* */
+#if defined(_MSC_VER) && (_MSC_VER < 1400)
+ #define NO_VARARG_MACRO
+#endif
+
+#if defined(NO_VARARG_MACRO)
+ enum DebugLevelType {
+ ai,
+ driver,
+ grf,
+ map,
+ misc,
+ ms,
+ net,
+ sprite,
+ oldloader,
+ ntp,
+ npf,
+ yapf,
+ freetype,
+ sl,
+ };
+#endif /* NO_VARARG_MACRO */
+
#ifdef NO_DEBUG_MESSAGES
- #define DEBUG(name, level, ...)
-#else
- #if defined(__GNUC__) && (__GNUC__ < 3)
+ #if defined(NO_VARARG_MACRO)
+ static inline void DEBUG(int name, int level, ...) {}
+ #elif defined(__GNUC__) && (__GNUC__ < 3)
+ #define DEBUG(name, level, args...)
+ #else
+ #define DEBUG(name, level, ...)
+ #endif
+#else /* NO_DEBUG_MESSAGES */
+ #if defined(NO_VARARG_MACRO)
+ void CDECL DEBUG(int name, int level, ...);
+ #elif defined(__GNUC__) && (__GNUC__ < 3)
#define DEBUG(name, level, args...) if ((level == 0) || ( _debug_ ## name ## _level >= level)) debug(#name, args)
#else
#define DEBUG(name, level, ...) if (level == 0 || _debug_ ## name ## _level >= level) debug(#name, __VA_ARGS__)
@@ -40,18 +73,20 @@
extern int _debug_yapf_level;
extern int _debug_freetype_level;
extern int _debug_sl_level;
-#endif
-void CDECL debug(const char *dbg, ...);
+ #if !defined(NO_VARARG_MACRO)
+ void CDECL debug(const char *dbg, ...);
+ #endif /* NO_VARARG_MACRO */
+#endif /* NO_DEBUG_MESSAGES */
void SetDebugString(const char *s);
const char *GetDebugString(void);
/* MSVCRT of course has to have a different syntax for long long *sigh* */
#if defined(_MSC_VER) || defined(__MINGW32__)
-# define OTTD_PRINTF64 "I64"
+ #define OTTD_PRINTF64 "I64"
#else
-# define OTTD_PRINTF64 "ll"
+ #define OTTD_PRINTF64 "ll"
#endif
// Used for profiling
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/HOWTO_compile_lang_files.txt Fri Dec 29 10:13:35 2006 +0000
@@ -0,0 +1,59 @@
+STRGEN USAGE
+------------
+This guide is only interesting for people who want to alter something
+themselves without access to WT2 (translator2.openttd.org). Please note that
+your compiled language file will only be compatible with the OpenTTD version
+you have downloaded english.txt, the master language file, for. While this is
+not always true, namely when changes in the code have not touched language
+files, your safest bet is to assume this 'limitation'.
+As a first step you need to compile strgen. This is as easy as typing
+'make strgen'. You can also download a precompiled binary from a release,
+nightly, etc.
+strgen takes as argument a txt file and translates it to a lng file, allowing
+it to be used inside OpenTTD. strgen needs the master language file
+english.txt to work. Below are some examples of strgen usage.
+
+EXAMPLES
+--------
+Example 1:
+if you are in the root of your working copy (svn code), you should type
+strgen/strgen -s lang lang/english.txt
+to compile englist.txt into english.lng. It will be placed in the lang dir
+
+Example 2:
+you only have the strgen executable (no working copy) and you want to compile
+a txt file in the same directory. You should type
+./strgen english.txt
+and you will get and english.lng in the same dir
+
+Example 3:
+you have strgen somewhere, english.txt in /usr/openttd/lang and you want the
+resulting language file to go to /tmp. Use
+./strgen -s /usr/openttd/lang -d /tmp english.txt
+
+You can interchange english.txt to whichever language you want to generate a
+.lng file for.
+
+STRGEN COMMAND SWITCHES
+-----------------------
+-v | --version
+strgen will tell what svn revision it was last modified
+
+-t | --todo
+strgen will add <TODO> to any untranslated/missing strings and use the english
+strings while compiling the language file
+
+-w | --warning
+strgen will print any missing strings or wrongly translated (bad format)
+to standard error output(stderr)
+
+-h | --help | -?
+Print out a summarized help message explaining these switches
+
+-s | --source_dir
+strgen will search for the master file english.txt in the directory specified
+by this switch instead of the current directory
+
+-d | --dest_dir
+strgen will put <language>.lng in the directory specified by this switch; if
+no dest_dir is given, output is the same as source_dir
--- a/docs/Howto_compile_lng_files_from_CLI.txt Thu Dec 28 17:30:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-This is a guide to compile strgen on gcc
-
-All this is done in the makefile, so it's only interesting for people, who wants to alter something themselves (translators)
-
-HOWTO compile lng files:
-
-First you get strgen compiled (look below/download nightly build/run makefile)
-
-strgen takes the argument of a txt file and translates it to a lng file and places that lng file in the same dir as the txt file.
-
-Example 1:
-if you are in the root of your working copy (svn code), you should type
-strgen/strgen lang/english.txt
-to compile englist.lng. It will be placed in the lang dir
-
-Example 2:
-you have strgen but not the source and you want to compile a txt file in the same dir. YOu should type
-./strgen english.txt
-and you will get english.lng in the same dir
-
-You can change english to whatever language you want
-
-Commands used by strgen
-
--v --version
-strgen will tell what svn revision it is based on
-
--t
-strgen will add <TODO> to the missing strings and use the english strings while compiling
-this will need english.txt to be present
-
--w
-strgen will print any missing strings to standard error output(stderr)
-this will need english.txt to be present
-
-here are a very useful tool for translators:
-http://openttd.rulez.org/
-
-
-HOWTO compile strgen:
-(this should be useless as you can just type make)
-Goto the main dir
-Compile by typing
-gcc strgen/strgen.c -o strgen/strgen -DUNIX
-or if you want it to tell the revision too
-gcc strgen/strgen.c rev.o -o strgen/strgen -DUNIX -DWITH_REV (this is the one the makefile uses)
-
-you now have a program called strgen in the strgen directory
--- a/docs/Manual.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/docs/Manual.txt Fri Dec 29 10:13:35 2006 +0000
@@ -18,7 +18,6 @@
BeOS:
On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.
-
1.2 Installing OpenTTD.
On Windows, insert your "Transport Tycoon Deluxe for Windows 95" disk. You can use a DOS version, but your graphics will be purple. NB: Even if your version of Transport Tycoon Deluxe ran on Windows 95, it may still be the DOS version. Then run the OpenTTD installer.
@@ -58,7 +57,6 @@
2.3 Checkpoint Stations
-
Checkpoint stations (the small blue item in the rail construction window) are small 1x1 stations. They must be built on top of pre-existing track. They do not accept or produce carge of any kind. They exist solely for use as route points. They become useful when dealing with large networks where trains may attempt to route themselves along undesirable or impossible routes. As an alternative to checkpoint stations, you can also direct trains to visit depots along the way. This has the advantage of also servicing the train and hence the train will rarely to never need to depart from its route to be serviced.
2.4 Freeform Rail Laying.
--- a/docs/Readme_Mandrake_Linux.txt Thu Dec 28 17:30:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-Compiling and developing OpenTTD on MandrakeLinux 10.0 Official
-
-A quick guide to get started with OpenTTD development on Linux.
----------------------------------------------------------------
-
-1.) RPMs:
-
-Most packages that are required for development (like gcc) should already be installed on your box. You will require those RPMs additionally:
-- libsdl1.2-devel-1.2.7-2mdk
-- subversion-1.0.1-1mdk (+ dependencies)
-- libsvn_ra_svn1_0-1.0.1-1mdk
-
-
-2.) Subversion:
-
-To obtain the source code from the subversion server type
- $ svn co svn://svn.openttd.com/openttd/trunk openttd
-from command line to dump the code into the directory 'openttd'.
-
-To update your working copy to the latest revision use
- $ svn update
-Don't worry, your version will be merged with the latest version.
-
-The command
- $ svn diff > mypatch.diff
-creates a patch file (aka diff file) which you can submit to the developers to share your improvements.
-
-You can undo changes to a file with
- $svn revert filename
-
-
-3.) Required data files:
-
-Copy the following files from Transport Tycoon Deluxe to openttd/data/
- sample.cat
- trg1r.grf
- trgcr.grf
- trghr.grf
- trgir.grf
- trgtr.grf
-
-(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
-
-
-4.) Compiling and running:
-
-Compile OpenTTD with
- $ make
-and run it with
- $ ./ttd
-
-
-5.) Playing the soundtrack:
-
-If you want the original TTD music you need to copy the whole /gm/ directory from Windows. Additionally the TiMidity driver is required:
- TiMidity++-2.12.0-0.pre1.4mdk (+ dependencies)
-To run OpenTTD with music support type
- $ ./ttd -m extmidi
-
-
-X.) Last Update: $Date: 2004-06-01 19:08:09 +0200 (Tue, 01 Jun 2004) $
- Written for revision $Rev: 710 $
--- a/docs/Readme_Windows_MSVC.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/docs/Readme_Windows_MSVC.txt Fri Dec 29 10:13:35 2006 +0000
@@ -1,104 +1,108 @@
-Compiling OpenTTD using Microsoft Visual C++ 6.0
+Compiling OpenTTD using Microsoft Visual C++
+December 28, 2006
+--------------------------------------------
+PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
+SUPPORTED MSVC COMPILERS
+------------------------
+OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will
+compile out of the box, providing you have the required libraries/headers;
+which ones, see below. There is no support for VS6, you are therefore
+strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
+MSVC 2002 probably works as well, but it has not been tested.
-Step 1: Ingredients
-
+1) REQUIRED FILES
+-----------------
+You might already have some of the files already installed, so check before
+downloading; mostly because the DirectX SDK and Platform SDK are about
+500MB each.
Download the following files:
- * Openttd-useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633)
- * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
- * The February 2003 Microsoft Platform SDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm) (newer SDK's do not work with MSVC6)
- * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) (maybe you not need this)
+ * openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
+ * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
+ * MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
+ * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
...and of course the newest source from svn://svn.openttd.org/trunk
-You have to have a SVN-client to download the source:
-
- * Command line version (Subversion 1.2.3 Win32 binaries) (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
- * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
-
-Step 2: Includes and Libraries
-
-Put the newly downloaded files in the VC lib and include directories (Where "C:\Program Files\Microsoft Visual Studio\VC98" is your local location of VC)
-
-
- * zconf.h [useful.zip]
- * zlib.h [useful.zip]
- * png.h [useful.zip]
- * pngconf.h [useful.zip]
- * afxres.h
-
-in
-
- C:\Program Files\Microsoft Visual Studio\VC98\Include
+You need an SVN-client to download the source from subversion:
-and
-
- * zlibstat.lib [useful.zip]
- * libpng.lib [useful.zip]
-
-in
-
- C:\Program Files\Microsoft Visual Studio\VC98\Lib
-
+ * CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+ * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
-Step 3: DirectX SDK
-
-(This should work with the latest DirectX SDK as well.)
-
-There are 2 folder in the compressed file: Include and Lib
+2) INCLUDES AND LIBRARIES
+-------------------------
+Put the newly downloaded files in the VC lib\ and include\ directories; where
+"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
+If you are compiling for an x64 system, use the include\ and lib\ directories
+from the win64/ folder.
-Copy all files from Include folder to
+ * openttd-useful.zip\include\*
+ * afxresh.h
+ to > C:\Program Files\Microsoft Visual Studio 8\VC\Include
-C:\Program Files\Microsoft Visual Studio\VC98\Include
+ * openttd-useful.zip\lib\*
+ to > C:\Program Files\Microsoft Visual Studio 8\VC\Lib
-and all files from Lib folder to
-
-C:\Program Files\Microsoft Visual Studio\VC98\Lib
+Custom directories might be recommended, check 2.2)
-
-You can also make custom directories, which is recommended so you don't overwrite VS6 files, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via:
-
-Tools -> Options -> Directories -> show directories for:
+2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
+--------------------------------------------------
+Basically the same procedure as with the useful zip file, providing
+you are not using the Microsoft installer. Put the include files in the
+include\ directory and the library files to the Lib\ directory.
-a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\include )
-
-b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\lib )
+It is recommended to use custom directories so you don't overwrite any
+default header or library files.
-NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!!
+2.2) CUSTOM DIRECTORIES
+-----------------------
+If you have put the above include and/or library files into custom folders,
+MSVC will not find them by default. You need to add these paths to VC through:
-Step 4: TTD Graphics files
+Tools > Options > Projects and Solutions > VC++ Directories > show directories for
+ * Include files: Add the DirectX/Platform SDK include dir you've created
+ * Library files: Add the path to the SDK custom lib dir
+
+NOTE: make sure that the directory for the DirectX SDK is the first one in the
+list, above all others, otherwise compilation will most likely fail!!
+
+3) TTD GRAPHICS FILES
+---------------------
Copy the following files from Transport Tycoon Deluxe to the data folder
- * sample.cat
- * trg1r.grf
- * trgcr.grf
- * trghr.grf
- * trgir.grf
- * trgtr.grf
+ * sample.cat
+ * trg1r.grf
+ * trgcr.grf
+ * trghr.grf
+ * trgir.grf
+ * trgtr.grf
-Step 5: Compiling
-
-Open trunk/openttd.dsw
-
-Build menu > Set active configuration > Select: "openttd - Win32 Release"
-
+4) COMPILING
+------------
+Open trunk/openttd[_vs80].sln
+Set the build mode to 'Release' in
+Build > Configuration manager > Active solution configuration > select "Release"
Compile...
-
-Now it should work, it worked for me :)
-
-From r1319 you can compile branch/map in Debug mode (by Bociusz)
-
-For compiling branch/cargo-packets you have to add cargo.c and .h to this tree's openttd.dsp
+If everything works well the binary should be in trunk/Release/openttd.exe
-If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/openttd)
+5) EDITING, CHANGING SOURCE CODE
+--------------------------------
+Set the build mode (back to) 'Debug'
+Change the startup project to openttd by right-clicking the 'openttd' project
+in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
+project should now show up bold instead of 'strgen'.
-Go ahead and make that patch! Happy Hacking! :)
+6) PROBLEMS?
+------------
+If compilation fails, double-check that you are using the latest SVN (!)
+source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
+to ask about reasons; or just wait. The problem will most likely solve itself
+within a few days as the problem is noticed and fixed.
-Originally written by Dribbel
-
-Project file updating by Bociusz
+An up-to-date version of this README can be found on the wiki:
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
\ No newline at end of file
--- a/docs/console.txt Thu Dec 28 17:30:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-OPENTTD INGAME CONSOLE DOCUMENTATION
-====================================
-http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
-for detailed information
-
-*** WARNING **
- This document is out of date
-*** WARNING **
-
-HOTKEY: BACKQUOTE (aka tilde, the key left to "1")
-
-COMMANDS:
----------
-
-echo [string]
-echoc [color-code] [string]
-exit
-debug_level [0-9]
-dump_vars [filter]
-help
-list_cmds [filter]
-list_vars [filter]
-printf [formatstring] [var] [var] [var]....
-printfc [color-code] [formatstring] [var] [var] [var]....
-quit
-random
-screenshot ["big"/"no_con"]
-
-VARIABLES:
-----------
-*con_developer
--> true = console debugging info
--> false = no output
-
-*developer
--> 0 = no output
--> 1 = console error output [like command not found]
--> 2 = console error and debug output
-
-*cursor_rate
--> 1-12 = defines the cursor blink interval
-
-
-VARIABLE HANDLING:
-------------------
-
-developer = 0
-developer ++
-
-temp_string = test
-temp_string = "my little"
-
-printf "%s world" temp_string
-
-
----------------------------------------------------
-feel free to add more commands and use this in-game
-console for your debugging / enhancements
--- a/docs/directmusic.txt Thu Dec 28 17:30:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Notes about DirectMusic driver for Win32
-----------------------------------------
-
-If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from
-http://alleg.sourceforge.net/files/dx70_mgw.zip.
-
-If compiling under MSVC 6.0, you require the equivalent for MSVC, available from
-http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that
-are recent enough.
-
-If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT
-in stdafx.h.
-
-Bugs, etc
----------
-
-- The volume control doesn't work properly. I'll fix this soon.
-
-Owen Rudge
-14th March 2004
--- a/docs/multiplayer.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/docs/multiplayer.txt Fri Dec 29 10:13:35 2006 +0000
@@ -9,7 +9,7 @@
- Type in a game name
- Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the last one
other people are able to see you online. Else they need your IP and port to join)
- - Click "start game" ,"load game" or "load scenario"
+ - Click "start game", "load game" or "load scenario"
- Start playing
@@ -46,7 +46,7 @@
- Open the console and type in the following command:
- ]connect <ip/host>:<port>#<player-no>
+ connect <ip/host>:<port>#<player-no>
4. Playing Internet-Games
@@ -54,7 +54,9 @@
- Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.
- - Server with a red dot behind it have a different version then you have. You will not be able to join those servers.
+ - Servers with a red dot behind it have a different version then you have. You will not be able to join those servers.
+
+ - Servers with a yellow dot behind it have NewGRFs that you do not have. You will not be able to join those servers.
- It can happen that a connection is that slow, or you have that many clients connected to your server, that your clients start to loose their connection. Some things you can do about it:
@@ -110,3 +112,10 @@
- From 0.3.5, desyncs should not happen anymore
- From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
+
+7. Troubleshooting
+------------------
+
+ - My advertised server does not show up in the 'advertised server list' (servers.openttd.org)
+ Run openttd with the '-d net=2' parameter, as this will show whether it receives replies from the master server.
+ If it does not receive replies it is most likely that you need to configure your router to forward the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.
--- a/lang/catalan.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/catalan.txt Fri Dec 29 10:13:35 2006 +0000
@@ -167,7 +167,7 @@
STR_00C7_QUIT :{WHITE}Sortir
STR_00C8_YES :{BLACK}Si
STR_00C9_NO :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur de voler abandonar aquest joc i tornar a {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Carrega el joc
STR_015E_QUIT_GAME :Abandona el joc
STR_015F_QUIT :Sortir
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur de voler abandonar aquest joc?
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur que vols abandonar aquest joc?
STR_0161_QUIT_GAME :{WHITE}Abandona el Joc
STR_SORT_ORDER_TIP :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
STR_SORT_CRITERIA_TIP :{BLACK}Selecciona criteri de classificació
@@ -624,7 +624,7 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Restablir Paisatge
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Utilitza un mapa d'alçades
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Utilitza un mapa d'alçades
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Estàs segur de voler restablir el paisatge?
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Estàs segur que vols restablir el paisatge?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generació de Paisatges
STR_022F_TOWN_GENERATION :{BLACK}Generació de Poblacions
STR_0230_INDUSTRY_GENERATION :{BLACK}Generació d'indústries
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Juga un Escenari
STR_PLAY_HEIGHTMAP :{BLACK}Juga un mapa d'alçades
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Comença un nou joc, utilitzant un mapa d'alçades com a terreny
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur de voler sortir d'aquest escenari ?
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
STR_029C_QUIT_EDITOR :{WHITE}Sortir de l'Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...només es pot construir en poblacions de més de 1200 hab.
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Retarda la data d'inici 1 any
@@ -1186,7 +1186,7 @@
STR_NO_TOWN_IN_SCENARIO :{WHITE}...no hi ha poblacions en aquest escenari
-STR_GENERATE_RANDOM_LANDSCAPE :{WHITE}Estàs segur de voler crear un paisatge aleatori?
+STR_GENERATE_RANDOM_LANDSCAPE :{WHITE}Estàs segur que vols crear un paisatge aleatori?
STR_MANY_RANDOM_TOWNS :{BLACK}Moltes poblacions aleatòries
STR_RANDOM_TOWNS_TIP :{BLACK}Omple el mapa amb poblacions situades aleatòriament
STR_MANY_RANDOM_INDUSTRIES :{BLACK}Moltes indústries aleatòries
--- a/lang/estonian.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/estonian.txt Fri Dec 29 10:13:35 2006 +0000
@@ -259,14 +259,14 @@
STR_00EA_OWNERS :Omanikud
STR_00EB_ROADS :{BLACK}{TINYFONT}Teed
STR_00EC_RAILROADS :{BLACK}{TINYFONT}Raudteed
-STR_00ED_STATIONS_AIRPORTS_DOCKS :{BLACK}{TINYFONT}Jaamad/Lennujaamad/Sadamad
-STR_00EE_BUILDINGS_INDUSTRIES :{BLACK}{TINYFONT}Ehitised/Tööstused
+STR_00ED_STATIONS_AIRPORTS_DOCKS :{BLACK}{TINYFONT}Jaamad/lennujaamad/sadamad
+STR_00EE_BUILDINGS_INDUSTRIES :{BLACK}{TINYFONT}Ehitised/tööstused
STR_00EF_VEHICLES :{BLACK}{TINYFONT}Sõidukid
-STR_00F0_100M :{BLACK}{TINYFONT}100m
-STR_00F1_200M :{BLACK}{TINYFONT}200m
-STR_00F2_300M :{BLACK}{TINYFONT}300m
-STR_00F3_400M :{BLACK}{TINYFONT}400m
-STR_00F4_500M :{BLACK}{TINYFONT}500m
+STR_00F0_100M :{BLACK}{TINYFONT}100 m
+STR_00F1_200M :{BLACK}{TINYFONT}200 m
+STR_00F2_300M :{BLACK}{TINYFONT}300 m
+STR_00F3_400M :{BLACK}{TINYFONT}400 m
+STR_00F4_500M :{BLACK}{TINYFONT}500 m
STR_00F5_TRAINS :{BLACK}{TINYFONT}Rongid
STR_00F6_ROAD_VEHICLES :{BLACK}{TINYFONT}Maanteesõidukid
STR_00F7_SHIPS :{BLACK}{TINYFONT}Laevad
@@ -2661,6 +2661,7 @@
STR_885C_BROKEN_DOWN :{RED}Läks katki
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK} Kulud: {LTBLUE}{CURRENCY}/aastas
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Mass: {LTBLUE}{WEIGHT_S} {BLACK}Energia: {LTBLUE}{POWER}{BLACK} Maks. Kiirus: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Mass: {LTBLUE}{WEIGHT_S} {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY} {BLACK}Suurim veojõud: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (eelmisel aastal: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Töötamisusaldus: {LTBLUE}{COMMA}% {BLACK}Katki minekuid eelmisest hooldusest: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Peatatud
@@ -3102,6 +3103,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ümberseadistatav: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Kõik kaubatüübid
STR_PURCHASE_INFO_ALL_BUT :Kõik, välja arvatud {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurim veojõud: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/italian.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/italian.txt Fri Dec 29 10:13:35 2006 +0000
@@ -2604,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Guasto!
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Età: {LTBLUE}{STRING}{BLACK} Consumi: {LTBLUE}{CURRENCY}/anno
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità Max: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Vel. Max: {LTBLUE}{VELOCITY} {BLACK}Sforzo Trazione Max.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Affidabilità: {LTBLUE}{COMMA}% {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Fermato
@@ -3045,6 +3046,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modificabile a: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Tutti i tipi di merci
STR_PURCHASE_INFO_ALL_BUT :Tutti meno {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Sforzo Trazione Max: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/polish.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/polish.txt Fri Dec 29 10:13:35 2006 +0000
@@ -23,7 +23,7 @@
STR_000E :
STR_000F_PASSENGERS :Pasażerowie
STR_000F_PASSENGERS.d :pasażerów
-STR_0010_COAL :Weigel
+STR_0010_COAL :Węgiel
STR_0010_COAL.d :węgla
STR_0011_MAIL :Poczta
STR_0011_MAIL.d :poczty
@@ -198,6 +198,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Opcje Gry
STR_00B2_MESSAGE :{YELLOW}Wiadomość
STR_00B3_MESSAGE_FROM :{YELLOW}Wiadomość od {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Uwaga!
STR_00B4_CAN_T_DO_THIS :{WHITE}Nie można tego zrobić...
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nie można wyczyścić terenu...
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Prawa Autorskie {COPYRIGHT} 1995 Chris Sawyer, Wszelkie Prawa Zastrzeżone
@@ -1392,9 +1393,10 @@
STR_NETWORK_START_DATE :{SILVER}Data uruchomienia: {WHITE}{DATE_SHORT}
STR_NETWORK_CURRENT_DATE :{SILVER}Bieżąca data: {WHITE}{DATE_SHORT}
STR_NETWORK_PASSWORD :{SILVER}Chronione hasłem!
-STR_NETWORK_SERVER_OFFLINE :{SILVER}SERWER WYLACZONY
-STR_NETWORK_SERVER_FULL :{SILVER}SERWER PELNY
+STR_NETWORK_SERVER_OFFLINE :{SILVER}SERWER WYŁĄCZONY
+STR_NETWORK_SERVER_FULL :{SILVER}SERWER PEŁNY
STR_NETWORK_VERSION_MISMATCH :{SILVER}NIEZGODNA WERSJA
+STR_NETWORK_GRF_MISMATCH :{SILVER}NIEZGODNE NEWGRF
STR_NETWORK_JOIN_GAME :{BLACK}Przyłącz się do gry
@@ -3017,6 +3019,7 @@
STR_NEWGRF_FILENAME :{BLACK}Nazwa pliku: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
STR_NEWGRF_MD5SUM :{BLACK}suma MD5: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Zamierzasz wprowadzić zmiany do gry w toku; to może zawiesić OpenTTD.{}Czy jesteś całkowicie pewien?
STR_NEWGRF_ADD :{BLACK}Dodaj
STR_NEWGRF_ADD_TIP :{BLACK}Dodaj plik NewGRF do listy
--- a/lang/russian.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/russian.txt Fri Dec 29 10:13:35 2006 +0000
@@ -2603,6 +2603,7 @@
STR_885C_BROKEN_DOWN :{RED}Поломка
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Возраст: {LTBLUE}{STRING}{BLACK} Стоимость обслуживания: {LTBLUE}{CURRENCY}/год
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Вес: {LTBLUE}{WEIGHT_S} {BLACK}Мощность: {LTBLUE}{POWER}{BLACK} Макс. скорость: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Вес: {LTBLUE}{WEIGHT_S} {BLACK}Мощность: {LTBLUE}{POWER}{BLACK} Макс. скорость: {LTBLUE}{VELOCITY} {BLACK}Макс. Тяговое Усилие: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибыль в этом году: {LTBLUE}{CURRENCY} (прошлый год: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Надежность: {LTBLUE}{COMMA}% {BLACK}Поломок с последнего ремонта: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Остановлен
@@ -3044,6 +3045,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Переоборуд. для: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Всех типов грузов
STR_PURCHASE_INFO_ALL_BUT :Все, кроме {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс. Тяговое Усилие: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/spanish.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/spanish.txt Fri Dec 29 10:13:35 2006 +0000
@@ -155,6 +155,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Opciones del juego
STR_00B2_MESSAGE :{YELLOW}Mensaje
STR_00B3_MESSAGE_FROM :{YELLOW}Mensaje de {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Precaución!
STR_00B4_CAN_T_DO_THIS :{WHITE}No se puede hacer eso....
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}No se puede desbrozar esta zona....
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados
@@ -287,8 +288,10 @@
STR_013E_CAPACITIES :{BLACK}Capacidades
STR_013E_TOTAL_CARGO :{BLACK}Carga total
STR_013F_CAPACITY :{BLACK}Capacidad: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT :{BLACK}Capacidad: {LTBLUE}{CARGO} (x{NUM})
STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidad) de este tren:
STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nuevo Juego
STR_0141_LOAD_GAME :{BLACK}Cargar Juego
STR_SINGLE_PLAYER :{BLACK}Un jugador
@@ -392,7 +395,15 @@
STR_NO_WAITING_CARGO :{BLACK}Ningún tipo de carga está esperando
STR_SELECT_ALL_FACILITIES :{BLACK}Seleccionar todas las facilidades
STR_SELECT_ALL_TYPES :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
+STR_AVAILABLE_ENGINES_TIP :{BLACK}Ver la lista de los motores disponibles para este tipo de vehículo.
+STR_MANAGE_LIST :{BLACK}Administrar lista
+STR_MANAGE_LIST_TIP :{BLACK}Enviar instrucciones a todos los vehículos de la lista
STR_REPLACE_VEHICLES :Reemplazar vehículos
+STR_SEND_TRAIN_TO_DEPOT :Enviar a Depósito
+STR_SEND_ROAD_VEHICLE_TO_DEPOT :Enviar a Depósito
+STR_SEND_SHIP_TO_DEPOT :Enviar a Depósito
+STR_SEND_AIRCRAFT_TO_HANGAR :Enviar al Hangar
+STR_SEND_FOR_SERVICING :Enviar para Servicio
############ range for months starts
STR_0162_JAN :Ene
@@ -1011,6 +1022,7 @@
STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING}
STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING}
STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Cargar vehículos gradualmente: {ORANGE}{STRING}
STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacción: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Entregar mercancía a una estación sólo si hay demanda: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Permitir la construcción de puentes muy largos: {ORANGE}{STRING}
@@ -1027,6 +1039,7 @@
STR_CONFIG_PATCHES_BRIBE :{LTBLUE}Permitir sobornos a la autoridad local: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Estaciones no uniformes: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL :{LTBLUE}Nuevo sistema de busq. de rutas global (NPF, anula a NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Carga el multiplicador de peso para simular trenes pesados: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING}
@@ -1072,6 +1085,7 @@
STR_CONFIG_PATCHES_LIVERIES_NONE :Ninguno
STR_CONFIG_PATCHES_LIVERIES_OWN :Propia empresa
STR_CONFIG_PATCHES_LIVERIES_ALL :Todas las empresas
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}Charla de equipo preferida con <ENTER>: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Máx trenes por jugador: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Máx vehículos de carretera por jugador: {ORANGE}{STRING}
@@ -1096,6 +1110,7 @@
STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}no
STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}Desactivar servicio cuando las averías están desactivadas: {ORANGE}{STRING}
STR_CONFIG_PATCHES_WAGONSPEEDLIMITS :{LTBLUE}Activar límites de velocidad en vagones: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS :{LTBLUE}Desactivar railes electricos: {ORANGE}{STRING}
STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Noticias en color aparecen en: {ORANGE}{STRING}
STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Fecha de inicio: {ORANGE}{STRING}
@@ -1295,6 +1310,7 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVIDOR APAGADO
STR_NETWORK_SERVER_FULL :{SILVER}SERVIDOR LLENO
STR_NETWORK_VERSION_MISMATCH :{SILVER}INCOMPATIBILIDAD DE VERSIONES
+STR_NETWORK_GRF_MISMATCH :{SILVER}PROBLEMA CON NEWGRF
STR_NETWORK_JOIN_GAME :{BLACK}Unirme al juego
@@ -2498,16 +2514,20 @@
STR_UNKNOWN_DESTINATION :destino desconocido
STR_8812_EMPTY :{LTBLUE}Vacío
STR_8813_FROM :{LTBLUE}{CARGO} desde {STATION}
+STR_FROM_MULT :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}El tren {COMMA} está esperando en el depósito
STR_8815_NEW_VEHICLES :{BLACK}Nuevos Vehículos
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}Tren demasiado largo
STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} Trenes
+
STR_881C_NEW_RAIL_VEHICLES :{WHITE}Nuevos vehículos de raíl
STR_NEW_ELRAIL_VEHICLES :{WHITE}Nuevo Vehículo Eléctrico de Railes
STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Nuevos vehículos de monorraíl
STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Nuevos vehículos de levitación magnética
+STR_ALL_AVAIL_RAIL_VEHICLES :{WHITE}Vehículos de Rail
+
STR_881F_BUILD_VEHICLE :{BLACK}Contruir Vehículo
STR_CLONE_ROAD_VEHICLE :{BLACK}Clonar vehículo
STR_CLONE_ROAD_VEHICLE_INFO :{BLACK}Esto construirá una copia del vehículo. Control-click compartirá las ordenes
@@ -2862,6 +2882,7 @@
STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}¿Tienes un préstamo muy elevado?
STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Total de puntos ganados del máximo posible
+STR_NEWGRF_SETTINGS_BUTTON :{BLACK}Configuración NewGRF
STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Configuración de Newgrf
STR_NEWGRF_APPLY_CHANGES :{BLACK}Aplicar cambios
STR_NEWGRF_SET_PARAMETERS :{BLACK}Establecer parámetros
@@ -2869,6 +2890,31 @@
STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}¡No tiene ningún fichero newgrf instalado! Por favor, lea las instrucciones en el manual para instalar nuevos gráficos.
STR_NEWGRF_FILENAME :{BLACK}Fichero: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Se van a realizar cambios a un juego en ejecución; esto puede cerrar OpenTTD.{}¿Estás completamente seguro de realizar esto?
+
+STR_NEWGRF_ADD :{BLACK}Añadir
+STR_NEWGRF_ADD_TIP :{BLACK}Añadir un NewGRF a la lista
+STR_NEWGRF_REMOVE :{BLACK}Quitar
+STR_NEWGRF_REMOVE_TIP :{BLACK}Quitar el NewGRF seleccionado de la lista
+STR_NEWGRF_MOVEUP :{BLACK}Mover Arriba
+STR_NEWGRF_MOVEUP_TIP :{BLACK}Mueve el NewGRF seleccionado arriba en la lista
+STR_NEWGRF_MOVEDOWN :{BLACK}Mover Abajo
+STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Mueve el NewGRF seleccionado abajo en la lista
+STR_NEWGRF_FILE_TIP :{BLACK}Una lista de los NewGRF instalados. Pulsa en el fichero para cambiar sus parámetros
+STR_NEWGRF_PARAMETER :{BLACK}Parametros: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY :{BLACK}Introduce los parámetros del NewGRF
+STR_NEWGRF_NO_INFO :{BLACK}No tiene información disponible
+
+STR_NEWGRF_ADD_CAPTION :{WHITE}Ficheros NewGRF disponibles
+STR_NEWGRF_ADD_FILE :{BLACK}Añadir a la selección
+STR_NEWGRF_ADD_FILE_TIP :{BLACK}Añade el NewGRF seleccionado a tu configuración
+STR_NEWGRF_RESCAN_FILES :{BLACK}Actualizar ficheros
+STR_NEWGRF_RESCAN_FILES_TIP :{BLACK}Actualiza la lista de ficheros NewGRF disponibles
+STR_NEWGRF_DUPLICATE_GRFID :{WHITE}No se puede añadir: GRF ID duplicado
+
+STR_NEWGRF_NOT_FOUND :{RED}Fichero no encontrado
+STR_NEWGRF_DISABLED :{RED}Desactivado
STR_CURRENCY_WINDOW :{WHITE}Moneda personalizada
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/swedish.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/swedish.txt Fri Dec 29 10:13:35 2006 +0000
@@ -57,7 +57,7 @@
STR_0032_OIL :Olja
STR_0033_LIVESTOCK :Boskap
STR_0034_GOODS :Gods
-STR_0035_GRAIN :Spannmål
+STR_0035_GRAIN :Vete
STR_0036_WOOD :Timmer
STR_0037_IRON_ORE :Järnmalm
STR_0038_STEEL :Stål
@@ -154,6 +154,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Spelinställningar
STR_00B2_MESSAGE :{YELLOW}Meddelande
STR_00B3_MESSAGE_FROM :{YELLOW}Meddelande från {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Varning!
STR_00B4_CAN_T_DO_THIS :{WHITE}Kan inte utföra detta...
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan inte röja området...
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
@@ -307,7 +308,7 @@
STR_0150_SOMEONE :någon{SKIP}{SKIP}
STR_0151_MAP_OF_WORLD :Världskarta
-STR_0152_TOWN_DIRECTORY :Lista med städer
+STR_0152_TOWN_DIRECTORY :Stadslista
STR_0153_SUBSIDIES :Subventioner
STR_UNITS_IMPERIAL :Engelsk
@@ -383,7 +384,7 @@
STR_SORT_BY_FACILITY :Stationstyp
STR_SORT_BY_WAITING :Väntande last-värde
STR_SORT_BY_RATING_MAX :Last Värdering
-STR_ENGINE_SORT_ENGINE_ID :Lok ID (normal sortering)
+STR_ENGINE_SORT_ENGINE_ID :MotorID (Klassisk Sort)
STR_ENGINE_SORT_COST :Kostnad
STR_ENGINE_SORT_POWER :Elektriskt
STR_ENGINE_SORT_INTRO_DATE :Introduktionsdatum
@@ -393,7 +394,15 @@
STR_NO_WAITING_CARGO :{BLACK}Ingen sorts last väntar
STR_SELECT_ALL_FACILITIES :{BLACK}Markera alla inrättningar
STR_SELECT_ALL_TYPES :{BLACK}Välj alla last-typer (inklusive icke väntande last)
+STR_AVAILABLE_ENGINES_TIP :{BLACK}Se lista med tillgängliga motordesigner för denna fordonstyp
+STR_MANAGE_LIST :{BLACK}Behandlingslista
+STR_MANAGE_LIST_TIP :{BLACK}Skicka instruktioner till alla fordon på denna lista
STR_REPLACE_VEHICLES :Byt ut fordon
+STR_SEND_TRAIN_TO_DEPOT :Skicka till Depå
+STR_SEND_ROAD_VEHICLE_TO_DEPOT :Skicka till Depå
+STR_SEND_SHIP_TO_DEPOT :Skicka till Depå
+STR_SEND_AIRCRAFT_TO_HANGAR :Skicka till Hangar
+STR_SEND_FOR_SERVICING :Skicka till Service
############ range for months starts
STR_0162_JAN :jan
@@ -732,8 +741,8 @@
STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Vill du verkligen avsluta detta scenario?
STR_029C_QUIT_EDITOR :{WHITE}Avsluta editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kan bara byggas i städer med minst 1200 invånare
-STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Flytta bak startdatumet 1 år
-STR_029F_MOVE_THE_STARTING_DATE :{BLACK}Flytta fram startdatumet 1 år
+STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Flytta startdatumet 1 år bakåt
+STR_029F_MOVE_THE_STARTING_DATE :{BLACK}Flytta startdatumet 1 år framåt
STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH :{WHITE}...brons ändar måste båda vara på land
STR_02A1_SMALL :{BLACK}Liten
STR_02A2_MEDIUM :{BLACK}Mellan
@@ -760,7 +769,7 @@
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spelinställningar
STR_02C5_DIFFICULTY_SETTINGS :Svårighetsgrad
-STR_02C7_CONFIG_PATCHES :Konfigurera patchar
+STR_02C7_CONFIG_PATCHES :Ändra Patchar
STR_NEWGRF_SETTINGS :Newgrf inställningar
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Stadsnamn visas
@@ -777,8 +786,8 @@
STR_02D5_LAND_BLOCK_INFO :Information om mark
STR_02D6 :
STR_CONSOLE_SETTING :Visa/dölj konsolen
-STR_02D7_SCREENSHOT_CTRL_S :Skärmdump (Ctrl-S)
-STR_02D8_GIANT_SCREENSHOT_CTRL_G :Gigantisk skärmdump (Ctrl-G)
+STR_02D7_SCREENSHOT_CTRL_S :Screenshot (Ctrl-S)
+STR_02D8_GIANT_SCREENSHOT_CTRL_G :Gigantisk Screenshot (Ctrl-G)
STR_02D9_ABOUT_OPENTTD :Om 'OpenTTD'
############ range ends here
@@ -789,7 +798,7 @@
STR_02DE_MAP_OF_WORLD :Världskarta
STR_EXTRA_VIEW_PORT :Nytt vy fönster
STR_SIGN_LIST :Skyltlista
-STR_02DF_TOWN_DIRECTORY :Lista med städer
+STR_02DF_TOWN_DIRECTORY :Stadslista
STR_TOWN_POPULATION :{BLACK}Världsbefolkning: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vy fönster {COMMA}
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopiera till vy
@@ -819,10 +828,10 @@
STR_02F8_EVERY_3_MONTHS :Var 3:e månad
STR_02F9_EVERY_6_MONTHS :Var 6:e månad
STR_02FA_EVERY_12_MONTHS :Var 12:e månad
-STR_02FB_START_A_NEW_GAME :{BLACK}Börja ett nytt spel
-STR_02FC_LOAD_A_SAVED_GAME :{BLACK}Ladda sparat spel
-STR_02FE_CREATE_A_CUSTOMIZED_GAME :{BLACK}Skapa ett eget nytt spel värld/scenario
-STR_02FF_SELECT_SINGLE_PLAYER_GAME :{BLACK}Välj en spelare
+STR_02FB_START_A_NEW_GAME :{BLACK}Starta ett nytt spel
+STR_02FC_LOAD_A_SAVED_GAME :{BLACK}Ladda ett sparat spel
+STR_02FE_CREATE_A_CUSTOMIZED_GAME :{BLACK}Skapa en egen spelvärld/scenario
+STR_02FF_SELECT_SINGLE_PLAYER_GAME :{BLACK}Välj Single-Player spel
STR_0300_SELECT_MULTIPLAYER_GAME :{BLACK}Välj nätverksspel med 2-8 spelare
STR_0301_DISPLAY_GAME_OPTIONS :{BLACK}Visa spelinställningar
STR_0302_DISPLAY_DIFFICULTY_OPTIONS :{BLACK}Visa inställningar för svårighetsgrad
@@ -835,7 +844,7 @@
STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE :{BLACK}Välj 'sub-arktiskt' typ av landskap
STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE :{BLACK}Välj 'sub-tropiskt' typ av landskap
STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Välj 'leksaksland' som typ av landskap
-STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Bekosta byggnation av ny industri
+STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Bekosta bygget av en ny industri
############ range for menu starts
STR_INDUSTRY_DIR :Industriförteckning
@@ -849,8 +858,8 @@
STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...kan bara byggas i öken
STR_0319_PAUSED :{YELLOW}* * PAUSAD * *
-STR_031B_SCREENSHOT_SUCCESSFULLY :{WHITE}Skärmdump sparades som '{STRING}'
-STR_031C_SCREENSHOT_FAILED :{WHITE}Skärmdump misslyckades!
+STR_031B_SCREENSHOT_SUCCESSFULLY :{WHITE}Screenshot sparades som '{STRING}'
+STR_031C_SCREENSHOT_FAILED :{WHITE}Screenshot misslyckades!
STR_0329_PURCHASE_LAND_FOR_FUTURE :{BLACK}Köp mark för framtida användning
STR_032F_AUTOSAVE :{RED}AUTOSPARNING
@@ -882,7 +891,7 @@
STR_TOWNNAME_DANISH :Danska
STR_TOWNNAME_TURKISH :Turkiska
STR_TOWNNAME_ITALIAN :Italienska
-STR_TOWNNAME_CATALAN :Katalanska
+STR_TOWNNAME_CATALAN :Katalan
############ end of townname region
STR_CURR_GBP :Pund (£)
@@ -910,8 +919,8 @@
STR_CURR_SIT :Slovenska Tolar (SIT)
STR_CURR_SEK :Svenska kronor (SEK)
STR_CURR_YTL :Turkisk Lire (YTL)
-STR_CURR_SKK :Slovakiska Koruna (SKK)
-STR_CURR_BRR :Brasilianska Real (BRL)
+STR_CURR_SKK :Slovakisk Koruna (SKK)
+STR_CURR_BRR :Brasiliansk Real (BRL)
STR_CURR_CUSTOM :Egen...
@@ -1103,7 +1112,7 @@
STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Färgade nyheter visas i: {ORANGE}{STRING}
STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Startdatum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Avsluta spelet om: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Avsluta spelet år: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}Lugn ekonomi (flera små ändringar)
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Tillåt inköp av aktier från andra företag
STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Vid utdragning av signaler, placera en signal var: {ORANGE}{STRING} ruta
@@ -1138,12 +1147,12 @@
STR_CHEATS :{WHITE}Fusk
STR_CHEATS_TIP :{BLACK}Checkboxar indikerar om du använt det här fusket förut
-STR_CHEATS_WARNING :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att en sådan förkasstlig handling aldrig glöms bort.
-STR_CHEAT_MONEY :{LTBLUE}Öka pengar genom att {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spelar som: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}trimmad bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
+STR_CHEATS_WARNING :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att detta inte kommer glömmas.
+STR_CHEAT_MONEY :{LTBLUE}Öka pengar med {CURRENCY64}
+STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spela som Spelare: {ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk Bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Byggnation i pause-läge: {ORANGE}{STRING}
+STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Bygga i pause-läge: {ORANGE}{STRING}
STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetplan kommer inte att störta (frekvent) på små flygplatser: {ORANGE} {STRING}
STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Byt klimat: {ORANGE} {STRING}
STR_CHEAT_CHANGE_DATE :{LTBLUE}Byt datum: {ORANGE} {DATE_SHORT}
@@ -1299,6 +1308,7 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER AVSTÄNGD
STR_NETWORK_SERVER_FULL :{SILVER}SERVER FULL
STR_NETWORK_VERSION_MISMATCH :{SILVER}VERSIONERNA FUNKAR INTE IHOP
+STR_NETWORK_GRF_MISMATCH :{SILVER}NewGRF Matchar Ej
STR_NETWORK_JOIN_GAME :{BLACK}Gå med i spelet
@@ -1492,7 +1502,7 @@
STR_0808_CAN_T_RAISE_LAND_HERE :{WHITE}Kan inte höja marken här...
STR_0809_CAN_T_LOWER_LAND_HERE :{WHITE}Kan inte sänka marken här...
STR_080A_ROCKS :Stenar
-STR_080B_ROUGH_LAND :Obearbetad mark
+STR_080B_ROUGH_LAND :Ojämn mark
STR_080C_BARE_LAND :Barmark
STR_080D_GRASS :Gräs
STR_080E_FIELDS :Fält
@@ -1511,7 +1521,7 @@
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Bygg järnväg
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifierad järnvägskonstruktion
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Bygg monorail
-STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Bygg maglev
+STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Bygg MagLev
STR_100D_SELECT_RAIL_BRIDGE :{WHITE}Välj järnvägsbro
STR_100E_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Kan inte bygga depå här...
STR_100F_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Kan inte bygga järnvägsstation här...
@@ -1523,7 +1533,7 @@
STR_1015_RAILROAD_CONSTRUCTION :Bygg järnväg
STR_TOOLB_ELRAIL_CONSTRUCTION :Elektrifierad järnvägskonstruktion
STR_1016_MONORAIL_CONSTRUCTION :Bygg monorail
-STR_1017_MAGLEV_CONSTRUCTION :Bygg maglev
+STR_1017_MAGLEV_CONSTRUCTION :Bygg MagLev
STR_1018_BUILD_RAILROAD_TRACK :{BLACK}Bygg järnväg
STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Bygg depå (för att bygga eller reparera tåg)
STR_101A_BUILD_RAILROAD_STATION :{BLACK}Bygg järnvägsstation
@@ -1553,12 +1563,12 @@
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Riktning för bussgarage
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan inte bygga bussgarage här...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan inte bygga busshållplats...
-STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan inte bygga lastbilsbrygga...
+STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan inte bygga lastbilsstation...
STR_180A_ROAD_CONSTRUCTION :Bygg väg
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bygg väg
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bygg bussgarage (för att bygga eller reparera vägfordon)
STR_180D_BUILD_BUS_STATION :{BLACK}Bygg busshållplats
-STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bygg lastbilsbrygga
+STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bygg lastbilsstation
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bygg vägbro
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bygg vägtunnel
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Växla mellan att bygga/ta bort väg
@@ -1599,10 +1609,10 @@
STR_2018_PARK :Park
STR_2019_OFFICE_BLOCK :Kontorslokaler
STR_201A_SHOPS_AND_OFFICES :Affärer och kontor
-STR_201B_MODERN_OFFICE_BUILDING :Moderna kontorsbyggnader
+STR_201B_MODERN_OFFICE_BUILDING :Modern kontorsbyggnad
STR_201C_WAREHOUSE :Varuhus
-STR_201D_OFFICE_BLOCK :Kontor
-STR_201E_STADIUM :Stadium
+STR_201D_OFFICE_BLOCK :Kontorsbyggnad
+STR_201E_STADIUM :Arena
STR_201F_OLD_HOUSES :Gamla hus
STR_2020_LOCAL_AUTHORITY :{BLACK}Lokala myndigheter
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Visa information om de lokala myndigheterna
@@ -1628,15 +1638,15 @@
STR_2036_COTTAGES :Stuga
STR_2037_HOUSES :Hus
STR_2038_FLATS :Lägenheter
-STR_2039_TALL_OFFICE_BLOCK :Höga kontor
+STR_2039_TALL_OFFICE_BLOCK :Hög kontorsbyggnad
STR_203A_SHOPS_AND_OFFICES :Affärer och kontor
STR_203B_SHOPS_AND_OFFICES :Affärer och kontor
-STR_203C_THEATER :Teater
-STR_203D_STADIUM :Stadium
+STR_203C_THEATER :Biograf
+STR_203D_STADIUM :Arena
STR_203E_OFFICES :Kontor
STR_203F_HOUSES :Hus
STR_2040_CINEMA :Biograf
-STR_2041_SHOPPING_MALL :Shoppingcentrum
+STR_2041_SHOPPING_MALL :Shoppingcentra
STR_2042_DO_IT :{BLACK}Utför
STR_2043_LIST_OF_THINGS_TO_DO_AT :{BLACK}Lista av åtgärder att utföra i staden - klicka på en rad för ytterligare detaljer
STR_2044_CARRY_OUT_THE_HIGHLIGHTED :{BLACK}Utför markerad åtgärd i ovanstående lista
@@ -1700,8 +1710,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Angränsar till mer än en station/hållplats
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}För många stationer/hållplatser i staden
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}För många stationer/hållplatser
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}För många buss hållplatser
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}För många lastbils stationer
+STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}För många busshållplatser
+STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}För många lastbilsstationer
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}För nära en annan stationer/hållplatser
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Måste riva järnvägsstation först
@@ -1715,7 +1725,7 @@
STR_3034_LOCAL_RATING_OF_TRANSPORT :{BLACK}Lokal värdering av transporttjänster:
############ range for rating starts
-STR_3035_APPALLING :Skrämmande
+STR_3035_APPALLING :Hemskt Dålig
STR_3036_VERY_POOR :Väldigt dålig
STR_3037_POOR :Dålig
STR_3038_MEDIOCRE :Medelmåttig
@@ -1777,15 +1787,15 @@
STR_3800_SHIP_DEPOT_ORIENTATION :{WHITE}Skeppsdepå riktning
STR_3801_MUST_BE_BUILT_ON_WATER :{WHITE}...måste byggas på vatten
STR_3802_CAN_T_BUILD_SHIP_DEPOT :{WHITE}Kan inte bygga skeppsdepå här...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION :{BLACK}Välj skeppsdepå riktning
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION :{BLACK}Välj skeppsdepåns riktning
STR_3804_WATER :Vatten
STR_3805_COAST_OR_RIVERBANK :Kust eller flodbank
-STR_3806_SHIP_DEPOT :skeppsdepå
+STR_3806_SHIP_DEPOT :Skeppsdepå
STR_3807_CAN_T_BUILD_ON_WATER :{WHITE}...Kan inte bygga på vatten
##id 0x4000
STR_4000_SAVE_GAME :{WHITE}Spara spel
-STR_4001_LOAD_GAME :{WHITE}Öppna spel
+STR_4001_LOAD_GAME :{WHITE}Ladda spel
STR_4002_SAVE :{BLACK}Spara
STR_4003_DELETE :{BLACK}Ta bort
STR_4004 :{COMPANY}, {DATE_LONG}
@@ -1908,7 +1918,7 @@
STR_5025_WOODEN_ROAD_BRIDGE :Vägbro av trä
STR_5026_CONCRETE_ROAD_BRIDGE :Vägbro av betong
STR_5027_TUBULAR_RAIL_BRIDGE :Järnvägsrörbro
-STR_5028_TUBULAR_ROAD_BRIDGE :Vägrörbro
+STR_5028_TUBULAR_ROAD_BRIDGE :Rörbro
##id 0x5800
STR_5800_OBJECT_IN_THE_WAY :{WHITE}Objekt i vägen
@@ -2173,25 +2183,25 @@
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}!
STR_7080_PROTECTED :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
-STR_LIVERY_DEFAULT :Standard färger
+STR_LIVERY_DEFAULT :Normalt Färgschema
STR_LIVERY_STEAM :Ånglok
-STR_LIVERY_DIESEL :Disellok
-STR_LIVERY_ELECTRIC :Elektriskt lok
-STR_LIVERY_MONORAIL :Monoraillok
-STR_LIVERY_MAGLEV :Maglevlok
+STR_LIVERY_DIESEL :Dieseltåg
+STR_LIVERY_ELECTRIC :Elektriskt tåg
+STR_LIVERY_MONORAIL :Monorail-Tåg
+STR_LIVERY_MAGLEV :Maglev-Tåg
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
-STR_LIVERY_PASSENGER_WAGON_STEAM :Passagerarvagn (Ånglok)
+STR_LIVERY_PASSENGER_WAGON_STEAM :Passagerarvagn (Ånga)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagerarvagn (Disel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagerarvagn (Elektrisk)
-STR_LIVERY_FREIGHT_WAGON :Godsvagn
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagerarvagn (Elektricitet)
+STR_LIVERY_FREIGHT_WAGON :Fraktvagn
STR_LIVERY_BUS :Buss
STR_LIVERY_TRUCK :Lastbil
STR_LIVERY_PASSENGER_SHIP :Passagerarfärja
STR_LIVERY_FREIGHT_SHIP :Fraktskepp
STR_LIVERY_HELICOPTER :Helikopter
STR_LIVERY_SMALL_PLANE :Litet flygplan
-STR_LIVERY_LARGE_PLANE :Stort flygplan
+STR_LIVERY_LARGE_PLANE :Stort Flygplan
STR_LIVERY_GENERAL_TIP :{BLACK}Visa generellt färgschema
STR_LIVERY_TRAIN_TIP :{BLACK}Visa färgscheman för tåg
@@ -2531,7 +2541,7 @@
STR_8827_FULL_LOAD :{BLACK}Lasta
STR_8828_UNLOAD :{BLACK}Lasta av
STR_REFIT :{BLACK}Anpassa
-STR_REFIT_TIP :{BLACK}Till vilken godstyp ska anpassningen ska göras i denna order. CTRL+klick för att tabort anpassningsordern
+STR_REFIT_TIP :{BLACK}Välj vilken godstyp anpassningen ska göras i denna order. CTRL+ klicka för att ta bort anpassningsordern
STR_REFIT_ORDER :(Anpassa för {STRING})
STR_8829_ORDERS :{WHITE}{VEHICLE} (Order)
STR_882A_END_OF_ORDERS :{SETX 10}- - Slut på order - -
@@ -2612,7 +2622,7 @@
STR_TRAIN_STOPPING :{RED}Stannar
STR_TRAIN_STOPPING_VEL :{RED}Stannar, {VELOCITY}
STR_INCOMPATIBLE_RAIL_TYPES :Fel järnvägstyp
-STR_TRAIN_NO_POWER :{RED}Ingen ström
+STR_TRAIN_NO_POWER :{RED}Ingen Kraft
STR_TRAIN_START_NO_CATENARY :Loket kan inte starta för att detta spår saknar elledningar
##id 0x9000
@@ -2675,10 +2685,10 @@
STR_9038_GO_TO_ROADVEH_DEPOT :Gå till {TOWN} vägfordonsdepå
STR_SERVICE_AT_ROADVEH_DEPOT :Servning vid {TOWN} vägfordonsdepå Depot
-STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Anpassa fordon att frakta annat gods
-STR_REFIT_ROAD_VEHICLE :{BLACK}Anpassa fordon
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED :{BLACK}Anpassa fordon att frakta markerat gods
-STR_REFIT_ROAD_VEHICLE_CAN_T :{WHITE}Kan inte anpassa fordon
+STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Anpassa vägfordon till att bära en annan sorts last
+STR_REFIT_ROAD_VEHICLE :{BLACK}Anpassa Vägfordon
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED :{BLACK}Anpassa vägfordon till att bära markerad last
+STR_REFIT_ROAD_VEHICLE_CAN_T :{WHITE}Kan inte anpassa vägfordon...
STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Välj lasttyp för fordon
##id 0x9800
@@ -2879,6 +2889,7 @@
STR_NEWGRF_FILENAME :{BLACK}Filnamn: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Du håller på att göra ändringar i ett spel som används; detta kan krascha OpenTTD.{}Är du helt säker på detta?
STR_NEWGRF_ADD :{BLACK}Lägg till
STR_NEWGRF_ADD_TIP :{BLACK}Lägg till en ny NewGRF-fil till listan
@@ -2900,6 +2911,8 @@
STR_NEWGRF_RESCAN_FILES_TIP :{BLACK}Uppdatera listan med tillgängliga NewGRF-filer
STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Kan inte lägga till filen: redan existerande GRF ID
+STR_NEWGRF_NOT_FOUND :{RED}Matchande fil hittades ej
+STR_NEWGRF_DISABLED :{RED}Avstängd
STR_CURRENCY_WINDOW :{WHITE}Egen valuta
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2927,8 +2940,8 @@
STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Visa alla flygplan där denna station finns med i rutten
STR_SCHEDULED_SHIPS_TIP :{BLACK}Visa alla skepp där denna station finns med i rutten
-STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Delade order med {COMMA} Fordon{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Visa alla fordon med samma körschema
+STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Delade instruktioner med {COMMA} Fordon{P "" s}
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Visa alla fordon som har samma schema
### depot strings
@@ -2947,7 +2960,7 @@
STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Sälj inte alla flygplan i hangaren
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sälj alla tåg i depån
-STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sälj alla fordon i depån
+STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sälj alla vägfordon i depån
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Sälj alla skepp i depån
STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP :{BLACK}Sälj alla flygplan i hangaren
@@ -2956,10 +2969,10 @@
STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP :{BLACK}Ge en lista av alla fartyg som har denna depå i dess körschema
STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP :{BLACK}Ge en lista av alla flygplan som har denna flygplats-hangar i dess körschema
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP :{BLACK}Ersätt alla tåg i depån
-STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Ersätt alla fordon i depån
-STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Ersätt alla skepp i depån
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Ersätt alla flygplan i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TIP :{BLACK}Byt ut alla tåg i depån
+STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Byt ut alla vägfordon i depån
+STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Byt ut alla skepp i depån
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Byt ut alla flygplan i hangaren
STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tåg
STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vägfordon
@@ -3037,15 +3050,15 @@
STR_GENERATE :{WHITE}Generera
STR_RANDOM :{BLACK}Slumpa
STR_RANDOM_HELP :{BLACK}Ändra slump-nummer som används för terräng-generering
-STR_WORLD_GENERATION_CAPTION :{WHITE}Världsgenerering
+STR_WORLD_GENERATION_CAPTION :{WHITE}Generera Värld
STR_RANDOM_SEED :{BLACK}Slump-nummer:
STR_RANDOM_SEED_HELP :{BLACK}Klicka för att mata in ett slump-nummer
STR_LAND_GENERATOR :{BLACK}Landgenerator:
-STR_TREE_PLACER :{BLACK}Träd algoritm:
+STR_TREE_PLACER :{BLACK}Träd Algoritm:
STR_HEIGHTMAP_ROTATION :{BLACK}Rotation på höjdkarta:
-STR_TERRAIN_TYPE :{BLACK}Typ av terräng:
+STR_TERRAIN_TYPE :{BLACK}Terrängtyp:
STR_QUANTITY_OF_SEA_LAKES :{BLACK}Havsnivå
-STR_SMOOTHNESS :{BLACK}Framkomlighet:
+STR_SMOOTHNESS :{BLACK}Jämnhet:
STR_SNOW_LINE_HEIGHT :{BLACK}Snölinjens höjd:
STR_DATE :{BLACK}Datum:
STR_NUMBER_OF_TOWNS :{BLACK}Antal städer:
@@ -3054,7 +3067,7 @@
STR_SNOW_LINE_UP :{BLACK}Flytta snölinjens höjd upp ett steg
STR_SNOW_LINE_DOWN :{BLACK}Flytta snölinjens höjd ner ett steg
STR_SNOW_LINE_QUERY_CAPT :{WHITE}Ändra snölinjens höjd
-STR_START_DATE_QUERY_CAPT :{WHITE}Byt år för start
+STR_START_DATE_QUERY_CAPT :{WHITE}Ändra Startår
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}Skala-varning
STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}För stora storleksändringar av källkarta är inte rekomenderat. Fortsätt med generering?
STR_SNOW_LINE_HEIGHT_NUM :{NUM}
@@ -3066,7 +3079,7 @@
STR_GENERATION_ABORT_MESSAGE :{YELLOW}Vill du verkligen avbryta genereringen?
STR_PROGRESS :{WHITE}{NUM}% färdigt
STR_GENERATION_PROGRESS :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION :{BLACK}Världsgenerering
+STR_WORLD_GENERATION :{BLACK}Generera Värld
STR_TREE_GENERATION :{BLACK}Träd generering
STR_UNMOVABLE_GENERATION :{BLACK}Icke flyttbar generering
STR_CLEARING_TILES :{BLACK}Svår och stenig markgenerering
@@ -3079,10 +3092,10 @@
STR_SE_RANDOM_LAND :{WHITE}Slumpat land
STR_SE_NEW_WORLD :{BLACK}Skapa ett nytt scenario
STR_SE_CAPTION :{WHITE}Scenarotyp
-STR_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Flytta den platta landytan ner ett steg
-STR_FLAT_WORLD_HEIGHT_UP :{BLACK}Flytta den platta landytan upp ett steg
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Ändra höjden på den platta landytan
-STR_FLAT_WORLD_HEIGHT :{BLACK}Landhöjd (endast platt):
+STR_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Sänk höjden av platt land ett ner
+STR_FLAT_WORLD_HEIGHT_UP :{BLACK}Öka höjden av platt land ett upp
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Ändra höjd av platt land
+STR_FLAT_WORLD_HEIGHT :{BLACK}Höjd av platt land:
STR_FLAT_WORLD_HEIGHT_NUM :{NUM}
STR_SMALLMAP_CENTER :{BLACK}Centrera den lilla kartan på den nuvarande positionen
@@ -3090,17 +3103,17 @@
########### String for new airports
STR_SMALL_AIRPORT :{BLACK}Liten
STR_CITY_AIRPORT :{BLACK}Stad
-STR_METRO_AIRPORT :{BLACK}Metropolflygplats
-STR_INTERNATIONAL_AIRPORT :{BLACK}Internationell flygplats
+STR_METRO_AIRPORT :{BLACK}Storstads-Flygplats
+STR_INTERNATIONAL_AIRPORT :{BLACK}Internationell Flygplats
STR_COMMUTER_AIRPORT :{BLACK}Pendlare
-STR_INTERCONTINENTAL_AIRPORT :{BLACK}Interkontinental
+STR_INTERCONTINENTAL_AIRPORT :{BLACK}Jättestor flygplats
STR_HELIPORT :{BLACK}Helikopterplatta
STR_HELIDEPOT :{BLACK}Helikopterhangar
STR_HELISTATION :{BLACK}Helikopterplatta
STR_SMALL_AIRPORTS :{BLACK}Små flygfält
-STR_LARGE_AIRPORTS :{BLACK}Stora flygplatser
-STR_HUB_AIRPORTS :{BLACK}Flygterminaler
+STR_LARGE_AIRPORTS :{BLACK}Stora Flygplatser
+STR_HUB_AIRPORTS :{BLACK}Centrala Flygplatser
STR_HELIPORTS :{BLACK}Helikopterfält
############ Tooltip measurment
--- a/lang/turkish.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/lang/turkish.txt Fri Dec 29 10:13:35 2006 +0000
@@ -1021,6 +1021,7 @@
STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Yan yana yapılan tren istasyonlarını birleştir: {ORANGE}{STRING}
STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'tam doldur' etkinse istasyonu tam dolunca terket: {ORANGE}{STRING}
STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Geliştirilmiş yükleme algoritması kullan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Araçlar yavaş yavaş dolsun: {ORANGE}{STRING}
STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Enflasyon: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Sadece istek varsa kargo kabul edilsin: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Çok uzun köprülere izin ver: {ORANGE}{STRING}
@@ -1079,6 +1080,7 @@
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Arazi araç çubuğunu diğer araç çubuklarına bağla: {ORANGE}{STRING}
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Fareyle kaydırma hareketini ters çevir: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}İnşa araçları kullanılırken ölçüm ipucu göster: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Şirketin renklerini göster: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES_NONE :Hiçbiri
STR_CONFIG_PATCHES_LIVERIES_OWN :Şirketi al
STR_CONFIG_PATCHES_LIVERIES_ALL :Tüm şirketler
@@ -2054,7 +2056,7 @@
STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
STR_7002_PLAYER :(Oyuncu {COMMA})
STR_7004_NEW_FACE :{BLACK}Yeni Surat
-STR_7005_COLOR_SCHEME :{BLACK}Renk
+STR_7005_COLOR_SCHEME :{BLACK}Renkler
STR_7006_COLOR_SCHEME :{GOLD}Renk:
STR_7007_NEW_COLOR_SCHEME :{WHITE}Yeni Renk
STR_7008_COMPANY_NAME :{BLACK}Şirket ismi
@@ -2182,7 +2184,7 @@
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından alındı!
STR_7080_PROTECTED :{WHITE}Bu şirket hisselerini satacak kadar eski değil...
-STR_LIVERY_DEFAULT :Standart Araç
+STR_LIVERY_DEFAULT :Şirket Rengi
STR_LIVERY_STEAM :Buharlı Lokomotif
STR_LIVERY_DIESEL :Dizel Lokomotif
STR_LIVERY_ELECTRIC :Elektrikli Lokomotif
@@ -2209,6 +2211,7 @@
STR_LIVERY_AIRCRAFT_TIP :{BLACK}Uçakların renk şemalarını göster
STR_LIVERY_PRIMARY_TIP :{BLACK}Seçili düzen için birincil rengi seç
STR_LIVERY_SECONDARY_TIP :{BLACK}Seçili düzen için ikincil rengi seç
+STR_LIVERY_PANEL_TIP :{BLACK}Rengini değiştirmek için bir araç türü seçin. CTRL+tıklama birden fazla araç seçebilir. Rengi kullanmak için kutucukları içaretleyin
##id 0x8000
STR_8000_KIRBY_PAUL_TANK_STEAM :Kirby Paul Tank (Buhar)
@@ -2886,6 +2889,7 @@
STR_NEWGRF_FILENAME :{BLACK}Dosya adı: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Çalışan bir oyunu değiştirmek üzeresiniz; bu OpenTTD'yi çökertebilir.{}Emin misiniz?
STR_NEWGRF_ADD :{BLACK}Ekle
STR_NEWGRF_ADD_TIP :{BLACK}Listeye NewGRF dosyası ekle
--- a/newgrf_config.c Thu Dec 28 17:30:06 2006 +0000
+++ b/newgrf_config.c Fri Dec 29 10:13:35 2006 +0000
@@ -181,7 +181,12 @@
{
GRFConfig **c = &_grfconfig;
- if (defaults) c = CopyGRFConfigList(c, _grfconfig_newgame);
+ if (defaults) {
+ c = CopyGRFConfigList(c, _grfconfig_newgame);
+ } else {
+ ClearGRFConfigList(c);
+ }
+
AppendStaticGRFConfigs(&_grfconfig);
}
--- a/newgrf_station.c Thu Dec 28 17:30:06 2006 +0000
+++ b/newgrf_station.c Fri Dec 29 10:13:35 2006 +0000
@@ -286,6 +286,40 @@
}
+static uint32 GetRailContinuationInfo(TileIndex tile)
+{
+ /* Tile offsets and exit dirs for X axis */
+ static Direction x_dir[8] = { DIR_SW, DIR_NE, DIR_SE, DIR_NW, DIR_S, DIR_E, DIR_W, DIR_N };
+ static DiagDirection x_exits[8] = { DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SW, DIAGDIR_NE };
+
+ /* Tile offsets and exit dirs for Y axis */
+ static Direction y_dir[8] = { DIR_SE, DIR_NW, DIR_SW, DIR_NE, DIR_S, DIR_W, DIR_E, DIR_N };
+ static DiagDirection y_exits[8] = { DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SE, DIAGDIR_NW };
+
+ Axis axis = IsTileType(tile, MP_RAILWAY) ? GetWaypointAxis(tile) : GetRailStationAxis(tile);
+
+ /* Choose appropriate lookup table to use */
+ Direction *dir = axis == AXIS_X ? x_dir : y_dir;
+ DiagDirection *diagdir = axis == AXIS_X ? x_exits : y_exits;
+
+ uint32 res = 0;
+ uint i;
+
+ for (i = 0; i < lengthof(x_dir); i++, dir++, diagdir++) {
+ uint32 ts = GetTileTrackStatus(tile + TileOffsByDir(*dir), TRANSPORT_RAIL);
+ if (ts != 0) {
+ /* If there is any track on the tile, set the bit in the second byte */
+ SETBIT(res, i + 8);
+
+ /* If any track reaches our exit direction, set the bit in the lower byte */
+ if (ts & DiagdirReachesTracks(*diagdir)) SETBIT(res, i);
+ }
+ }
+
+ return res;
+}
+
+
/* Station Resolver Functions */
static uint32 StationGetRandomBits(const ResolverObject *object)
{
@@ -342,6 +376,7 @@
(GetRailType(tile) << 8);
case 0x43: return st->owner; /* Station owner */
case 0x44: return 2; /* PBS status */
+ case 0x45: return GetRailContinuationInfo(tile);
case 0x46: return GetPlatformInfoHelper(tile, false, false, true);
case 0x47: return GetPlatformInfoHelper(tile, true, false, true);
case 0x48: { /* Accepted cargo types */
@@ -361,6 +396,7 @@
case 0x62: return st->goods[parameter].rating;
case 0x63: return st->goods[parameter].enroute_time;
case 0x64: return st->goods[parameter].last_speed | (st->goods[parameter].last_age << 8);
+ case 0x65: return GB(st->goods[parameter].waiting_acceptance, 12, 4);
/* General station properties */
case 0x82: return 50;
--- a/readme.txt Thu Dec 28 17:30:06 2006 +0000
+++ b/readme.txt Fri Dec 29 10:13:35 2006 +0000
@@ -35,7 +35,7 @@
---- ----------
The easiest way to contact the OpenTTD team is by submitting bug reports or
posting comments in our forums. You can also chat with us on IRC (#openttd
-on irc.freenode.net).
+on irc.oftc.net).
The OpenTTD homepage is http://www.openttd.org/.
@@ -54,7 +54,7 @@
The Flyspray project page URL is: http://bugs.openttd.org/
Please include the following information in your bug report:
- - OpenTTD version (PLEASE test the latest SVN/daily build)
+ - OpenTTD version (PLEASE test the latest SVN/nightly build)
- Bug details, including instructions how to reproduce it
- Platform and compiler (Win32, Linux, FreeBSD, ...)
- Attach a saved game or a screenshot if possible
@@ -70,13 +70,13 @@
be very difficult to port it to a new platform. The currently working platforms
are:
- BeOS - SDL
- FreeBSD - SDL
- Linux - SDL
- MacOS X (universal) - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
- MorphOS - SDL
- OS/2 - SDL
- Windows - Win32 GDI (faster) or SDL
+ BeOS - SDL
+ FreeBSD - SDL
+ Linux - SDL
+ MacOS X (universal) - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
+ MorphOS - SDL
+ OS/2 - SDL
+ Windows - Win32 GDI (faster) or SDL
4.0) Running OpenTTD:
@@ -120,7 +120,7 @@
* Use Ctrl to place semaphore signals
* Ctrl-D toggles double mode in the Windows version
* Ingame console. More information at
- http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
+ http://wiki.openttd.org/index.php/Console
6.0) Configuration File:
@@ -149,12 +149,11 @@
Unix:
OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.
- (see also docs/Readme_Mandrake_Linux.txt)
MacOS X:
Use "make" or Xcode (which will then call make for you)
- This will give you a binary for your CPU type (PPC/Intel)
- To make a universal binary type "make UNIVERSAL_BINARY:=1"
+ This will give you a binary for your CPU type (PPC/Intel)
+ To make a universal binary type "make UNIVERSAL_BINARY:=1"
BeOS:
Use "make".
@@ -272,13 +271,13 @@
Bjarni Corfitzen (Bjarni) - Mac OS X port, coder
Matthijs Kooijman (blathijs) - Pathfinder-guru
Victor Fischer (Celestar) - Programming everywhere you need him to
- Tams Farag (Darkvater) - Lead programmer
- Loc Guilloux (glx) - In training, not yet specialized
+ Tamás Faragó (Darkvater) - Lead programmer
+ Loïc Guilloux (glx) - In training, not yet specialized
Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
Kerekes Miham (MiHaMiX) - Maintainer of translator service, and host of nightlies
Peter Nelson (peter1138) - Spiritual descendant from newgrf gods
- Remko Bijker (Rubidium) - Belugas code scrutinizer",
+ Remko Bijker (Rubidium) - Programmer
Christoph Mallon (Tron) - Programmer, code correctness police
Patric Stout (TrueLight) - Programmer, network guru, SVN-repository and website host
@@ -289,18 +288,18 @@
Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
Thanks to:
- Josef Drexler - For his great work on TTDPatch.
- Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
- Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite
- Petr Baudis (pasky) - Many patches, newgrf support, etc.
- Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)
- Stefan Meiner (sign_de) - For his work on the console
- Mike Ragsdale - OpenTTD installer
- Cian Duffy (MYOB) - BeOS port / manual writing
- Christian Rosentreter (tokai) - MorphOS / AmigaOS port
- Richard Kempton (richK) - additional airports, initial TGP implementation
- Michael Blunck - For revolutionizing TTD with awesome graphics
- George - Canal graphics
- All Translators - For their support to make OpenTTD a truly international game
- Bug Reporters - Thanks for all bug reports
- Chris Sawyer - For an amazing game!
+ Josef Drexler - For his great work on TTDPatch.
+ Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
+ Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite
+ Petr Baudis (pasky) - Many patches, newgrf support, etc.
+ Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)
+ Stefan Meißner (sign_de) - For his work on the console
+ Mike Ragsdale - OpenTTD installer
+ Cian Duffy (MYOB) - BeOS port / manual writing
+ Christian Rosentreter (tokai) - MorphOS / AmigaOS port
+ Richard Kempton (RichK67) - Additional airports, initial TGP implementation
+ Michael Blunck - For revolutionizing TTD with awesome graphics
+ George - Canal graphics
+ All Translators - For their support to make OpenTTD a truly international game
+ Bug Reporters - Thanks for all bug reports
+ Chris Sawyer - For an amazing game!
--- a/station_cmd.c Thu Dec 28 17:30:06 2006 +0000
+++ b/station_cmd.c Fri Dec 29 10:13:35 2006 +0000
@@ -34,10 +34,17 @@
#include "yapf/yapf.h"
#include "date.h"
+typedef enum StationRectModes
+{
+ RECT_MODE_TEST = 0,
+ RECT_MODE_TRY,
+ RECT_MODE_FORCE
+} StationRectMode;
+
static void StationRect_Init(Station *st);
static bool StationRect_IsEmpty(Station *st);
-static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, bool exec);
-static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, bool exec);
+static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode);
+static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, StationRectMode mode);
static bool StationRect_AfterRemoveTile(Station *st, TileIndex tile);
static bool StationRect_AfterRemoveRect(Station *st, TileIndex tile, int w, int h);
@@ -1026,7 +1033,7 @@
}
//XXX can't we pack this in the "else" part of the if above?
- if (!StationRect_BeforeAddRect(st, tile_org, w_org, h_org, false)) return CMD_ERROR;
+ if (!StationRect_BeforeAddRect(st, tile_org, w_org, h_org, RECT_MODE_TEST)) return CMD_ERROR;
} else {
// Create a new station
st = AllocateStation();
@@ -1085,7 +1092,7 @@
st->build_date = _date;
- StationRect_BeforeAddRect(st, tile_org, w_org, h_org, true);
+ StationRect_BeforeAddRect(st, tile_org, w_org, h_org, RECT_MODE_TRY);
tile_delta = (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
track = AxisToTrack(axis);
@@ -1453,7 +1460,7 @@
return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
}
- if (!StationRect_BeforeAddTile(st, tile, false)) return CMD_ERROR;
+ if (!StationRect_BeforeAddTile(st, tile, RECT_MODE_TEST)) return CMD_ERROR;
FindRoadStopSpot(type, st, &currstop, &prev);
} else {
@@ -1491,7 +1498,7 @@
st->build_date = _date;
- StationRect_BeforeAddTile(st, tile, true);
+ StationRect_BeforeAddTile(st, tile, RECT_MODE_TRY);
MakeRoadStop(tile, st->owner, st->index, type, p1);
@@ -1702,7 +1709,7 @@
if (st->owner != OWNER_NONE && st->owner != _current_player)
return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
- if (!StationRect_BeforeAddRect(st, tile, w, h, false)) return CMD_ERROR;
+ if (!StationRect_BeforeAddRect(st, tile, w, h, RECT_MODE_TEST)) return CMD_ERROR;
if (st->airport_tile != 0)
return_cmd_error(STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT);
@@ -1739,7 +1746,7 @@
st->build_date = _date;
- StationRect_BeforeAddRect(st, tile, w, h, true);
+ StationRect_BeforeAddRect(st, tile, w, h, RECT_MODE_TRY);
/* if airport was demolished while planes were en-route to it, the
* positions can no longer be the same (v->u.air.pos), since different
@@ -1974,7 +1981,7 @@
if (st->owner != OWNER_NONE && st->owner != _current_player)
return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
- if (!StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], false)) return CMD_ERROR;
+ if (!StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], RECT_MODE_TEST)) return CMD_ERROR;
if (st->dock_tile != 0) return_cmd_error(STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK);
} else {
@@ -2003,7 +2010,7 @@
st->build_date = _date;
- StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], true);
+ StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], RECT_MODE_TRY);
MakeDock(tile, st->owner, st->index, direction);
@@ -2915,7 +2922,7 @@
for (tile = 0; tile < MapSize(); tile++) {
if (GetTileType(tile) != MP_STATION) continue;
st = GetStationByTile(tile);
- StationRect_BeforeAddTile(st, tile, true);
+ StationRect_BeforeAddTile(st, tile, RECT_MODE_FORCE);
}
}
@@ -3165,7 +3172,7 @@
return (st->rect.left == 0 || st->rect.left > st->rect.right || st->rect.top > st->rect.bottom);
}
-static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, bool exec)
+static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode)
{
Rect *r = &st->rect;
int x = TileX(tile);
@@ -3181,13 +3188,13 @@
// check new rect dimensions against preset max
int w = new_rect.right - new_rect.left + 1;
int h = new_rect.bottom - new_rect.top + 1;
- if (w > _patches.station_spread || h > _patches.station_spread) {
- assert(!exec);
+ if (mode != RECT_MODE_FORCE && (w > _patches.station_spread || h > _patches.station_spread)) {
+ assert(mode != RECT_MODE_TRY);
_error_message = STR_306C_STATION_TOO_SPREAD_OUT;
return false;
}
// spread-out ok, return true
- if (exec) {
+ if (mode != RECT_MODE_TEST) {
// we should update the station rect
*r = new_rect;
}
@@ -3197,9 +3204,9 @@
return true;
}
-static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, bool exec)
+static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, StationRectMode mode)
{
- return StationRect_BeforeAddTile(st, tile, exec) && StationRect_BeforeAddTile(st, TILE_ADDXY(tile, w - 1, h - 1), exec);
+ return StationRect_BeforeAddTile(st, tile, mode) && StationRect_BeforeAddTile(st, TILE_ADDXY(tile, w - 1, h - 1), mode);
}
static inline bool ScanRectForStationTiles(StationID st_id, int left, int top, int right, int bottom)
--- a/strings.c Thu Dec 28 17:30:06 2006 +0000
+++ b/strings.c Fri Dec 29 10:13:35 2006 +0000
@@ -547,19 +547,19 @@
/* Unit conversions */
static const Units units[] = {
- { // Imperial (Original, mph, hp, metric ton, litre, metric ton force)
+ { // Imperial (Original, mph, hp, metric ton, litre, kN)
10, 4, STR_UNITS_VELOCITY_IMPERIAL,
1, 0, STR_UNITS_POWER_IMPERIAL,
1, 0, STR_UNITS_WEIGHT_SHORT_METRIC, STR_UNITS_WEIGHT_LONG_METRIC,
1000, 0, STR_UNITS_VOLUME_SHORT_METRIC, STR_UNITS_VOLUME_LONG_METRIC,
- 835, 13, STR_UNITS_FORCE_METRIC,
+ 1, 0, STR_UNITS_FORCE_SI,
},
- { // Metric (km/h, hp, metric ton, litre, metric ton force)
+ { // Metric (km/h, hp, metric ton, litre, kN)
1, 0, STR_UNITS_VELOCITY_METRIC,
1, 0, STR_UNITS_POWER_METRIC,
1, 0, STR_UNITS_WEIGHT_SHORT_METRIC, STR_UNITS_WEIGHT_LONG_METRIC,
1000, 0, STR_UNITS_VOLUME_SHORT_METRIC, STR_UNITS_VOLUME_LONG_METRIC,
- 835, 13, STR_UNITS_FORCE_METRIC,
+ 1, 0, STR_UNITS_FORCE_SI,
},
{ // SI (m/s, kilowatt, kilogram, cubic metres, kilonewton)
284, 10, STR_UNITS_VELOCITY_SI,
--- a/table/namegen.h Thu Dec 28 17:30:06 2006 +0000
+++ b/table/namegen.h Fri Dec 29 10:13:35 2006 +0000
@@ -1310,56 +1310,56 @@
static const char *name_polish_1_m[] = {
"Wielki ",
- "Maly ",
- "Zly ",
+ "Mały ",
+ "Zły ",
"Dobry ",
"Nowy ",
"Stary ",
- "Zloty ",
+ "Złoty ",
"Zielony ",
- "Bialy ",
+ "Biały ",
"Modry ",
- "Debowy "
+ "Dębowy "
};
static const char *name_polish_1_f[] = {
"Wielka ",
- "Mala ",
- "Zla ",
+ "Mała ",
+ "Zła ",
"Dobra ",
"Nowa ",
"Stara ",
- "Zlota ",
+ "Złota ",
"Zielona ",
- "Biala ",
+ "Biała ",
"Modra ",
- "Debowa "
+ "Dębowa "
};
static const char *name_polish_1_n[] = {
"Wielkie ",
- "Male ",
- "Zle ",
+ "Małe ",
+ "Złe ",
"Dobre ",
"Nowe ",
"Stare ",
- "Zlote ",
+ "Złote ",
"Zielone ",
- "Biale ",
+ "Białe ",
"Modre ",
- "Debowe "
+ "Dębowe "
};
static const char *name_polish_2_o[] = {
"Frombork",
"Gniezno",
"Olsztyn",
- "Torun",
+ "Toruń",
"Bydgoszcz",
"Terespol",
- "Krakow",
- "Poznan",
- "Wroclaw",
+ "Kraków",
+ "Poznań",
+ "Wrocław",
"Katowice",
"Cieszyn",
"Bytom",
@@ -1370,7 +1370,7 @@
"Malbork",
"Sopot",
"Sosnowiec",
- "Gdansk",
+ "Gdańsk",
"Gdynia",
"Sieradz",
"Sandomierz",
@@ -1378,7 +1378,7 @@
"Szczytno",
"Szczecin",
"Zakopane",
- "Szklarska Poreba",
+ "Szklarska Poręba",
"Bochnia",
"Golub-Dobrzyn",
"Chojnice",
@@ -1390,13 +1390,13 @@
static const char *name_polish_2_m[] = {
"Jarocin",
"Gogolin",
- "Tomaszow",
- "Piotrkow",
+ "Tomaszów",
+ "Piotrków",
"Lidzbark",
"Rypin",
"Radzymin",
- "Wolomin",
- "Pruszkow",
+ "Wołomin",
+ "Pruszków",
"Olsztynek",
"Rypin",
"Cisek",
@@ -1406,7 +1406,7 @@
"Lubicz",
"Milicz",
"Targ",
- "Ostrow",
+ "Ostrów",
"Ozimek",
"Puck",
"Rzepin",
@@ -1419,7 +1419,7 @@
"Strzepcz",
"Strzebielin",
"Sochaczew",
- "Grebocin",
+ "Grębocin",
"Gniew",
"Lubliniec",
"Lubasz",
@@ -1441,7 +1441,7 @@
static const char *name_polish_2_f[] = {
"Szprotawa",
"Pogorzelica",
- "Motlawa",
+ "Motława",
"Lubawa",
"Nidzica",
"Kruszwica",
@@ -1495,7 +1495,7 @@
"Braniewo",
"Sulinowo",
"Chmielno",
- "Jastrzebie",
+ "Jastrzębie",
"Gryfino",
"Koronowo",
"Lubichowo",
@@ -1504,98 +1504,98 @@
static const char *name_polish_3_m[] = {
" Wybudowanie",
- " Swietokrzyski",
- " Gorski",
+ " Świętokrzyski",
+ " Górski",
" Morski",
- " Zdroj",
+ " Zdrój",
" Wody",
" Bajoro",
- " Krajenski",
- " Slaski",
+ " Krajeński",
+ " Śląski",
" Mazowiecki",
" Pomorski",
" Wielki",
" Maly",
- " Warminski",
+ " Warmiński",
" Mazurski",
" Mniejszy",
- " Wiekszy",
- " Gorny",
+ " Większy",
+ " Górny",
" Dolny",
" Wielki",
" Stary",
" Nowy",
" Wielkopolski",
- " Wzgorze",
+ " Wzgórze",
" Mosty",
" Kujawski",
- " Malopolski",
+ " Małopolski",
" Podlaski",
" Lesny"
};
static const char *name_polish_3_f[] = {
" Wybudowanie",
- " Swietokrzyska",
- " Gorska",
+ " Świętokrzyska",
+ " Górska",
" Morska",
- " Zdroj",
+ " Zdrój",
" Woda",
" Bajoro",
- " Krajenska",
- " Slaska",
+ " Krajeńska",
+ " Śląska",
" Mazowiecka",
" Pomorska",
" Wielka",
- " Mala",
- " Warminska",
+ " Mała",
+ " Warmińska",
" Mazurska",
" Mniejsza",
- " Wieksza",
- " Gorna",
+ " Większa",
+ " Górna",
" Dolna",
" Wielka",
" Stara",
" Nowa",
" Wielkopolska",
- " Wzgorza",
+ " Wzgórza",
" Mosty",
" Kujawska",
" Malopolska",
" Podlaska",
- " Lesna"
+ " Leśna"
};
static const char *name_polish_3_n[] = {
" Wybudowanie",
- " Swietokrzyskie",
- " Gorskie",
+ " Świetokrzyskie",
+ " Górskie",
" Morskie",
- " Zdroj",
+ " Zdrój",
" Wody",
" Bajoro",
- " Krajenskie",
- " Slaskie",
+ " Krajeńskie",
+ " Śląskie",
" Mazowieckie",
" Pomorskie",
" Wielkie",
- " Male",
- " Warminskie ",
+ " Małe",
+ " Warmińskie ",
" Mazurskie ",
" Mniejsze",
- " Wieksze",
- " Gorne",
+ " Większe",
+ " Górne",
" Dolne",
" Wielkie",
" Stare",
" Nowe",
" Wielkopolskie",
- " Wzgorze",
+ " Wzgórze",
" Mosty",
" Kujawskie",
- " Malopolskie",
+ " Małopolskie",
" Podlaskie",
- " Lesne"
+ " Leśne"
};
static const char *name_czech_real[] = {
--- a/tunnel_map.h Thu Dec 28 17:30:06 2006 +0000
+++ b/tunnel_map.h Fri Dec 29 10:13:35 2006 +0000
@@ -26,6 +26,18 @@
return (TransportType)GB(_m[t].m5, 2, 2);
}
+static inline bool HasTunnelSnowOrDesert(TileIndex t)
+{
+ assert(IsTunnelTile(t));
+ return HASBIT(_m[t].m4, 7);
+}
+
+static inline void SetTunnelSnowOrDesert(TileIndex t, bool snow_or_desert)
+{
+ assert(IsTunnelTile(t));
+ SB(_m[t].m4, 7, 1, snow_or_desert);
+}
+
TileIndex GetOtherTunnelEnd(TileIndex);
bool IsTunnelInWay(TileIndex, uint z);
--- a/tunnelbridge_cmd.c Thu Dec 28 17:30:06 2006 +0000
+++ b/tunnelbridge_cmd.c Fri Dec 29 10:13:35 2006 +0000
@@ -801,7 +801,6 @@
static void DrawTile_TunnelBridge(TileInfo *ti)
{
uint32 image;
- bool ice = _m[ti->tile].m4 & 0x80;
if (IsTunnelTile(ti->tile)) {
if (GetTunnelTransportType(ti->tile) == TRANSPORT_RAIL) {
@@ -810,7 +809,7 @@
image = SPR_TUNNEL_ENTRY_REAR_ROAD;
}
- if (ice) image += 32;
+ if (HasTunnelSnowOrDesert(ti->tile)) image += 32;
image += GetTunnelDirection(ti->tile) * 2;
DrawGroundSprite(image);
@@ -820,6 +819,7 @@
DrawBridgeMiddle(ti);
} else if (IsBridgeTile(ti->tile)) { // XXX is this necessary?
int base_offset;
+ bool ice = HasBridgeSnowOrDesert(ti->tile);
if (GetBridgeTransportType(ti->tile) == TRANSPORT_RAIL) {
base_offset = GetRailTypeInfo(GetRailType(ti->tile))->bridge_offset;
@@ -1112,17 +1112,26 @@
static void TileLoop_TunnelBridge(TileIndex tile)
{
+ bool snow_or_desert = IsTunnelTile(tile) ? HasTunnelSnowOrDesert(tile) : HasBridgeSnowOrDesert(tile);
switch (_opt.landscape) {
case LT_HILLY:
- if (HASBIT(_m[tile].m4, 7) != (GetTileZ(tile) > _opt.snow_line)) {
- TOGGLEBIT(_m[tile].m4, 7);
+ if (snow_or_desert != (GetTileZ(tile) > _opt.snow_line)) {
+ if (IsTunnelTile(tile)) {
+ SetTunnelSnowOrDesert(tile, !snow_or_desert);
+ } else {
+ SetBridgeSnowOrDesert(tile, !snow_or_desert);
+ }
MarkTileDirtyByTile(tile);
}
break;
case LT_DESERT:
- if (GetTropicZone(tile) == TROPICZONE_DESERT && !(_m[tile].m4 & 0x80)) {
- _m[tile].m4 |= 0x80;
+ if (GetTropicZone(tile) == TROPICZONE_DESERT && !snow_or_desert) {
+ if (IsTunnelTile(tile)) {
+ SetTunnelSnowOrDesert(tile, true);
+ } else {
+ SetBridgeSnowOrDesert(tile, true);
+ }
MarkTileDirtyByTile(tile);
}
break;
--- a/video/dedicated_v.c Thu Dec 28 17:30:06 2006 +0000
+++ b/video/dedicated_v.c Fri Dec 29 10:13:35 2006 +0000
@@ -118,8 +118,7 @@
_screen.height = _cur_resolution[1];
_dedicated_video_mem = malloc(_cur_resolution[0]*_cur_resolution[1]);
- _debug_net_level = 6;
- _debug_misc_level = 0;
+ SetDebugString("net=6");
#ifdef WIN32
// For win32 we need to allocate a console (debug mode does the same)