simutrans-svn/based-on-svn-r3965.diff

   1 diff -ruN simutrans.orig/config.default simutrans/config.default
   2 --- simutrans.orig/config.default       1970-01-01 08:00:00.000000000 +0800
   3 +++ simutrans/config.default    2010-11-17 15:38:41.486667198 +0800
   4 @@ -0,0 +1,64 @@
   5 +#
   6 +# to compile:
   7 +# copy this file to config.default and adjust the settings
   8 +#
   9 +
  10 +#BACKEND = allegro
  11 +#BACKEND = gdi
  12 +#BACKEND = sdl
  13 +BACKEND = mixer_sdl
  14 +#BACKEND = x11
  15 +#BACKEND = posix
  16 +
  17 +#COLOUR_DEPTH = 0
  18 +#COLOUR_DEPTH = 8
  19 +COLOUR_DEPTH = 16
  20 +
  21 +#OSTYPE = beos
  22 +#OSTYPE = cygwin
  23 +#OSTYPE = freebsd
  24 +#OSTYPE = haiku
  25 +OSTYPE = linux
  26 +#OSTYPE = mingw
  27 +#OSTYPE = mac
  28 +
  29 +#DEBUG = 3    # Level 1-3, higher number means more debug-friendly, see Makefile
  30 +#OPTIMISE = 1 # Add umpteen optimisation flags
  31 +#PROFILE = 1
  32 +
  33 +#WITH_REVISION = 1 # adds the revision from svn; required for networkgames
  34 +# if you do not use SVN, add -DREVISION="1234" to the FLAGS below
  35 +
  36 +# Define these as empty strings, if you don't have the respective config program
  37 +#ALLEGRO_CONFIG = allegro-config
  38 +#PNG_CONFIG     = pkg-config libpng
  39 +#SDL_CONFIG     = sdl-config
  40 +
  41 +#VERBOSE = 1
  42 +
  43 +# The following useful conditional compilation flags exist
  44 +#
  45 +# Needed to compile:
  46 +# USE_C: no assembler for copying (required for not using GCC on x86)
  47 +# SIM_BIG_ENDIAN: MUST be set for PPC/Motorola byte order! (old mac, amiga)
  48 +#
  49 +# Changing appearance:
  50 +# USE_SOFTPOINTER: emulate mouse pointer (set automatically in Makefile)
  51 +# HALF_HEIGHT: Enables half height tiles (8 pixel instead 16)
  52 +#
  53 +# Useful for debugging:
  54 +# DEBUG_ROUTES: show routing calculation information in minimap
  55 +# SHOW_FORE_GRUND: show which objects are drawn as foreground
  56 +# DEBUG_FLUSH_BUFFER: show the dirty areas on the screen
  57 +#
  58 +# Following flags alter game engine (and are off for standard builds)
  59 +# OTTD_LIKE: Enables half height tiles and crossconnects all industries
  60 +# AUTOMATIC_BRIDGES and AUTOMATIC_TUNNELS: will be built also for player
  61 +# AUTOJOIN_PUBLIC: stations next to a public stop will be joined to it
  62 +# MAX_CHOOSE_BLOCK_TILES=xxx: maximum distance between choose signal and a
  63 +#    target (undefined means no limit)
  64 +# USE_DIFFERENT_WIND: different airplane approach directions over the map
  65 +# DESTINATION_CITYCARS: Citycars can have a destination (not recommended)
  66 +#
  67 +# In order to use the flags, add a line like this: (-Dxxx)
  68 +# FLAGS = -DUSE_C
  69 diff -ruN simutrans.orig/simmain.cc simutrans/simmain.cc
  70 --- simutrans.orig/simmain.cc   2010-11-17 15:38:31.880000533 +0800
  71 +++ simutrans/simmain.cc        2010-11-17 15:42:18.443333866 +0800
  72 @@ -404,8 +404,8 @@
  73                 strcat( umgebung_t::program_dir, path_sep );
  74         }
  75         else {
  76 -               strcpy( umgebung_t::program_dir, argv[0] );
  77 -               *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
  78 +               // data files are in /usr/share/simutrans
  79 +               strcpy( umgebung_t::program_dir, "/usr/share/simutrans/" );
  80
  81                 chdir( umgebung_t::program_dir );
  82         }
  83 diff -ruN simutrans.orig/utils/log.cc simutrans/utils/log.cc
  84 --- simutrans.orig/utils/log.cc 2010-11-17 15:38:31.826667199 +0800
  85 +++ simutrans/utils/log.cc      2010-11-17 15:38:41.486667198 +0800
  86 @@ -14,6 +14,8 @@
  87  #include "../simsys.h"
  88
  89
  90 +#define MAKEOBJ 1
  91 +
  92  #ifdef MAKEOBJ
  93  #define debuglevel (3)
  94