equal
deleted
inserted
replaced
346 int ttd_main(int argc, char *argv[]) |
346 int ttd_main(int argc, char *argv[]) |
347 { |
347 { |
348 int i; |
348 int i; |
349 const char *optformat; |
349 const char *optformat; |
350 char musicdriver[32], sounddriver[32], videodriver[32]; |
350 char musicdriver[32], sounddriver[32], videodriver[32]; |
351 int resolution[2] = {0,0}; |
351 int resolution[2] = {0, 0}; |
352 Year startyear = INVALID_YEAR; |
352 Year startyear = INVALID_YEAR; |
353 uint generation_seed = GENERATE_NEW_SEED; |
353 uint generation_seed = GENERATE_NEW_SEED; |
354 bool save_config = true; |
354 bool save_config = true; |
355 #if defined(ENABLE_NETWORK) |
355 #if defined(ENABLE_NETWORK) |
356 bool dedicated = false; |
356 bool dedicated = false; |
377 #if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
377 #if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
378 "f" |
378 "f" |
379 #endif |
379 #endif |
380 ; |
380 ; |
381 |
381 |
382 MyGetOptData mgo(argc-1, argv+1, optformat); |
382 MyGetOptData mgo(argc - 1, argv + 1, optformat); |
383 |
383 |
384 while ((i = MyGetOpt(&mgo)) != -1) { |
384 while ((i = MyGetOpt(&mgo)) != -1) { |
385 switch (i) { |
385 switch (i) { |
386 case 'm': ttd_strlcpy(musicdriver, mgo.opt, sizeof(musicdriver)); break; |
386 case 'm': ttd_strlcpy(musicdriver, mgo.opt, sizeof(musicdriver)); break; |
387 case 's': ttd_strlcpy(sounddriver, mgo.opt, sizeof(sounddriver)); break; |
387 case 's': ttd_strlcpy(sounddriver, mgo.opt, sizeof(sounddriver)); break; |
1925 } |
1925 } |
1926 } |
1926 } |
1927 } |
1927 } |
1928 |
1928 |
1929 if (CheckSavegameVersion(57)) { |
1929 if (CheckSavegameVersion(57)) { |
|
1930 Vehicle *v; |
|
1931 /* Added a FIFO queue of vehicles loading at stations */ |
|
1932 FOR_ALL_VEHICLES(v) { |
|
1933 if ((v->type != VEH_TRAIN || IsFrontEngine(v)) && // for all locs |
|
1934 !(v->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed |
|
1935 v->current_order.type == OT_LOADING) { // loading |
|
1936 GetStation(v->last_station_visited)->loading_vehicles.push_back(v); |
|
1937 } |
|
1938 } |
|
1939 } |
|
1940 |
|
1941 if (CheckSavegameVersion(58)) { |
1930 Town *t; |
1942 Town *t; |
1931 FOR_ALL_TOWNS(t) t->SetActivity(1); |
1943 FOR_ALL_TOWNS(t) t->SetActivity(1); |
1932 } |
1944 } |
1933 |
1945 |
1934 return true; |
1946 return true; |