Commit Graph

247 Commits

Author SHA1 Message Date
rubidium
670f191c43 (svn r6104) -Fix: make install did not create a directory for the heightmaps
-Fix: make install should not copy scenario as it is an empty map
2006-08-24 22:04:24 +00:00
truelight
76bcaba601 (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater) 2006-08-24 12:08:25 +00:00
truelight
f73b17323e (svn r5978) -Add: allow a switch in Makefile.config to disable threads in OpenTTD (no matter what system you are on). Only useful for testing. 2006-08-20 13:48:04 +00:00
truelight
10b842bddc (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
- New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings
2006-08-19 10:00:30 +00:00
tron
fa5564db13 (svn r5923) Fix 'make depend' which was broken in r3574 (it just did nothing) 2006-08-16 06:05:44 +00:00
rubidium
243872b4fd (svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
-Cleanup: fix whitespace related coding style issues in date.[ch]
-Cleanup: make original comments doxygen compatible and remove/change outdated comments
2006-08-14 14:21:15 +00:00
Darkvater
b1b0b26fc8 (svn r5872) - Feature: Add an icon to the SDL openttd executable. 2006-08-13 08:18:11 +00:00
Darkvater
ee7b3de2f5 (svn r5764) - Cleanup: - Cleanup: Move the now unified FiosAlloc, compare_FiosItems, FiosFreeSavegameList, FiosMakeSavegameName, FiosDelete and FileExists to newly created file fios.c where it belongs.
- Fix: forgot to remove GetLanguageList from functions.h in previous commit
2006-08-05 00:16:24 +00:00
truelight
97c2d3d764 (svn r5493) -Fix: 'grep -o' isn't supported on all targets. 'sed' is, so use thatone (tokai) 2006-07-13 18:34:45 +00:00
belugas
94692a2905 (svn r5464) [Behaviour Fix] : When starting the game, the system will now verify the presence of music files in gm forlder.
A song can now be removed from the programmed list (in custom list 1 and 2) by clicking on it.
Added music.c[ch] files, to make it all a bit cleaner.
Now, the name of the gm file is associated with the title of the song.
2006-07-07 02:44:51 +00:00
truelight
7e5d4a88a1 (svn r5456) -Fix: detect the version of the TARGET, not the HOST please 2006-07-04 13:51:17 +00:00
peter1138
5c88a9745a (svn r5426) - Makefile: Make the configure script work properly for setting target compilers; Set CC_TARGET / CXX_TARGET
up the same way as CC_HOST / CXX_HOST, and add or fix their options within the configure script. In the 
Makefile, instead of overriding CC / CXX with the target compilers if they are set, set the target compilers 
with the default compilers if none are set (bit of a mouthful), and use the target compilers explicitly.
2006-06-29 07:19:24 +00:00
peter1138
da4d1aa292 (svn r5197) - Use svn info to automatically find the last modified revision number and get branch information and place it in the revision string. Increase NETWORK_REVISION_LENGTH to accommodate the branch tag. 2006-06-09 14:40:30 +00:00
bjarni
a5a9b01452 (svn r4997) -Fix: [OSX] reverted the OSX part of rev 4994 as it caused dyld (lib) crashes
now OSX strips after linking again
2006-05-27 23:16:37 +00:00
truelight
74e8c30aa6 (svn r4994) -Fix: changed the stripping parts a bit. OSX is no longer an exeption 2006-05-27 20:51:57 +00:00
truelight
d446915a45 (svn r4993) -Fix: if 1 file is C++, link the whole project with g++ 2006-05-27 20:22:20 +00:00
truelight
08c5ee6edc (svn r4991) -Fix: don't compile UNITTEST by default, it isn't needed
-Fix: do not use hardcoded names for things like 'strip', keep it configurable!!
2006-05-27 18:17:10 +00:00
truelight
49526b594f (svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm 2006-05-27 17:51:11 +00:00
KUDr
5e73dce0e7 (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing. 2006-05-27 16:12:16 +00:00
belugas
a102163239 (svn r4902) Newgrf : Introduction of the newgrf_cargo files.
Clearing engine and newgrf_engine from cargo related structures.
Apart from moving stuff cargo related, there is nothing really newcargo for now.
2006-05-18 02:43:23 +00:00
peter1138
c768bfbba5 (svn r4733) - NewGRF: remove remnants of old resolver code. 2006-05-04 03:38:09 +00:00
celestar
a732a0daee (svn r4516) -Fix: Committed one file too much. Thanks egladil for immidiate spotting 2006-04-22 05:42:54 +00:00
celestar
a18e9ccf27 (svn r4515) -Codechange: TPFMode2 is currently only used for TRANSPORT_WATER. So remove all stuff that deals with other transport types and assert TRANSPORT_WATER 2006-04-22 05:36:22 +00:00
belugas
aab91d287a (svn r4493) Newgrf : Action 04. Beginning of implementation.
Some TODOs left, but the core is there.
Thanks to Peter1138 for code, advice and patience
And to Patchman for letting us define a lot of langids :)
2006-04-21 03:00:20 +00:00
peter1138
92d8af75db (svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
reduces the amount of house keeping we do and the chance of memory 
leaks.
2006-04-20 20:51:57 +00:00
Darkvater
ebaafb9026 (svn r4220) - Fix (r4219): of course iconv is enabled on >= 10.3 not >; fixed comment (thanks Bjarni) 2006-03-31 21:34:02 +00:00
Darkvater
fdf4fa45ad (svn r4219) - Add support for WITH_ICONV. It is enabled by default for OSX > 10.3 for all others set it with WITH_ICONV in Makefile.config or with --with-iconv with configure. --with-config=/somedir will search for iconv include files somewhere (or in Makefile.config with WITH_ICONV_PATH). Custom library loading is not (yet) supported 2006-03-31 21:22:41 +00:00
peter1138
92c4d26a26 (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG 2006-03-31 21:06:55 +00:00
bjarni
3b4b577107 (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all 2006-03-31 10:04:18 +00:00
bjarni
1a56b830c0 (svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore
This should hopefully fix the issue where WITH_SDL can be defined while SDL-CONFIG is not
	Added an error if WITH_SDL is defined but SDL-CONFIG is not. The same goes for WITH_PNG even though nobody reported this as a problem
	removed STATIC_ZLIB_PATH as it turns out that nobody used it
2006-03-30 20:14:06 +00:00
celestar
a7d8ad0004 (svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas. 2006-03-29 16:30:26 +00:00
bjarni
9c96bcb997 (svn r4149) -Codechange: [OSX] rewrite of how universal binaries are compiled
Now OSX stores object files in .OSX and instead of making FAT object files, there are one for each architecture
	Each architecture got their own targets to make a non-FAT binary and in the end, lipo will merge them into one binary

	It's now possible to select which architectures you want to support by defining OTTD_PPC, OTTD_PPC970 (G5) and/or OTTD_i386
	All combos are supported. UNIVERSAL_BINARY and TRIPLE_BINARY can still be used even though it's possible to gain the same result by using the new flags
	Making a universal build when you already got part of it compiled (say the PPC part), it will reuse it and only compile the i386 part to save time
	Note: in some cases when you switch flags, you risk that openttd is not updated. Delete it and try again. The Makefile can't solve this except if it forces linking each time

	This fixes: FS#87 universal binary building borked in 0.4.7
	Now universal binaries work on OSX 10.3.9 again

	Building universal binaries no longer needs to store flags in Makefile.config as the new design makes it possible to figure everything out automatically
2006-03-29 16:28:41 +00:00
Darkvater
a91c52e169 (svn r4125) - Feature: Add a general TIC() TOC() mechanism using rdtsc or something similar on non-i386 architectures to performance-tune (critical) code. Some systems are probably missing, but those can be added later. 2006-03-26 21:15:09 +00:00
celestar
3770ad0637 (svn r4113) Moved all relevant map functions for stations to station_map.[ch]
Some work with animated tiles remains. Thanks to Tron for parts of the code and lots of proof-reading and suggesting
2006-03-26 14:41:39 +00:00
tron
742e806d73 (svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover. 2006-03-24 06:40:49 +00:00
bjarni
10936e7034 (svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is present in the system
if detected, WITH_ICONV will be defined in the C code
	WITH_ICONV is also added to Makefile.config
	OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version
	the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv
	This detection system is by request of Darkvater
2006-03-23 23:54:43 +00:00
bjarni
0b102f0e00 (svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added in 10.3
this have the sideeffect that 10.2.8 will still have the "failure to save with certain chars in the filename bug", but at least it can compile again
2006-03-22 13:06:50 +00:00
bjarni
5affa77822 (svn r3966) -Fix: [OSX and some linux] [ 1157244 ] Can't save game if name contains german umlauts
now it saves correctly, but the load window still display some chars wrong (fix by ln-)
2006-03-18 15:55:24 +00:00
tron
3d9c76d8b8 (svn r3887) Add a function to get the other bridge end when you're at a bridge ramp 2006-03-15 16:44:50 +00:00
bjarni
a19cdf6040 (svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARY 2006-03-15 14:11:17 +00:00
bjarni
bb47ecddf4 (svn r3882) -Codechange: [OSX] changed the way universal and tripple binaries are build
Instead of compiling a binary for each arch and then join them in the end, each .o file is now compiled as a fat file
	This means that the makefile will not call itself to make a binary for each target and we don't have to make clean between each build
	it also means that if one file changed, we don't have to recompile all files
	Another benefit is since it's handled at .o level and though LDFLAGS, no special code is needed if we decide to compile more binaries (like a lot of stuff used to happen at post linking)
	We also needs much less flags to set up, so it should be even easier to get to work out of the box now
	The tradeoff in doing so is that now the binary needs at least OSX 10.3.9 to execute
	To deal with this issue, the JAGUAR flag can be used to compile for older OSes. We will release a binary for old OSes at next release to see if anybody even downloads it (not that many people use OSX 10.2 anymore)
	GPMI will not work on 10.2 anyway so we will cut support for it some day anyway
2006-03-15 14:03:09 +00:00
truelight
cc2993992f (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure 2006-03-14 19:10:33 +00:00
tron
f2dc736554 (svn r3777) Add some functions to handle tunnels 2006-03-06 20:55:24 +00:00
tron
f007ad282c (svn r3766) Add a function to get the RoadBits from an arbitrary tile 2006-03-05 12:22:20 +00:00
bjarni
f4cf9b0a91 (svn r3759) -Fix: [OSX] don't set CC_HOST to i686 gcc when compiling universal binaries on PPC without any Makefile.config. Introduced in 3674 (before that i686 used PPC as CC_HOST, but nobody noticed that) 2006-03-04 12:09:10 +00:00
bjarni
d09e66eef6 (svn r3674) -Feature: [OSX] Added support for tripple binaries (binaries optimised for G3, G5 and i686)
G4 have no problems using G3 code while G5 can, but really benefit from getting their own optimised code (Apple: G5 is not just a fast G4)
	Also changed FAT_BINARY to UNIVERSAL_BINARY since Apple removed most (all?) references to fat binaries on their homepage two days after I added FAT_BINARY
2006-02-25 21:25:23 +00:00
bjarni
4ff6b2a514 (svn r3673) -Codechange: [OSX] changed the makefile to autodetect if it compiles on G5 and then adds flags to optimise for G5
This will not interfere with crosscompiling or universal binaries
2006-02-25 18:11:11 +00:00
Darkvater
f112cd722c (svn r3622) - Partly revert r3214. The patch setting max_num_autosaves stays to help control PDA-troubles which the commit was intended for. Didn't revert makefile-config version since it would cause trouble. But Bjarni promised to rewrite it :) 2006-02-20 17:54:25 +00:00
bjarni
9ed8143264 (svn r3611) -Feature: [OSX profiling] Shark (Xcode's profiling tool) can now relate CPU usage to lines in the source files
Now OSX users can tell what lines in the C code that keeps the CPU busy instead of just ASM code
	Note: PROFILE needs to be enabled in Makefile.config for this to work
2006-02-17 20:24:17 +00:00
Darkvater
0755e24ce4 (svn r3574) - [Merge] [GPMI] -Fix: finally OTTD doesn't compile if you do a 'make mrproper' (TrueLight) 2006-02-07 19:34:22 +00:00