summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-08-19 10:00:30 +0000
committertruelight <truelight@openttd.org>2006-08-19 10:00:30 +0000
commit10b842bddcbe6cdcf7111736bec985cdc13e528f (patch)
treecd9ad6758b68622254b2545359b5d87f88f7074b /os
parent83d56d6d798a28169f00a4c67323a407037c0b0a (diff)
downloadopenttd-10b842bddcbe6cdcf7111736bec985cdc13e528f.tar.xz
(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
Diffstat (limited to 'os')
-rw-r--r--os/linux/openttd.spec2
-rw-r--r--os/macosx/splash.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/os/linux/openttd.spec b/os/linux/openttd.spec
index bd71a0966..3fb8e39a9 100644
--- a/os/linux/openttd.spec
+++ b/os/linux/openttd.spec
@@ -143,4 +143,4 @@ rm -rf $RPM_BUILD_ROOT
- Upgraded to 0.3.4
* Wed Jul 31 2004 Dominik Scherer <> 0.3.3-1mdk
-- Initial release \ No newline at end of file
+- Initial release
diff --git a/os/macosx/splash.c b/os/macosx/splash.c
index 351aa9e0b..e09b8fccb 100644
--- a/os/macosx/splash.c
+++ b/os/macosx/splash.c
@@ -137,8 +137,8 @@ void DisplaySplashImage(void)
-#else // WITH_PNG
+#else /* WITH_PNG */
void DisplaySplashImage(void) {}
-#endif // WITH_PNG
+#endif /* WITH_PNG */