dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8507) -Codechange/Feature: Don't remove player-owned property on-load in the scenario editor. Add a button to the landscape window to do this.

Browse Source
This commit is contained in:
Darkvater
2007-02-01 12:51:10 +00:00
parent fd62bc46d0
commit a5228fd33c
36 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openttd.cpp
View File

@@ -70,8 +70,6 @@ void IncreaseDate(void);
void DoPaletteAnimations(void);
void MusicLoop(void);
void ResetMusic(void);
void InitializeStations(void);
void DeleteAllPlayerStations(void);
extern void SetDifficultyLevel(int mode, GameOptions *gm_opt);
extern Player* DoStartupNewPlayer(bool is_ai);
@@ -840,23 +838,10 @@ void SwitchMode(int new_mode)
case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR)) {
Player *p;
_opt_ptr = &_opt;
SetLocalPlayer(OWNER_NONE);
_generating_world = true;
/* Delete all players */
FOR_ALL_PLAYERS(p) {
if (p->is_active) {
ChangeOwnershipOfPlayerItems(p->index, PLAYER_SPECTATOR);
p->is_active = false;
}
}
_generating_world = false;
_patches_newgame.starting_year = _cur_year;
// delete all stations owned by a player
DeleteAllPlayerStations();
} else {
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
}