mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r7190) -Fix: If the non-player-based _patches setting was changed on the server during MP game, the callback function was: 

1. Called only on the server but not on its clients.
 2. Was called before the setting change occurred (usually with no effect)
 3. Received old 'p1' argument value intead of new one
It could cause some MP desyncs in the future.
This commit is contained in:
KUDr 2006-11-17 10:42:20 +00:00
parent 590e90cd9e
commit d6b98584ab
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings.c
View File

@ -1582,6 +1582,7 @@ int32 CmdChangePatchSetting(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
Patches *patches_ptr = (_game_mode == GM_MENU) ? &_patches_newgame : &_patches;
void *var = ini_get_variable(&sd->save, patches_ptr);
Write_ValidateSetting(var, sd, (int32)p2);
if (sd->desc.proc != NULL) sd->desc.proc((int32)ReadValue(var, sd->save.conv));
InvalidateWindow(WC_GAME_OPTIONS, 0);
}
@ -1611,6 +1612,7 @@ bool SetPatchValue(uint index, const Patches *object, int32 value)
void *var2 = ini_get_variable(&sd->save, &_patches_newgame);
Write_ValidateSetting(var2, sd, value);
}
if (sd->desc.proc != NULL) sd->desc.proc((int32)ReadValue(var, sd->save.conv));
InvalidateWindow(WC_GAME_OPTIONS, 0);
return true;
}
@ -1653,7 +1655,6 @@ bool IConsoleSetPatchSetting(const char *name, int32 value)
ptr = ini_get_variable(&sd->save, patches_ptr);
success = SetPatchValue(index, patches_ptr, value);
if (success && sd->desc.proc != NULL) sd->desc.proc(value);
return success;
}

4
settings_gui.c
View File

@ -833,7 +833,6 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
if (value != oldvalue) {
SetPatchValue(page->entries[btn].index, patches_ptr, value);
SetWindowDirty(w);
if (sdb->proc != NULL) sdb->proc((int32)ReadValue(var, sd->save.conv));
}
} else {
/* only open editbox for types that its sensible for */
@ -868,7 +867,6 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
if (e->we.edittext.str != NULL) {
const PatchEntry *pe = &_patches_page[WP(w,def_d).data_1].entries[WP(w,def_d).data_3];
const SettingDesc *sd = pe->setting;
void *var = ini_get_variable(&sd->save, patches_ptr);
int32 value = atoi(e->we.edittext.str);
/* Save the correct currency-translated value */
@ -876,8 +874,6 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
SetPatchValue(pe->index, patches_ptr, value);
SetWindowDirty(w);
if (sd->desc.proc != NULL) sd->desc.proc((int32)ReadValue(var, sd->save.conv));
}
break;
}