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

(svn r2307) - Fix (regression): it was not possible to change the drive-side in the intro-game.

Browse Source 
- CodeChange: remove unused "CANT_DO_THIS" double-string.
This commit is contained in:
Darkvater
2005-05-14 18:25:01 +00:00
parent 5174d3adfe
commit fbb794d450
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
settings_gui.c
View File

@@ -70,7 +70,7 @@ static int GetCurRes(void)
static inline bool RoadVehiclesAreBuilt(void)
{
Vehicle *v;
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_Road) return true;
}
@@ -171,7 +171,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
break;
case 11: /* Road side */
if (_opt_ptr->road_side != e->dropdown.index) { // only change if setting changed
DoCommandP(0, e->dropdown.index, 0, NULL, CMD_SET_ROAD_DRIVE_SIDE | CMD_MSG(STR_EMPTY));
DoCommandP(0, e->dropdown.index, 0, NULL, CMD_SET_ROAD_DRIVE_SIDE | CMD_MSG(STR_00B4_CAN_T_DO_THIS));
MarkWholeScreenDirty();
}
break;
@@ -214,8 +214,9 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
*/
int32 CmdSetRoadDriveSide(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{
/* Check boundaries and you can only change this if NO vehicles have been built yet */
if (p1 > 1 || RoadVehiclesAreBuilt()) return CMD_ERROR;
/* Check boundaries and you can only change this if NO vehicles have been built yet,
* except in the intro-menu where of course it's always possible to do so. */
if (p1 > 1 || (_game_mode != GM_MENU && RoadVehiclesAreBuilt())) return CMD_ERROR;
if (flags & DC_EXEC) {
_opt_ptr->road_side = p1;