32bit Graphics Extra Zoom Patch

[xmirakulix]

Find the two separate patches attached.
I though strongly recommend that you check them, as I can't think of a way to test the ez.diff as it doesn't compile without the lookupcolor diff...

Is there any reason, why they are kept in separate files?
My knowledge of Mercurial patch queues isn't deep enough (in fact it's very shallow ), but can you there handle separate patches that mutually depend on each other?

[Lord Aro]

perhaps this will help: http://mercurial.selenic.com/wiki/MqTutorial

basically, due to the way the developers like each commit, large(r) patches should be split into separate logical parts. ...And the easiest way to do that when you don't have commit access/patch isn't finished is using a mercurial queue
(see the last few pages of the more height levels thread for similar discussions)

[Alberth]

basically, due to the way the developers like each commit, large(r) patches should be split into separate logical parts. ...

But we also demand that after each patch you can compile and play the game.
Having mutually dependent patches breaks that.

[ZxBiohazardZx]

git vs hg vs svn

gotta love it

[planetmaker]

git vs hg vs svn

gotta love it

Are you going to add something fruitful? Everyone is free to use the VCS of his or her choice, so where is your issue?

[Xotic750]

Here is my patch for r22998 and a copy of successful apply and compile on Fedora 14 for you to follow. I'm not a coder so there are no guarantees but it's working for me.

Code: Select all

