Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium 2010-06-23 14:38:17 +00:00
parent df1036f948
commit c28f639c40
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command.cpp
View File

@ -591,7 +591,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
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

3
src/newgrf_debug_gui.cpp
View File

@ -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.

10
src/saveload/afterload.cpp
View File

@ -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);

4
src/train_gui.cpp
View File

@ -55,7 +55,7 @@ void CcBuildWagon(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p
* @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 left, int right, int y, VehicleID select
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;
}