diff options
| author | truelight <truelight@openttd.org> | 2006-08-19 10:00:30 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-19 10:00:30 +0000 |
| commit | 10b842bddcbe6cdcf7111736bec985cdc13e528f (patch) | |
| tree | cd9ad6758b68622254b2545359b5d87f88f7074b /network_gui.c | |
| parent | 83d56d6d798a28169f00a4c67323a407037c0b0a (diff) | |
| download | openttd-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 'network_gui.c')
| -rw-r--r-- | network_gui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/network_gui.c b/network_gui.c index 6cd8f7b3b..2fab56335 100644 --- a/network_gui.c +++ b/network_gui.c @@ -24,6 +24,7 @@ #include "variables.h" #include "network_server.h" #include "network_udp.h" +#include "settings.h" #include "string.h" #define BGC 5 @@ -57,6 +58,7 @@ static char _edit_str_buf[64]; static void ShowNetworkStartServerWindow(void); static void ShowNetworkLobbyWindow(NetworkGameList *ngl); +extern void SwitchMode(int new_mode); static const StringID _connection_types_dropdown[] = { STR_NETWORK_LAN_INTERNET, @@ -683,7 +685,7 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e) _is_network_server = true; if (nd->map == NULL) { // start random new game - GenRandomNewGame(Random(), InteractiveRandom()); + ShowGenerateLandscape(); } else { // load a scenario char *name = FiosBrowseTo(nd->map); if (name != NULL) { @@ -692,7 +694,7 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e) ttd_strlcpy(_file_to_saveload.title, nd->map->title, sizeof(_file_to_saveload.title)); DeleteWindow(w); - StartScenarioEditor(Random(), InteractiveRandom()); + SwitchMode(SM_START_SCENARIO); } } break; @@ -1392,8 +1394,6 @@ void ShowClientList(void) if (w != NULL) w->window_number = 0; } -extern void SwitchMode(int new_mode); - static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e) { switch (e->event) { |