[graham@xlaptop Downloads]$ git clone http://git.openttd.org/openttd/trunk.git/ openttd-git
Cloning into openttd-git...
[graham@xlaptop Downloads]$ cd openttd-git/
[graham@xlaptop openttd-git]$ git reset --hard f6340254aed933bd6eb9cfe2c13674e08e416544
HEAD is now at f634025 (svn r22998) -Add [FS#2521]: [NewGRF] Act2 var 0x62 to get curvature/position difference to the n-th vehicle in vehicle chain.
[graham@xlaptop openttd-git]$ patch -p1 -i ../ez_r22998_full.diff 
patching file src/blitter/32bpp_base.hpp
patching file src/blitter/32bpp_optimized.cpp
patching file src/blitter/32bpp_optimized.hpp
patching file src/blitter/base.hpp
patching file src/blitter/factory.hpp
patching file src/company_gui.cpp
patching file src/elrail.cpp
patching file src/gfx.cpp
patching file src/main_gui.cpp
patching file src/openttd.cpp
patching file src/rail_cmd.cpp
patching file src/road_cmd.cpp
patching file src/roadveh_cmd.cpp
patching file src/saveload/misc_sl.cpp
patching file src/sound.cpp
patching file src/sprite.h
patching file src/spritecache.cpp
patching file src/spritecache.h
patching file src/spriteloader/grf.cpp
patching file src/spriteloader/grf.hpp
patching file src/spriteloader/png.cpp
patching file src/spriteloader/png.hpp
patching file src/spriteloader/spriteloader.hpp
patching file src/table/misc_settings.ini
patching file src/table/sprites.h
patching file src/vehicle.cpp
patching file src/vehicle_gui.cpp
patching file src/viewport.cpp
patching file src/window.cpp
patching file src/zoom_type.h
[graham@xlaptop openttd-git]$ ./configure
checking awk... awk
detecting OS... UNIX
checking build system type... i686-redhat-linux
checking host system type... i686-redhat-linux
checking universal build... no
checking build cc... gcc
checking host cc... gcc
checking build c++... g++
checking host c++... g++
checking strip... disabled
checking builtin depend... yes
checking makedepend... disabled
detecting cpu-type... 32 bits
checking static... no
checking unicode... no
using debug level... no
using desync debug level... no
using link time optimization... no
checking OSX sysroot... not OSX, skipping
checking Allegro... not found
checking SDL... found
checking COCOA... not OSX, skipping
checking GDI video driver... not Windows, skipping
checking dedicated... not selected
checking console application... not Windows, skipping
checking network... found
checking ai... found
checking translator... no
checking assert... enabled
checking zlib... found
checking liblzma... found
checking lzo2... found
checking libpng... found
checking libfreetype... found
checking libfontconfig... found
checking libicu... found
checking psp-config... not PSP, skipping
checking libtimidity... found
checking direct-music... not Windows, skipping
checking sort... sort
checking endianess... AUTO
suppress language errors... no
checking stripping... skipped
checking distcc... no (only used when forced)
checking ccache... no (only used when forced)
checking OSX application bundle... not OSX, skipping
checking revision... git detection
checking iconv... not OSX, skipping
personal home directory... .openttd
shared data directory... none
installation directory... /
icon theme directory... share/icons/hicolor
manual page directory... share/man/man6
menu item directory... share/applications
using CFLAGS... -O2 -fomit-frame-pointer  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wformat=2 -Wredundant-decls -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -rdynamic -DUNIX -DWITH_SDL -I/usr/include/SDL  -D_REENTRANT -DWITH_ZLIB -DWITH_LZMA    -DWITH_LZO -I/home/graham/Downloads/openttd-git/src/3rdparty/squirrel/include -DENABLE_AI -DWITH_PNG  -I/usr/include/libpng12  -DWITH_FONTCONFIG    -DWITH_FREETYPE -I/usr/include/freetype2  -DWITH_ICU -D_REENTRANT -D_REENTRANT -I/usr/include   -DLIBTIMIDITY -DENABLE_NETWORK -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\".openttd\\" -DGLOBAL_DATA_DIR=\\"/usr/local/share/games/openttd\\"
using CXXFLAGS...  -std=gnu++0x
using LDFLAGS... -lstdc++ -lpthread -lc -lSDL -lpthread -lz -llzma    -llzo2 -L/usr/lib -lpng12  -lfontconfig    -lfreetype  -L/usr/lib  -licui18n -licuuc -licudata   -ltimidity  -rdynamic
Generating Makefile...
Generating menu item...
Generating lang/Makefile...
Generating setting/Makefile...
Generating grf/Makefile...
Generating objs/Makefile...
[graham@xlaptop openttd-git]$ make
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/lang'
[LANG] Compiling and Linking endian_check
[LANG] Testing endianness for host
[LANG] Compiling core/alloc_func.cpp
[LANG] Compiling string.cpp
[LANG] Compiling strgen/strgen.cpp
[LANG] Compiling getoptdata.cpp
[LANG] Compiling and Linking strgen
[LANG] Generating table/strings.h
[LANG] Compiling language afrikaans
[LANG] Compiling language arabic_egypt
[LANG] Compiling language belarusian
[LANG] Compiling language brazilian_portuguese
[LANG] Compiling language bulgarian
[LANG] Compiling language catalan
[LANG] Compiling language croatian
[LANG] Compiling language czech
[LANG] Compiling language danish
[LANG] Compiling language dutch
[LANG] Compiling language english
[LANG] Compiling language english_US
[LANG] Compiling language esperanto
[LANG] Compiling language estonian
[LANG] Compiling language finnish
[LANG] Compiling language french
[LANG] Compiling language galician
[LANG] Compiling language german
[LANG] Compiling language greek
[LANG] Compiling language hebrew
[LANG] Compiling language hungarian
[LANG] Compiling language icelandic
[LANG] Compiling language indonesian
[LANG] Compiling language irish
[LANG] Compiling language italian
[LANG] Compiling language japanese
[LANG] Compiling language korean
[LANG] Compiling language latvian
[LANG] Compiling language lithuanian
[LANG] Compiling language luxembourgish
[LANG] Compiling language malay
[LANG] Compiling language norwegian_bokmal
[LANG] Compiling language norwegian_nynorsk
[LANG] Compiling language polish
[LANG] Compiling language portuguese
[LANG] Compiling language romanian
[LANG] Compiling language russian
[LANG] Compiling language serbian
[LANG] Compiling language simplified_chinese
[LANG] Compiling language slovak
[LANG] Compiling language slovenian
[LANG] Compiling language spanish
[LANG] Compiling language swedish
[LANG] Compiling language traditional_chinese
[LANG] Compiling language turkish
[LANG] Compiling language ukrainian
[LANG] Compiling language vietnamese
[LANG] Compiling language welsh
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/lang'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/setting'
[SETTING] Compiling and Linking endian_check
[SETTING] Testing endianness for host
[SETTING] Compiling core/alloc_func.cpp
[SETTING] Compiling string.cpp
[SETTING] Compiling ini_load.cpp
[SETTING] Compiling settingsgen/settingsgen.cpp
[SETTING] Compiling getoptdata.cpp
[SETTING] Compiling and Linking settings_gen
[SETTING] Generating table/settings.h
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/setting'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/release'
[SRC] Compiling and Linking endian_check
[SRC] Testing endianness for target
[SRC] Compiling and linking depend
[SRC] DEP CHECK (all files)
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/release'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/release'
[SRC] Compiling 3rdparty/md5/md5.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdaux.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdmath.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqapi.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqbaselib.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqclass.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqcompiler.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqdebug.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqfuncstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqlexer.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqmem.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqobject.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqtable.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqvm.cpp
[SRC] Compiling ai/ai_config.cpp
[SRC] Compiling ai/ai_core.cpp
[SRC] Compiling ai/ai_gui.cpp
[SRC] Compiling ai/ai_info.cpp
[SRC] Compiling ai/ai_info_dummy.cpp
[SRC] Compiling ai/ai_instance.cpp
[SRC] Compiling ai/ai_scanner.cpp
[SRC] Compiling ai/api/ai_accounting.cpp
[SRC] Compiling ai/api/ai_airport.cpp
[SRC] Compiling ai/api/ai_base.cpp
[SRC] Compiling ai/api/ai_basestation.cpp
[SRC] Compiling ai/api/ai_bridge.cpp
[SRC] Compiling ai/api/ai_bridgelist.cpp
[SRC] Compiling ai/api/ai_cargo.cpp
[SRC] Compiling ai/api/ai_cargolist.cpp
[SRC] Compiling ai/api/ai_company.cpp
[SRC] Compiling ai/api/ai_controller.cpp
[SRC] Compiling ai/api/ai_date.cpp
[SRC] Compiling ai/api/ai_depotlist.cpp
[SRC] Compiling ai/api/ai_engine.cpp
[SRC] Compiling ai/api/ai_enginelist.cpp
[SRC] Compiling ai/api/ai_error.cpp
[SRC] Compiling ai/api/ai_event.cpp
[SRC] Compiling ai/api/ai_event_types.cpp
[SRC] Compiling ai/api/ai_execmode.cpp
[SRC] Compiling ai/api/ai_gamesettings.cpp
[SRC] Compiling ai/api/ai_group.cpp
[SRC] Compiling ai/api/ai_grouplist.cpp
[SRC] Compiling ai/api/ai_industry.cpp
[SRC] Compiling ai/api/ai_industrylist.cpp
[SRC] Compiling ai/api/ai_industrytype.cpp
[SRC] Compiling ai/api/ai_industrytypelist.cpp
[SRC] Compiling ai/api/ai_list.cpp
[SRC] Compiling ai/api/ai_log.cpp
[SRC] Compiling ai/api/ai_map.cpp
[SRC] Compiling ai/api/ai_marine.cpp
[SRC] Compiling ai/api/ai_object.cpp
[SRC] Compiling ai/api/ai_order.cpp
[SRC] Compiling ai/api/ai_rail.cpp
[SRC] Compiling ai/api/ai_railtypelist.cpp
[SRC] Compiling ai/api/ai_road.cpp
[SRC] Compiling ai/api/ai_sign.cpp
[SRC] Compiling ai/api/ai_signlist.cpp
[SRC] Compiling ai/api/ai_station.cpp
[SRC] Compiling ai/api/ai_stationlist.cpp
[SRC] Compiling ai/api/ai_subsidy.cpp
[SRC] Compiling ai/api/ai_subsidylist.cpp
[SRC] Compiling ai/api/ai_testmode.cpp
[SRC] Compiling ai/api/ai_tile.cpp
[SRC] Compiling ai/api/ai_tilelist.cpp
[SRC] Compiling ai/api/ai_town.cpp
[SRC] Compiling ai/api/ai_townlist.cpp
[SRC] Compiling ai/api/ai_tunnel.cpp
[SRC] Compiling ai/api/ai_vehicle.cpp
[SRC] Compiling ai/api/ai_vehiclelist.cpp
[SRC] Compiling ai/api/ai_waypoint.cpp
[SRC] Compiling ai/api/ai_waypointlist.cpp
[SRC] Compiling aircraft_cmd.cpp
[SRC] Compiling aircraft_gui.cpp
[SRC] Compiling airport.cpp
[SRC] Compiling airport_gui.cpp
[SRC] Compiling animated_tile.cpp
[SRC] Compiling articulated_vehicles.cpp
[SRC] Compiling autoreplace_cmd.cpp
[SRC] Compiling autoreplace.cpp
[SRC] Compiling autoreplace_gui.cpp
[SRC] Compiling blitter/32bpp_anim.cpp
[SRC] Compiling blitter/32bpp_base.cpp
[SRC] Compiling blitter/32bpp_optimized.cpp
[SRC] Compiling blitter/32bpp_simple.cpp
[SRC] Compiling blitter/8bpp_base.cpp
[SRC] Compiling blitter/8bpp_debug.cpp
[SRC] Compiling blitter/8bpp_optimized.cpp
[SRC] Compiling blitter/8bpp_simple.cpp
[SRC] Compiling blitter/base.cpp
[SRC] Compiling blitter/null.cpp
[SRC] Compiling bmp.cpp
[SRC] Compiling bridge_gui.cpp
[SRC] Compiling bridge_map.cpp
[SRC] Compiling build_vehicle_gui.cpp
[SRC] Compiling cargopacket.cpp
[SRC] Compiling cargotype.cpp
[SRC] Compiling cheat.cpp
[SRC] Compiling cheat_gui.cpp
[SRC] Compiling clear_cmd.cpp
[SRC] Compiling command.cpp
[SRC] Compiling company_cmd.cpp
[SRC] Compiling company_gui.cpp
[SRC] Compiling console_cmds.cpp
[SRC] Compiling console.cpp
[SRC] Compiling console_gui.cpp
[SRC] Compiling core/alloc_func.cpp
[SRC] Compiling core/bitmath_func.cpp
[SRC] Compiling core/geometry_func.cpp
[SRC] Compiling core/math_func.cpp
[SRC] Compiling core/pool_func.cpp
[SRC] Compiling core/random_func.cpp
[SRC] Compiling crashlog.cpp
[SRC] Compiling currency.cpp
[SRC] Compiling date.cpp
[SRC] Compiling date_gui.cpp
[SRC] Compiling debug.cpp
[SRC] Compiling dedicated.cpp
[SRC] Compiling depot_cmd.cpp
[SRC] Compiling depot.cpp
[SRC] Compiling depot_gui.cpp
[SRC] Compiling disaster_cmd.cpp
[SRC] Compiling dock_gui.cpp
[SRC] Compiling driver.cpp
[SRC] Compiling economy.cpp
[SRC] Compiling effectvehicle.cpp
[SRC] Compiling elrail.cpp
[SRC] Compiling engine.cpp
[SRC] Compiling engine_gui.cpp
[SRC] Compiling fileio.cpp
[SRC] Compiling fios.cpp
[SRC] Compiling fios_gui.cpp
[SRC] Compiling fontcache.cpp
[SRC] Compiling gamelog.cpp
[SRC] Compiling genworld.cpp
[SRC] Compiling genworld_gui.cpp
[SRC] Compiling gfx.cpp
[SRC] Compiling gfxinit.cpp
[SRC] Compiling graph_gui.cpp
[SRC] Compiling ground_vehicle.cpp
[SRC] Compiling group_cmd.cpp
[SRC] Compiling group_gui.cpp
[SRC] Compiling heightmap.cpp
[SRC] Compiling highscore.cpp
[SRC] Compiling highscore_gui.cpp
[SRC] Compiling hotkeys.cpp
[SRC] Compiling industry_cmd.cpp
[SRC] Compiling industry_gui.cpp
[SRC] Compiling ini.cpp
[SRC] Compiling ini_load.cpp
[SRC] Compiling intro_gui.cpp
[SRC] Compiling landscape.cpp
[SRC] Compiling main_gui.cpp
[SRC] Compiling map.cpp
[SRC] Compiling misc_cmd.cpp
[SRC] Compiling misc/countedobj.cpp
[SRC] Compiling misc.cpp
[SRC] Compiling misc/dbg_helpers.cpp
[SRC] Compiling misc/getoptdata.cpp
[SRC] Compiling misc_gui.cpp
[SRC] Compiling mixer.cpp
[SRC] Compiling music.cpp
[SRC] Compiling music/extmidi.cpp
[SRC] Compiling music_gui.cpp
[SRC] Compiling music/libtimidity.cpp
[SRC] Compiling music/null_m.cpp
[SRC] Compiling network/core/address.cpp
[SRC] Compiling network/core/core.cpp
[SRC] Compiling network/core/host.cpp
[SRC] Compiling network/core/packet.cpp
[SRC] Compiling network/core/tcp_admin.cpp
[SRC] Compiling network/core/tcp_connect.cpp
[SRC] Compiling network/core/tcp_content.cpp
[SRC] Compiling network/core/tcp.cpp
[SRC] Compiling network/core/tcp_game.cpp
[SRC] Compiling network/core/tcp_http.cpp
[SRC] Compiling network/core/udp.cpp
[SRC] Compiling network/network_admin.cpp
[SRC] Compiling network/network_chat_gui.cpp
[SRC] Compiling network/network_client.cpp
[SRC] Compiling network/network_command.cpp
[SRC] Compiling network/network_content.cpp
[SRC] Compiling network/network_content_gui.cpp
[SRC] Compiling network/network.cpp
[SRC] Compiling network/network_gamelist.cpp
[SRC] Compiling network/network_gui.cpp
[SRC] Compiling network/network_server.cpp
[SRC] Compiling network/network_udp.cpp
[SRC] Compiling newgrf_airport.cpp
[SRC] Compiling newgrf_airporttiles.cpp
[SRC] Compiling newgrf_canal.cpp
[SRC] Compiling newgrf_cargo.cpp
[SRC] Compiling newgrf_commons.cpp
[SRC] Compiling newgrf_config.cpp
[SRC] Compiling newgrf.cpp
[SRC] Compiling newgrf_debug_gui.cpp
[SRC] Compiling newgrf_engine.cpp
[SRC] Compiling newgrf_generic.cpp
[SRC] Compiling newgrf_gui.cpp
[SRC] Compiling newgrf_house.cpp
[SRC] Compiling newgrf_industries.cpp
[SRC] Compiling newgrf_industrytiles.cpp
[SRC] Compiling newgrf_object.cpp
[SRC] Compiling newgrf_railtype.cpp
[SRC] Compiling newgrf_sound.cpp
[SRC] Compiling newgrf_spritegroup.cpp
[SRC] Compiling newgrf_station.cpp
[SRC] Compiling newgrf_storage.cpp
[SRC] Compiling newgrf_text.cpp
[SRC] Compiling newgrf_town.cpp
[SRC] Compiling newgrf_townname.cpp
[SRC] Compiling news_gui.cpp
[SRC] Compiling object_cmd.cpp
[SRC] Compiling object_gui.cpp
[SRC] Compiling openttd.cpp
[SRC] Compiling order_backup.cpp
[SRC] Compiling order_cmd.cpp
[SRC] Compiling order_gui.cpp
[SRC] Compiling osk_gui.cpp
[SRC] Compiling os_timer.cpp
[SRC] Compiling os/unix/crashlog_unix.cpp
[SRC] Compiling os/unix/unix.cpp
[SRC] Compiling pathfinder/npf/aystar.cpp
[SRC] Compiling pathfinder/npf/npf.cpp
[SRC] Compiling pathfinder/npf/queue.cpp
[SRC] Compiling pathfinder/opf/opf_ship.cpp
[SRC] Compiling pathfinder/yapf/yapf_rail.cpp
[SRC] Compiling pathfinder/yapf/yapf_road.cpp
[SRC] Compiling pathfinder/yapf/yapf_ship.cpp
[SRC] Compiling pbs.cpp
[SRC] Compiling progress.cpp
[SRC] Compiling rail_cmd.cpp
[SRC] Compiling rail.cpp
[SRC] Compiling rail_gui.cpp
[SRC] Compiling rev.cpp
[SRC] Compiling road_cmd.cpp
[SRC] Compiling road.cpp
[SRC] Compiling road_gui.cpp
[SRC] Compiling road_map.cpp
[SRC] Compiling roadstop.cpp
[SRC] Compiling roadveh_cmd.cpp
[SRC] Compiling roadveh_gui.cpp
[SRC] Compiling saveload/afterload.cpp
[SRC] Compiling saveload/airport_sl.cpp
[SRC] Compiling saveload/ai_sl.cpp
[SRC] Compiling saveload/animated_tile_sl.cpp
[SRC] Compiling saveload/autoreplace_sl.cpp
[SRC] Compiling saveload/cargopacket_sl.cpp
[SRC] Compiling saveload/cheat_sl.cpp
[SRC] Compiling saveload/company_sl.cpp
[SRC] Compiling saveload/depot_sl.cpp
[SRC] Compiling saveload/economy_sl.cpp
[SRC] Compiling saveload/engine_sl.cpp
[SRC] Compiling saveload/gamelog_sl.cpp
[SRC] Compiling saveload/group_sl.cpp
[SRC] Compiling saveload/industry_sl.cpp
[SRC] Compiling saveload/labelmaps_sl.cpp
[SRC] Compiling saveload/map_sl.cpp
[SRC] Compiling saveload/misc_sl.cpp
[SRC] Compiling saveload/newgrf_sl.cpp
[SRC] Compiling saveload/object_sl.cpp
[SRC] Compiling saveload/oldloader.cpp
[SRC] Compiling saveload/oldloader_sl.cpp
[SRC] Compiling saveload/order_sl.cpp
[SRC] Compiling saveload/saveload.cpp
[SRC] Compiling saveload/signs_sl.cpp
[SRC] Compiling saveload/station_sl.cpp
[SRC] Compiling saveload/storage_sl.cpp
[SRC] Compiling saveload/strings_sl.cpp
[SRC] Compiling saveload/subsidy_sl.cpp
[SRC] Compiling saveload/town_sl.cpp
[SRC] Compiling saveload/vehicle_sl.cpp
[SRC] Compiling saveload/waypoint_sl.cpp
[SRC] Compiling screenshot.cpp
[SRC] Compiling script/script_info.cpp
[SRC] Compiling script/script_scanner.cpp
[SRC] Compiling script/squirrel.cpp
[SRC] Compiling script/squirrel_std.cpp
[SRC] Compiling sdl.cpp
[SRC] Compiling settings.cpp
[SRC] Compiling settings_gui.cpp
[SRC] Compiling ship_cmd.cpp
[SRC] Compiling ship_gui.cpp
[SRC] Compiling signal.cpp
[SRC] Compiling signs_cmd.cpp
[SRC] Compiling signs.cpp
[SRC] Compiling signs_gui.cpp
[SRC] Compiling smallmap_gui.cpp
[SRC] Compiling sound.cpp
[SRC] Compiling sound/null_s.cpp
[SRC] Compiling sound/sdl_s.cpp
[SRC] Compiling spritecache.cpp
[SRC] Compiling sprite.cpp
[SRC] Compiling spriteloader/grf.cpp
[SRC] Compiling spriteloader/png.cpp
[SRC] Compiling station_cmd.cpp
[SRC] Compiling station.cpp
[SRC] Compiling station_gui.cpp
[SRC] Compiling statusbar_gui.cpp
[SRC] Compiling string.cpp
[SRC] Compiling strings.cpp
[SRC] Compiling subsidy.cpp
[SRC] Compiling subsidy_gui.cpp
[SRC] Compiling terraform_cmd.cpp
[SRC] Compiling terraform_gui.cpp
[SRC] Compiling texteff.cpp
[SRC] Compiling tgp.cpp
[SRC] Compiling thread/thread_pthread.cpp
[SRC] Compiling tilearea.cpp
[SRC] Compiling tile_map.cpp
[SRC] Compiling timetable_cmd.cpp
[SRC] Compiling timetable_gui.cpp
[SRC] Compiling toolbar_gui.cpp
[SRC] Compiling town_cmd.cpp
[SRC] Compiling town_gui.cpp
[SRC] Compiling townname.cpp
[SRC] Compiling train_cmd.cpp
[SRC] Compiling train_gui.cpp
[SRC] Compiling transparency_gui.cpp
[SRC] Compiling tree_cmd.cpp
[SRC] Compiling tree_gui.cpp
[SRC] Compiling tunnelbridge_cmd.cpp
[SRC] Compiling tunnel_map.cpp
[SRC] Compiling vehicle_cmd.cpp
[SRC] Compiling vehicle.cpp
[SRC] Compiling vehicle_gui.cpp
[SRC] Compiling vehiclelist.cpp
[SRC] Compiling video/dedicated_v.cpp
[SRC] Compiling video/null_v.cpp
[SRC] Compiling video/sdl_v.cpp
[SRC] Compiling viewport.cpp
[SRC] Compiling viewport_gui.cpp
[SRC] Compiling void_cmd.cpp
[SRC] Compiling water_cmd.cpp
[SRC] Compiling waypoint_cmd.cpp
[SRC] Compiling waypoint.cpp
[SRC] Compiling waypoint_gui.cpp
[SRC] Compiling widget.cpp
[SRC] Compiling widgets/dropdown.cpp
[SRC] Compiling window.cpp
[SRC] Linking openttd
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/release'
[graham@xlaptop openttd-git]$

[Xotic750]

Ok, I couldn't get the latest official patch (r23236) to compile so again, here is my patch but for r23238. Same caveat as my last post

Code: Select all

[graham@xlaptop Downloads]$ git clone http://git.openttd.org/openttd/trunk.git/ openttd-git
Cloning into 'openttd-git'...
[graham@xlaptop Downloads]$ cd openttd-git/
[graham@xlaptop openttd-git]$ git reset --hard 66a8591e27690988d3a3ebbc5232b9ad00d944ee
HEAD is now at 66a8591 (svn r23238) -Update from WebTranslator v3.0:
[graham@xlaptop openttd-git]$ patch -p1 -i ../ez_r23238_full.diff 
patching file src/blitter/32bpp_base.hpp
patching file src/blitter/32bpp_optimized.cpp
patching file src/blitter/32bpp_optimized.hpp
patching file src/blitter/base.hpp
patching file src/blitter/factory.hpp
patching file src/company_gui.cpp
patching file src/elrail.cpp
patching file src/gfx.cpp
patching file src/main_gui.cpp
patching file src/openttd.cpp
patching file src/rail_cmd.cpp
patching file src/road_cmd.cpp
patching file src/roadveh_cmd.cpp
patching file src/saveload/misc_sl.cpp
patching file src/sound.cpp
patching file src/sprite.h
patching file src/spritecache.cpp
patching file src/spritecache.h
patching file src/spriteloader/grf.cpp
patching file src/spriteloader/grf.hpp
patching file src/spriteloader/png.cpp
patching file src/spriteloader/png.hpp
patching file src/spriteloader/spriteloader.hpp
patching file src/table/misc_settings.ini
patching file src/table/sprites.h
patching file src/vehicle.cpp
patching file src/vehicle_gui.cpp
patching file src/viewport.cpp
patching file src/window.cpp
patching file src/zoom_type.h
[graham@xlaptop openttd-git]$ ./configure 
checking awk... awk
detecting OS... UNIX
checking build system type... i686-redhat-linux
checking host system type... i686-redhat-linux
checking universal build... no
checking build cc... gcc
checking host cc... gcc
checking build c++... g++
checking host c++... g++
checking strip... disabled
checking builtin depend... yes
checking makedepend... disabled
detecting cpu-type... 32 bits
checking static... no
checking unicode... no
using debug level... no
using desync debug level... no
using link time optimization... no
checking OSX sysroot... not OSX, skipping
checking Allegro... not found
checking SDL... found
checking COCOA... not OSX, skipping
checking GDI video driver... not Windows, skipping
checking dedicated... not selected
checking console application... not Windows, skipping
checking network... found
checking ai... found
checking translator... no
checking assert... enabled
checking zlib... found
checking liblzma... found
checking lzo2... found
checking libpng... found
checking libfreetype... found
checking libfontconfig... found
checking libicu... found
checking psp-config... not PSP, skipping
checking libtimidity... found
checking direct-music... not Windows, skipping
checking sort... sort
checking endianess... AUTO
suppress language errors... no
checking stripping... skipped
checking distcc... no (only used when forced)
checking ccache... no (only used when forced)
checking OSX application bundle... not OSX, skipping
checking revision... git detection
checking iconv... not OSX, skipping
personal home directory... .openttd
shared data directory... none
installation directory... /
icon theme directory... share/icons/hicolor
manual page directory... share/man/man6
menu item directory... share/applications
using CFLAGS... -O2 -fomit-frame-pointer  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wformat=2 -Wredundant-decls -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -rdynamic -DUNIX -DWITH_SDL -I/usr/include/SDL  -D_REENTRANT -DWITH_ZLIB -DWITH_LZMA    -DWITH_LZO -I/home/graham/Downloads/openttd-git/src/3rdparty/squirrel/include -DENABLE_AI -DWITH_PNG  -I/usr/include/libpng12  -DWITH_FONTCONFIG    -DWITH_FREETYPE -I/usr/include/freetype2  -DWITH_ICU -D_REENTRANT  -I/usr/include   -DLIBTIMIDITY -DENABLE_NETWORK -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\".openttd\\" -DGLOBAL_DATA_DIR=\\"/usr/local/share/games/openttd\\"
using CXXFLAGS...  -std=gnu++0x
using LDFLAGS... -lstdc++ -lpthread -lc -lSDL -lpthread -lz -llzma    -llzo2 -L/usr/lib -lpng12  -lfontconfig    -lfreetype  -L/usr/lib  -licui18n -licuuc -licudata   -ltimidity  -rdynamic
Generating Makefile...
Generating menu item...
Generating lang/Makefile...
Generating setting/Makefile...
Generating grf/Makefile...
Generating objs/Makefile...
[graham@xlaptop openttd-git]$ make
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/lang'
[LANG] Compiling and Linking endian_check
[LANG] Testing endianness for host
[LANG] Compiling core/alloc_func.cpp
[LANG] Compiling string.cpp
[LANG] Compiling strgen/strgen.cpp
[LANG] Compiling getoptdata.cpp
[LANG] Compiling and Linking strgen
[LANG] Generating table/strings.h
[LANG] Compiling language afrikaans
[LANG] Compiling language arabic_egypt
[LANG] Compiling language belarusian
[LANG] Compiling language brazilian_portuguese
[LANG] Compiling language bulgarian
[LANG] Compiling language catalan
[LANG] Compiling language croatian
[LANG] Compiling language czech
[LANG] Compiling language danish
[LANG] Compiling language dutch
[LANG] Compiling language english
[LANG] Compiling language english_US
[LANG] Compiling language esperanto
[LANG] Compiling language estonian
[LANG] Compiling language finnish
[LANG] Compiling language french
[LANG] Compiling language galician
[LANG] Compiling language german
[LANG] Compiling language greek
[LANG] Compiling language hebrew
[LANG] Compiling language hungarian
[LANG] Compiling language icelandic
[LANG] Compiling language indonesian
[LANG] Compiling language irish
[LANG] Compiling language italian
[LANG] Compiling language japanese
[LANG] Compiling language korean
[LANG] Compiling language latvian
[LANG] Compiling language lithuanian
[LANG] Compiling language luxembourgish
[LANG] Compiling language malay
[LANG] Compiling language norwegian_bokmal
[LANG] Compiling language norwegian_nynorsk
[LANG] Compiling language polish
[LANG] Compiling language portuguese
[LANG] Compiling language romanian
[LANG] Compiling language russian
[LANG] Compiling language serbian
[LANG] Compiling language simplified_chinese
[LANG] Compiling language slovak
[LANG] Compiling language slovenian
[LANG] Compiling language spanish
[LANG] Compiling language swedish
[LANG] Compiling language traditional_chinese
[LANG] Compiling language turkish
[LANG] Compiling language ukrainian
[LANG] Compiling language vietnamese
[LANG] Compiling language welsh
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/lang'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/setting'
[SETTING] Compiling and Linking endian_check
[SETTING] Testing endianness for host
[SETTING] Compiling core/alloc_func.cpp
[SETTING] Compiling string.cpp
[SETTING] Compiling ini_load.cpp
[SETTING] Compiling settingsgen/settingsgen.cpp
[SETTING] Compiling getoptdata.cpp
[SETTING] Compiling and Linking settings_gen
[SETTING] Generating table/settings.h
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/setting'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
make[2]: Entering directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
[GRF] Assembling openttd.nfo
Error on sprite 9.
make[2]: *** [/home/graham/Downloads/openttd-git/objs/extra_grf/openttd.grf] Error 4
make[2]: Leaving directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/extra_grf'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/release'
[SRC] Compiling and Linking endian_check
[SRC] Testing endianness for target
[SRC] Compiling and linking depend
[SRC] DEP CHECK (all files)
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/release'
make[1]: Entering directory `/home/graham/Downloads/openttd-git/objs/release'
[SRC] Compiling 3rdparty/md5/md5.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdaux.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdmath.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqapi.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqbaselib.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqclass.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqcompiler.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqdebug.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqfuncstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqlexer.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqmem.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqobject.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqtable.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqvm.cpp
[SRC] Compiling ai/ai_config.cpp
[SRC] Compiling ai/ai_core.cpp
[SRC] Compiling ai/ai_gui.cpp
[SRC] Compiling ai/ai_info.cpp
[SRC] Compiling ai/ai_info_dummy.cpp
[SRC] Compiling ai/ai_instance.cpp
[SRC] Compiling ai/ai_scanner.cpp
[SRC] Compiling ai/api/ai_accounting.cpp
[SRC] Compiling ai/api/ai_airport.cpp
[SRC] Compiling ai/api/ai_base.cpp
[SRC] Compiling ai/api/ai_basestation.cpp
[SRC] Compiling ai/api/ai_bridge.cpp
[SRC] Compiling ai/api/ai_bridgelist.cpp
[SRC] Compiling ai/api/ai_cargo.cpp
[SRC] Compiling ai/api/ai_cargolist.cpp
[SRC] Compiling ai/api/ai_company.cpp
[SRC] Compiling ai/api/ai_controller.cpp
[SRC] Compiling ai/api/ai_date.cpp
[SRC] Compiling ai/api/ai_depotlist.cpp
[SRC] Compiling ai/api/ai_engine.cpp
[SRC] Compiling ai/api/ai_enginelist.cpp
[SRC] Compiling ai/api/ai_error.cpp
[SRC] Compiling ai/api/ai_event.cpp
[SRC] Compiling ai/api/ai_event_types.cpp
[SRC] Compiling ai/api/ai_execmode.cpp
[SRC] Compiling ai/api/ai_gamesettings.cpp
[SRC] Compiling ai/api/ai_group.cpp
[SRC] Compiling ai/api/ai_grouplist.cpp
[SRC] Compiling ai/api/ai_industry.cpp
[SRC] Compiling ai/api/ai_industrylist.cpp
[SRC] Compiling ai/api/ai_industrytype.cpp
[SRC] Compiling ai/api/ai_industrytypelist.cpp
[SRC] Compiling ai/api/ai_list.cpp
[SRC] Compiling ai/api/ai_log.cpp
[SRC] Compiling ai/api/ai_map.cpp
[SRC] Compiling ai/api/ai_marine.cpp
[SRC] Compiling ai/api/ai_object.cpp
[SRC] Compiling ai/api/ai_order.cpp
[SRC] Compiling ai/api/ai_rail.cpp
[SRC] Compiling ai/api/ai_railtypelist.cpp
[SRC] Compiling ai/api/ai_road.cpp
[SRC] Compiling ai/api/ai_sign.cpp
[SRC] Compiling ai/api/ai_signlist.cpp
[SRC] Compiling ai/api/ai_station.cpp
[SRC] Compiling ai/api/ai_stationlist.cpp
[SRC] Compiling ai/api/ai_subsidy.cpp
[SRC] Compiling ai/api/ai_subsidylist.cpp
[SRC] Compiling ai/api/ai_testmode.cpp
[SRC] Compiling ai/api/ai_tile.cpp
[SRC] Compiling ai/api/ai_tilelist.cpp
[SRC] Compiling ai/api/ai_town.cpp
[SRC] Compiling ai/api/ai_townlist.cpp
[SRC] Compiling ai/api/ai_tunnel.cpp
[SRC] Compiling ai/api/ai_vehicle.cpp
[SRC] Compiling ai/api/ai_vehiclelist.cpp
[SRC] Compiling ai/api/ai_waypoint.cpp
[SRC] Compiling ai/api/ai_waypointlist.cpp
[SRC] Compiling aircraft_cmd.cpp
[SRC] Compiling aircraft_gui.cpp
[SRC] Compiling airport.cpp
[SRC] Compiling airport_gui.cpp
[SRC] Compiling animated_tile.cpp
[SRC] Compiling articulated_vehicles.cpp
[SRC] Compiling autoreplace_cmd.cpp
[SRC] Compiling autoreplace.cpp
[SRC] Compiling autoreplace_gui.cpp
[SRC] Compiling blitter/32bpp_anim.cpp
[SRC] Compiling blitter/32bpp_base.cpp
[SRC] Compiling blitter/32bpp_optimized.cpp
[SRC] Compiling blitter/32bpp_simple.cpp
[SRC] Compiling blitter/8bpp_base.cpp
[SRC] Compiling blitter/8bpp_debug.cpp
[SRC] Compiling blitter/8bpp_optimized.cpp
[SRC] Compiling blitter/8bpp_simple.cpp
[SRC] Compiling blitter/base.cpp
[SRC] Compiling blitter/null.cpp
[SRC] Compiling bmp.cpp
[SRC] Compiling bridge_gui.cpp
[SRC] Compiling bridge_map.cpp
[SRC] Compiling build_vehicle_gui.cpp
[SRC] Compiling cargopacket.cpp
[SRC] Compiling cargotype.cpp
[SRC] Compiling cheat.cpp
[SRC] Compiling cheat_gui.cpp
[SRC] Compiling clear_cmd.cpp
[SRC] Compiling command.cpp
[SRC] Compiling company_cmd.cpp
[SRC] Compiling company_gui.cpp
[SRC] Compiling console_cmds.cpp
[SRC] Compiling console.cpp
[SRC] Compiling console_gui.cpp
[SRC] Compiling core/alloc_func.cpp
[SRC] Compiling core/bitmath_func.cpp
[SRC] Compiling core/geometry_func.cpp
[SRC] Compiling core/math_func.cpp
[SRC] Compiling core/pool_func.cpp
[SRC] Compiling core/random_func.cpp
[SRC] Compiling crashlog.cpp
[SRC] Compiling currency.cpp
[SRC] Compiling date.cpp
[SRC] Compiling date_gui.cpp
[SRC] Compiling debug.cpp
[SRC] Compiling dedicated.cpp
[SRC] Compiling depot_cmd.cpp
[SRC] Compiling depot.cpp
[SRC] Compiling depot_gui.cpp
[SRC] Compiling disaster_cmd.cpp
[SRC] Compiling dock_gui.cpp
[SRC] Compiling driver.cpp
[SRC] Compiling economy.cpp
[SRC] Compiling effectvehicle.cpp
[SRC] Compiling elrail.cpp
[SRC] Compiling engine.cpp
[SRC] Compiling engine_gui.cpp
[SRC] Compiling fileio.cpp
[SRC] Compiling fios.cpp
[SRC] Compiling fios_gui.cpp
[SRC] Compiling fontcache.cpp
[SRC] Compiling gamelog.cpp
[SRC] Compiling genworld.cpp
[SRC] Compiling genworld_gui.cpp
[SRC] Compiling gfx.cpp
[SRC] Compiling gfxinit.cpp
[SRC] Compiling graph_gui.cpp
[SRC] Compiling ground_vehicle.cpp
[SRC] Compiling group_cmd.cpp
[SRC] Compiling group_gui.cpp
[SRC] Compiling heightmap.cpp
[SRC] Compiling highscore.cpp
[SRC] Compiling highscore_gui.cpp
[SRC] Compiling hotkeys.cpp
[SRC] Compiling industry_cmd.cpp
[SRC] Compiling industry_gui.cpp
[SRC] Compiling ini.cpp
[SRC] Compiling ini_load.cpp
[SRC] Compiling intro_gui.cpp
[SRC] Compiling landscape.cpp
[SRC] Compiling main_gui.cpp
[SRC] Compiling map.cpp
[SRC] Compiling misc_cmd.cpp
[SRC] Compiling misc/countedobj.cpp
[SRC] Compiling misc.cpp
[SRC] Compiling misc/dbg_helpers.cpp
[SRC] Compiling misc/getoptdata.cpp
[SRC] Compiling misc_gui.cpp
[SRC] Compiling mixer.cpp
[SRC] Compiling music.cpp
[SRC] Compiling music/extmidi.cpp
[SRC] Compiling music_gui.cpp
[SRC] Compiling music/libtimidity.cpp
[SRC] Compiling music/null_m.cpp
[SRC] Compiling network/core/address.cpp
[SRC] Compiling network/core/core.cpp
[SRC] Compiling network/core/host.cpp
[SRC] Compiling network/core/packet.cpp
[SRC] Compiling network/core/tcp_admin.cpp
[SRC] Compiling network/core/tcp_connect.cpp
[SRC] Compiling network/core/tcp_content.cpp
[SRC] Compiling network/core/tcp.cpp
[SRC] Compiling network/core/tcp_game.cpp
[SRC] Compiling network/core/tcp_http.cpp
[SRC] Compiling network/core/udp.cpp
[SRC] Compiling network/network_admin.cpp
[SRC] Compiling network/network_chat_gui.cpp
[SRC] Compiling network/network_client.cpp
[SRC] Compiling network/network_command.cpp
[SRC] Compiling network/network_content.cpp
[SRC] Compiling network/network_content_gui.cpp
[SRC] Compiling network/network.cpp
[SRC] Compiling network/network_gamelist.cpp
[SRC] Compiling network/network_gui.cpp
[SRC] Compiling network/network_server.cpp
[SRC] Compiling network/network_udp.cpp
[SRC] Compiling newgrf_airport.cpp
[SRC] Compiling newgrf_airporttiles.cpp
[SRC] Compiling newgrf_canal.cpp
[SRC] Compiling newgrf_cargo.cpp
[SRC] Compiling newgrf_commons.cpp
[SRC] Compiling newgrf_config.cpp
[SRC] Compiling newgrf.cpp
[SRC] Compiling newgrf_debug_gui.cpp
[SRC] Compiling newgrf_engine.cpp
[SRC] Compiling newgrf_generic.cpp
[SRC] Compiling newgrf_gui.cpp
[SRC] Compiling newgrf_house.cpp
[SRC] Compiling newgrf_industries.cpp
[SRC] Compiling newgrf_industrytiles.cpp
[SRC] Compiling newgrf_object.cpp
[SRC] Compiling newgrf_railtype.cpp
[SRC] Compiling newgrf_sound.cpp
[SRC] Compiling newgrf_spritegroup.cpp
[SRC] Compiling newgrf_station.cpp
[SRC] Compiling newgrf_storage.cpp
[SRC] Compiling newgrf_text.cpp
[SRC] Compiling newgrf_town.cpp
[SRC] Compiling newgrf_townname.cpp
[SRC] Compiling news_gui.cpp
[SRC] Compiling object_cmd.cpp
[SRC] Compiling object_gui.cpp
[SRC] Compiling openttd.cpp
[SRC] Compiling order_backup.cpp
[SRC] Compiling order_cmd.cpp
[SRC] Compiling order_gui.cpp
[SRC] Compiling osk_gui.cpp
[SRC] Compiling os_timer.cpp
[SRC] Compiling os/unix/crashlog_unix.cpp
[SRC] Compiling os/unix/unix.cpp
[SRC] Compiling pathfinder/npf/aystar.cpp
[SRC] Compiling pathfinder/npf/npf.cpp
[SRC] Compiling pathfinder/npf/queue.cpp
[SRC] Compiling pathfinder/opf/opf_ship.cpp
[SRC] Compiling pathfinder/yapf/yapf_rail.cpp
[SRC] Compiling pathfinder/yapf/yapf_road.cpp
[SRC] Compiling pathfinder/yapf/yapf_ship.cpp
[SRC] Compiling pbs.cpp
[SRC] Compiling progress.cpp
[SRC] Compiling rail_cmd.cpp
[SRC] Compiling rail.cpp
[SRC] Compiling rail_gui.cpp
[SRC] Compiling rev.cpp
[SRC] Compiling road_cmd.cpp
[SRC] Compiling road.cpp
[SRC] Compiling road_gui.cpp
[SRC] Compiling road_map.cpp
[SRC] Compiling roadstop.cpp
[SRC] Compiling roadveh_cmd.cpp
[SRC] Compiling roadveh_gui.cpp
[SRC] Compiling saveload/afterload.cpp
[SRC] Compiling saveload/airport_sl.cpp
[SRC] Compiling saveload/ai_sl.cpp
[SRC] Compiling saveload/animated_tile_sl.cpp
[SRC] Compiling saveload/autoreplace_sl.cpp
[SRC] Compiling saveload/cargopacket_sl.cpp
[SRC] Compiling saveload/cheat_sl.cpp
[SRC] Compiling saveload/company_sl.cpp
[SRC] Compiling saveload/depot_sl.cpp
[SRC] Compiling saveload/economy_sl.cpp
[SRC] Compiling saveload/engine_sl.cpp
[SRC] Compiling saveload/gamelog_sl.cpp
[SRC] Compiling saveload/group_sl.cpp
[SRC] Compiling saveload/industry_sl.cpp
[SRC] Compiling saveload/labelmaps_sl.cpp
[SRC] Compiling saveload/map_sl.cpp
[SRC] Compiling saveload/misc_sl.cpp
[SRC] Compiling saveload/newgrf_sl.cpp
[SRC] Compiling saveload/object_sl.cpp
[SRC] Compiling saveload/oldloader.cpp
[SRC] Compiling saveload/oldloader_sl.cpp
[SRC] Compiling saveload/order_sl.cpp
[SRC] Compiling saveload/saveload.cpp
[SRC] Compiling saveload/signs_sl.cpp
[SRC] Compiling saveload/station_sl.cpp
[SRC] Compiling saveload/storage_sl.cpp
[SRC] Compiling saveload/strings_sl.cpp
[SRC] Compiling saveload/subsidy_sl.cpp
[SRC] Compiling saveload/town_sl.cpp
[SRC] Compiling saveload/vehicle_sl.cpp
[SRC] Compiling saveload/waypoint_sl.cpp
[SRC] Compiling screenshot.cpp
[SRC] Compiling script/script_info.cpp
[SRC] Compiling script/script_scanner.cpp
[SRC] Compiling script/squirrel.cpp
[SRC] Compiling script/squirrel_std.cpp
[SRC] Compiling sdl.cpp
[SRC] Compiling settings.cpp
[SRC] Compiling settings_gui.cpp
[SRC] Compiling ship_cmd.cpp
[SRC] Compiling ship_gui.cpp
[SRC] Compiling signal.cpp
[SRC] Compiling signs_cmd.cpp
[SRC] Compiling signs.cpp
[SRC] Compiling signs_gui.cpp
[SRC] Compiling smallmap_gui.cpp
[SRC] Compiling sound.cpp
[SRC] Compiling sound/null_s.cpp
[SRC] Compiling sound/sdl_s.cpp
[SRC] Compiling spritecache.cpp
[SRC] Compiling sprite.cpp
[SRC] Compiling spriteloader/grf.cpp
[SRC] Compiling spriteloader/png.cpp
[SRC] Compiling station_cmd.cpp
[SRC] Compiling station.cpp
[SRC] Compiling station_gui.cpp
[SRC] Compiling statusbar_gui.cpp
[SRC] Compiling string.cpp
[SRC] Compiling strings.cpp
[SRC] Compiling subsidy.cpp
[SRC] Compiling subsidy_gui.cpp
[SRC] Compiling terraform_cmd.cpp
[SRC] Compiling terraform_gui.cpp
[SRC] Compiling texteff.cpp
[SRC] Compiling tgp.cpp
[SRC] Compiling thread/thread_pthread.cpp
[SRC] Compiling tilearea.cpp
[SRC] Compiling tile_map.cpp
[SRC] Compiling timetable_cmd.cpp
[SRC] Compiling timetable_gui.cpp
[SRC] Compiling toolbar_gui.cpp
[SRC] Compiling town_cmd.cpp
[SRC] Compiling town_gui.cpp
[SRC] Compiling townname.cpp
[SRC] Compiling train_cmd.cpp
[SRC] Compiling train_gui.cpp
[SRC] Compiling transparency_gui.cpp
[SRC] Compiling tree_cmd.cpp
[SRC] Compiling tree_gui.cpp
[SRC] Compiling tunnelbridge_cmd.cpp
[SRC] Compiling tunnel_map.cpp
[SRC] Compiling vehicle_cmd.cpp
[SRC] Compiling vehicle.cpp
[SRC] Compiling vehicle_gui.cpp
[SRC] Compiling vehiclelist.cpp
[SRC] Compiling video/dedicated_v.cpp
[SRC] Compiling video/null_v.cpp
[SRC] Compiling video/sdl_v.cpp
[SRC] Compiling viewport.cpp
[SRC] Compiling viewport_gui.cpp
[SRC] Compiling void_cmd.cpp
[SRC] Compiling water_cmd.cpp
[SRC] Compiling waypoint_cmd.cpp
[SRC] Compiling waypoint.cpp
[SRC] Compiling waypoint_gui.cpp
[SRC] Compiling widget.cpp
[SRC] Compiling widgets/dropdown.cpp
[SRC] Compiling window.cpp
[SRC] Linking openttd
make[1]: Leaving directory `/home/graham/Downloads/openttd-git/objs/release'
[graham@xlaptop openttd-git]$ 

[Lord Aro]

great work there

however, could you try to keep the patches separate? it's much easier to update the main repo if done that way

[Xotic750]

You mean a separate patch file for each file changed in the project? If so, I don't know how to do that. I usually issue a "git diff" command and it produces a single patch file for all the differences in the project. If you can give me the git command to use then I will give it a try, but it seems strange to want to split a patch into multiple patch files from what experience I have on the subject :/

[Lord Aro]

i am unfamiliar with git, but google should help you

"mercurial queue in git" may work

EDIT: try this: http://stackoverflow.com/questions/9526 ... t-to-hg-mq

[Xotic750]

I still don't really understand what you are looking for. The patches that I have obtained from the ez patch repo (web interface) are a single patch/diff which I then apply to the OTTD master branch at a particular tip/revision, I have then fast forwarded them to a later tip/revision and made a few manual changes when a difference fails to apply cleanly. I have then created a patch/diff of the project showing the changes between those that I have now in my working directory and the master branch of OTTD at the fast forwarded tip/revision, which produces a single patch/diff just like I originally obtained and applied. Can you give me an example of what you are expecting as I'm a little confused. Perhaps this is something particular to Mercurial and it's patching queue? (I have no knowledge of Mercurial and I don't really want to change from using Git and Patch commands)

