cpp/openttd-patchpack/source Changeset - r1803:44dc9c8ab616

Changeset - r1803:44dc9c8ab616

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Darkvater - 19 years ago 2005-05-14 18:25:01
darkvater@openttd.org

(svn r2307) - Fix (regression): it was not possible to change the drive-side in the intro-game.
- CodeChange: remove unused "CANT_DO_THIS" double-string.

3 files changed with 6 insertions and 6 deletions:

lang/english.txt

settings_gui.c

town_gui.c

0 comments (0 inline, 0 general)

lang/english.txt

➞

Show inline comments

@@ @@ -1592,13 +1592,12 @@ STR_204E_INITIATE_A_MEDIUM_LOCAL @@
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Initiate a large local advertising campaign, to attract more passengers and cargo to your transport services.{}  Cost: {CURRENCY}
 STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Fund the reconstruction of the urban road network. Causes considerable disruption to road traffic for up to 6 months.{}  Cost: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Build a statue in honour of your company.{} Cost: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
 STR_2054_CAN_T_DO_THIS                                          :{WHITE}Can't do this...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
 STR_2059_IGLOO                                                  :Igloo
 STR_205A_TEPEES                                                 :Tepees

settings_gui.c

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ static int GetCurRes(void) @@
 			break;
 	return i;
+}
 static inline bool RoadVehiclesAreBuilt(void)
+{
 	Vehicle *v;
+	const Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		if (v->type == VEH_Road) return true;
+	}
 	return false;
+}
@@ @@ -168,13 +168,13 @@ static void GameOptionsWndProc(Window *w @@
 		case 8: /* Distance units */
 			_opt_ptr->kilometers = e->dropdown.index;
 			MarkWholeScreenDirty();
 			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;
 		case 14: /* Town names */
 			if (_game_mode == GM_MENU) {
 				_opt_ptr->town_name = e->dropdown.index;
@@ @@ -211,14 +211,15 @@ static void GameOptionsWndProc(Window *w @@
  * @param x,y unused
  * @param p1 the side of the road; 0 = left side and 1 = right side
  * @param p2 unused
  */
 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;
 		InvalidateWindow(WC_GAME_OPTIONS,0);
+	}
 	return 0;

town_gui.c

➞

Show inline comments

@@ @@ -193,13 +193,13 @@ static void TownAuthorityWndProc(Window @@
 				SetWindowDirty(w);
+			}
 			break;
+		}
 		case 6: { /* carry out the action */
-			DoCommandP(GetTown(w->window_number)->xy, w->window_number, WP(w,def_d).data_1, NULL, CMD_DO_TOWN_ACTION | CMD_MSG(STR_2054_CAN_T_DO_THIS));
+			DoCommandP(GetTown(w->window_number)->xy, w->window_number, WP(w,def_d).data_1, NULL, CMD_DO_TOWN_ACTION | CMD_MSG(STR_00B4_CAN_T_DO_THIS));
 			break;
+		}
+		}
 		break;
 	case WE_4:

0 comments (0 inline, 0 general)