cpp/openttd-patchpack/source Changeset - r15360:111b979f44e3

Changeset - r15360:111b979f44e3

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 14 years ago 2010-06-23 14:38:17
rubidium@openttd.org

(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account

4 files changed with 14 insertions and 5 deletions:

src/command.cpp

src/newgrf_debug_gui.cpp

src/saveload/afterload.cpp

src/train_gui.cpp

0 comments (0 inline, 0 general)

src/command.cpp

➞

Show inline comments

@@ @@ -591,7 +591,7 @@ CommandCost DoCommandPInternal(TileIndex @@
 	if (tile != 0 && (tile >= MapSize() || (!IsValidTile(tile) && (cmd_flags & CMD_ALL_TILES) == 0))) return_dcpi(CMD_ERROR, false);
 	/* Always execute server and spectator commands as spectator */
 	bool exec_as_spectator = cmd_flags & (CMD_SPECTATOR | CMD_SERVER);
+	bool exec_as_spectator = (cmd_flags & (CMD_SPECTATOR | CMD_SERVER)) != 0;
 	/* If the company isn't valid it may only do server command or start a new company!
 	 * The server will ditch any server commands a client sends to it, so effectively

src/newgrf_debug_gui.cpp

➞

Show inline comments

@@ @@ -104,6 +104,9 @@ struct NIVariable { @@
 /** Helper class to wrap some functionality/queries in. */
 class NIHelper {
 public:
 	/** Silence a warning. */
 	virtual ~NIHelper() {}
 	/**
 	 * Is the item with the given index inspectable?
 	 * @param index the index to check.

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -431,7 +431,6 @@ bool AfterLoadGame() @@
 	SetSignalHandlers();
 	TileIndex map_size = MapSize();
 	Company *c;
 	if (CheckSavegameVersion(98)) GamelogOldver();
@@ @@ -500,6 +499,7 @@ bool AfterLoadGame() @@
+	}
 	if (CheckSavegameVersion(84)) {
 		Company *c;
 		FOR_ALL_COMPANIES(c) {
 			c->name = CopyFromOldName(c->name_1);
 			if (c->name != NULL) c->name_1 = STR_SV_UNNAMED;
@@ @@ -803,6 +803,7 @@ bool AfterLoadGame() @@
 	/* From version 16.0, we included autorenew on engines, which are now saved, but
 	 *  of course, we do need to initialize them for older savegames. */
 	if (CheckSavegameVersion(16)) {
 		Company *c;
 		FOR_ALL_COMPANIES(c) {
 			c->engine_renew_list            = NULL;
 			c->settings.engine_renew        = false;
@@ @@ -1089,6 +1090,7 @@ bool AfterLoadGame() @@
 	 * replaced, shall keep their old length. In all prior versions, just default
 	 * to false */
 	if (CheckSavegameVersionOldStyle(16, 1)) {
 		Company *c;
 		FOR_ALL_COMPANIES(c) c->settings.renew_keep_length = false;
+	}
@@ @@ -1147,8 +1149,12 @@ bool AfterLoadGame() @@
 	YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK);
 	if (CheckSavegameVersion(34)) FOR_ALL_COMPANIES(c) ResetCompanyLivery(c);
 	if (CheckSavegameVersion(34)) {
 		Company *c;
 		FOR_ALL_COMPANIES(c) ResetCompanyLivery(c);
+	}
 	Company *c;
 	FOR_ALL_COMPANIES(c) {
 		c->avail_railtypes = GetCompanyRailtypes(c->index);
 		c->avail_roadtypes = GetCompanyRoadtypes(c->index);

src/train_gui.cpp

➞

Show inline comments

@@ @@ -55,7 +55,7 @@ void CcBuildWagon(const CommandCost &res @@
  * @param selection Selected vehicle that is dragged.
  * @return The width of the highlight mark.
  */
-static uint HighlightDragPosition(int px, int max_width, VehicleID selection)
+static int HighlightDragPosition(int px, int max_width, VehicleID selection)
+{
 	bool rtl = _dynlang.text_dir == TD_RTL;
@@ @@ -108,7 +108,7 @@ void DrawTrainImage(const Train *v, int @@
 	for (; v != NULL && (rtl ? px > 0 : px < max_width); v = v->Next()) {
 		if (dragging && !drag_at_end_of_train && drag_dest == v->index) {
 			/* Highlight the drag-and-drop destination inside the train. */
-			uint drag_hlight_width = HighlightDragPosition(px, max_width, selection);
+			int drag_hlight_width = HighlightDragPosition(px, max_width, selection);
 			px += rtl ? -drag_hlight_width : drag_hlight_width;
+		}

0 comments (0 inline, 0 general)