EDIT: Looking at my history, I actually got the ez full diff file from this thread and have been fast forwarding from that (http://www.tt-forums.net/viewtopic.php? ... 00#p973583)

EDIT2: Here's my fast forward to r23292 (900b244ffd64d048ce0338fa5d5840c6123ce10d)

[Lord Aro]

This repo here:

http://hg.openttdcoop.org/32bpp-ez-patches/

Actually, it seems a extra zoom part made it to trunk, so the patch is entirely broken now

[Xotic750]

No problem, here is my fast forward r23313 (76f6bd8cfd22d0a40bfa280e4b2774684713c962)

It would be really good if the whole zoom feature makes it into the trunk and there is no longer a need for the patch, though I guess there would be some cleaning up to do as the patch is a little bit of a hack from what I can tell (but a fantastic hack, especially for colour blind people like me)

[Xotic750]

Having just compiled the latest build (r23322), it seems the trunk now performs extra zoom but it is not using 32bpp sprites. I'm guessing that will come soon. But it's excellent to see that the extra zoom functionality is finally making it into the trunk, great work!

[planetmaker]

Having just compiled the latest build (r23322), it seems the trunk now performs extra zoom but it is not using 32bpp sprites. I'm guessing that will come soon. But it's excellent to see that the extra zoom functionality is finally making it into the trunk, great work!

Trunk uses 32bpp sprites just fine. Same as it does for years. Literally.

What it does not yet do, is use specific sprites for individual zoom-levels.

[Xotic750]

Thanks for that. I guess I should have written "extra zoom sprites" instead of "32bpp sprites"

It really is great work and I'm so glad to see it coming! Thank you!

[bogus1977]

hello
i stoped playing openttd one or 2 year's ago. now i went back and wondered how many work some of u still do for this nice game. THNX!!!

the reason y i came back was searching 'more zoom', because the original is not enough for my bad eyes. so i found out 32bpp with extra/full zoom.
as i read in this thread the extra zoom was added to the trunk. so i installed the trunk because the last ez-patch version is 1.0.1 or so.
the extra zoom works finde. but i get only the original sprites. not the better resolution.

i installed the graphics as told in den wiki http://wiki.openttd.org/Extra_Zoom
downloaded nightly 32bpp graphic files and put the tar into the data dir.
downloaded the 32bpp_extra nightly r40.
in the game newGRF settings i could activate the r40. but nothing else. should there appear 2 new entries?

or must i add some blitter tag to openttd.exe?

(havent found any working howto for the trunk with extra zoom)

[planetmaker]

I suggest to grab a recent nightly. There you have "extra zoom" without any additional effort. The only thing you'll not get so far specific graphics for the 2x zoomed-in state. In order to enjoy the 32bpp sprites you'll have to use a 32bpp blitter, preferentially the 32bpp-anim blitter. Mind that sadly enough still far from all sprites exist in a 32bpp version, even if you grab all 32bpp sprites you can get hold of anywhere.

[bogus1977]

thank you for your fast answer.
what would happen if there are some 32bpp sprites missing?
error's? or just some sprites which are not displayed?


edit: i added
X:\OpenTTD\openttd.exe -b 32bpp-anim
but it still seems the zoom sprites do not work......
any ideas what i may have done wrong?

[Yexo]

but it still seems the zoom sprites do not work......
any ideas what i may have done wrong?

Nothing:

...The only thing you'll not get so far specific graphics for the 2x zoomed-in state

In other words: Support for the zoomed-in sprites is not yet done.