cpp/openttd-patchpack/source Changeset - r15175:66e0817dc450

Changeset - r15175:66e0817dc450

Parent rev.

Child rev.

[Not reviewed]

master

0 30 0

rubidium - 14 years ago 2010-05-13 10:14:29
rubidium@openttd.org

(svn r19814) -Codechange: give some more unnamed enums a name, in case they consisted of unrelated values use static const (u)int

30 files changed with 82 insertions and 125 deletions:

src/ai/ai_instance.cpp

src/airport.h

src/airport_gui.cpp

src/company_gui.cpp

src/console_gui.cpp

src/currency.cpp

src/date.cpp

src/fontcache.cpp

src/gamelog.cpp

src/gfx.cpp

src/industry_cmd.cpp

src/misc_gui.cpp

src/music/qtmidi.cpp

src/network/network_chat_gui.cpp

src/network/network_content_gui.cpp

src/network/network_gamelist.cpp

src/network/network_udp.cpp

src/newgrf.cpp

src/newgrf_engine.cpp

src/newgrf_gui.cpp

src/newgrf_station.cpp

src/osk_gui.cpp

src/pathfinder/npf/npf.cpp

src/rail_cmd.cpp

src/signal.cpp

src/statusbar_gui.cpp

src/toolbar_gui.cpp

src/train_gui.cpp

src/video/allegro_v.cpp

src/video/cocoa/event.mm

0 comments (0 inline, 0 general)

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -451,27 +451,25 @@ enum SQSaveLoadType { @@
 	SQSL_BOOL            = 0x04, ///< The following data is a boolean.
 	SQSL_NULL            = 0x05, ///< A null variable.
 	SQSL_ARRAY_TABLE_END = 0xFF, ///< Marks the end of an array or table, no data follows.
 };
 static byte _ai_sl_byte;
 static const SaveLoad _ai_byte[] = {
 	SLEG_VAR(_ai_sl_byte, SLE_UINT8),
 	SLE_END()
 };
 enum {
 	AISAVE_MAX_DEPTH = 25, ///< The maximum recursive depth for items stored in the savegame.
 };
 static const uint AISAVE_MAX_DEPTH = 25; ///< The maximum recursive depth for items stored in the savegame.
 /* static */ bool AIInstance::SaveObject(HSQUIRRELVM vm, SQInteger index, int max_depth, bool test)
+{
 	if (max_depth == 0) {
 		AILog::Error("Savedata can only be nested to 25 deep. No data saved.");
 		return false;
+	}
 	switch (sq_gettype(vm, index)) {
 		case OT_INTEGER: {
 			if (!test) {
 				_ai_sl_byte = SQSL_INT;

src/airport.h

➞

Show inline comments

@@ @@ -7,32 +7,31 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file airport.h Various declarations for airports */
 #ifndef AIRPORT_H
 #define AIRPORT_H
 #include "direction_type.h"
 #include "tile_type.h"
 /** Some airport-related constants */
 enum {
 	MAX_TERMINALS =  10,                    ///< maximum number of terminals per airport
 	MAX_HELIPADS  =   4,                    ///< maximum number of helipads per airport
 	MAX_ELEMENTS  = 255,                    ///< maximum number of aircraft positions at airport
 	NUM_AIRPORTTILES = 256,                 ///< total number of airport tiles
 	NEW_AIRPORTTILE_OFFSET = 74,            ///< offset of first newgrf airport tile
 	INVALID_AIRPORTTILE = NUM_AIRPORTTILES, ///< id for an invalid airport tile
 };
 static const uint MAX_TERMINALS =  10;                       ///< maximum number of terminals per airport
 static const uint MAX_HELIPADS  =   4;                       ///< maximum number of helipads per airport
 static const uint MAX_ELEMENTS  = 255;                       ///< maximum number of aircraft positions at airport
 static const uint NUM_AIRPORTTILES       = 256;              ///< total number of airport tiles
 static const uint NEW_AIRPORTTILE_OFFSET = 74;               ///< offset of first newgrf airport tile
 static const uint INVALID_AIRPORTTILE    = NUM_AIRPORTTILES; ///< id for an invalid airport tile
 /** Airport types */
 enum AirportTypes {
 	AT_SMALL         =   0,
 	AT_LARGE         =   1,
 	AT_HELIPORT      =   2,
 	AT_METROPOLITAN  =   3,
 	AT_INTERNATIONAL =   4,
 	AT_COMMUTER      =   5,
 	AT_HELIDEPOT     =   6,
 	AT_INTERCON      =   7,
 	AT_HELISTATION   =   8,

src/airport_gui.cpp

➞

Show inline comments

@@ @@ -47,25 +47,25 @@ void CcBuildAirport(const CommandCost &r @@
 static void PlaceAirport(TileIndex tile)
+{
 	if (_selected_airport_index == -1) return;
 	uint32 p2 = _ctrl_pressed;
 	SB(p2, 16, 16, INVALID_STATION); // no station to join
 	uint32 p1 = GetAirportSpecFromClass(_selected_airport_class, _selected_airport_index)->GetIndex();
 	CommandContainer cmdcont = { tile, p1, p2, CMD_BUILD_AIRPORT | CMD_MSG(STR_ERROR_CAN_T_BUILD_AIRPORT_HERE), CcBuildAirport, "" };
 	ShowSelectStationIfNeeded(cmdcont, TileArea(tile, _thd.size.x / TILE_SIZE, _thd.size.y / TILE_SIZE));
+}
 /** Widget number of the airport build window. */
 enum {
+enum AirportToolbarWidgets {
 	ATW_AIRPORT,
 	ATW_DEMOLISH,
 };
 static void BuildAirClick_Airport(Window *w)
+{
 	if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, HT_RECT, PlaceAirport)) ShowBuildAirportPicker(w);
+}
 static void BuildAirClick_Demolish(Window *w)
+{

src/company_gui.cpp

➞

Show inline comments

@@ @@ -25,30 +25,28 @@ @@
 #include "company_manager_face.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
 #include "sprite.h"
 #include "company_base.h"
 #include "core/geometry_func.hpp"
 #include "table/strings.h"
 /** Company GUI constants. */
 enum {
 	FIRST_GUI_CALL = INT_MAX,  ///< default value to specify this is the first call of the resizable gui
 static const int FIRST_GUI_CALL = INT_MAX; ///< default value to specify this is the first call of the resizable gui
 	EXP_LINESPACE  = 2,        ///< Amount of vertical space for a horizontal (sub-)total line.
 	EXP_BLOCKSPACE = 10,       ///< Amount of vertical space between two blocks of numbers.
 };
 static const uint EXP_LINESPACE  = 2;      ///< Amount of vertical space for a horizontal (sub-)total line.
 static const uint EXP_BLOCKSPACE = 10;     ///< Amount of vertical space between two blocks of numbers.
 static void DoSelectCompanyManagerFace(Window *parent);
 /** Standard unsorted list of expenses. */
 static ExpensesType _expenses_list_1[] = {
 	EXPENSES_CONSTRUCTION,
 	EXPENSES_NEW_VEHICLES,
 	EXPENSES_TRAIN_RUN,
 	EXPENSES_ROADVEH_RUN,
 	EXPENSES_AIRCRAFT_RUN,
 	EXPENSES_SHIP_RUN,
 	EXPENSES_PROPERTY,

src/console_gui.cpp

➞

Show inline comments

@@ @@ -12,31 +12,28 @@ @@
 #include "stdafx.h"
 #include "textbuf_gui.h"
 #include "window_gui.h"
 #include "console_gui.h"
 #include "console_internal.h"
 #include "window_func.h"
 #include "string_func.h"
 #include "gfx_func.h"
 #include "settings_type.h"
 #include "console_func.h"
 #include "rev.h"
 enum {
 	ICON_HISTORY_SIZE       = 20,
 	ICON_LINE_SPACING       =  2,
 	ICON_RIGHT_BORDERWIDTH  = 10,
 	ICON_BOTTOM_BORDERWIDTH = 12,
 };
 static const uint ICON_HISTORY_SIZE       = 20;
 static const uint ICON_LINE_SPACING       =  2;
 static const uint ICON_RIGHT_BORDERWIDTH  = 10;
 static const uint ICON_BOTTOM_BORDERWIDTH = 12;
 /**
  * Container for a single line of console output
  */
 struct IConsoleLine {
 	static IConsoleLine *front; ///< The front of the console backlog buffer
 	static int size;            ///< The amount of items in the backlog
 	IConsoleLine *previous; ///< The previous console message.
 	char *buffer;           ///< The data to store.
 	TextColour colour;      ///< The colour of the line.
 	uint16 time;            ///< The amount of time the line is in the backlog.
@@ @@ -437,25 +434,25 @@ static const char *IConsoleHistoryAdd(co @@
 /**
  * Navigate Up/Down in the history of typed commands
  * @param direction Go further back in history (+1), go to recently typed commands (-1)
  */
 static void IConsoleHistoryNavigate(int direction)
+{
 	if (_iconsole_history[0] == NULL) return; // Empty history
 	int i = _iconsole_historypos + direction;
 	/* watch out for overflows, just wrap around */
 	if (i < 0) i = ICON_HISTORY_SIZE - 1;
 	if (i >= ICON_HISTORY_SIZE) i = 0;
+	if ((uint)i >= ICON_HISTORY_SIZE) i = 0;
 	if (direction > 0) {
 		if (_iconsole_history[i] == NULL) i = 0;
+	}
 	if (direction < 0) {
 		while (i > 0 && _iconsole_history[i] == NULL) i--;
+	}
 	_iconsole_historypos = i;
 	IConsoleClearCommand();
 	/* copy history to 'command prompt / bash' */

src/currency.cpp

➞

Show inline comments

@@ @@ -53,25 +53,25 @@ static const CurrencySpec origin_currenc @@
 	{    1, "", CF_NOEURO, "",             "",           2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency
 };
 /* Array of currencies used by the system */
 CurrencySpec _currency_specs[NUM_CURRENCY];
 /**
  * These enums are only declared in order to make sens
  * out of the TTDPatch_To_OTTDIndex array that will follow
  * Every currency used by Ottd is there, just in case TTDPatch will
  * add those missing in its code
  **/
 enum {
+enum Currencies {
 	CURR_GBP,
 	CURR_USD,
 	CURR_EUR,
 	CURR_YEN,
 	CURR_ATS,
 	CURR_BEF,
 	CURR_CHF,
 	CURR_CZK,
 	CURR_DEM,
 	CURR_DKK,
 	CURR_ESP,
 	CURR_FIM,

src/date.cpp

➞

Show inline comments

@@ @@ -46,25 +46,25 @@ static const uint16 _month_date_from_yea @@
 	M( 3, 1), M( 3, 2), M( 3, 3), M( 3, 4), M( 3, 5), M( 3, 6), M( 3, 7), M( 3, 8), M( 3, 9), M( 3, 10), M( 3, 11), M( 3, 12), M( 3, 13), M( 3, 14), M( 3, 15), M( 3, 16), M( 3, 17), M( 3, 18), M( 3, 19), M( 3, 20), M( 3, 21), M( 3, 22), M( 3, 23), M( 3, 24), M( 3, 25), M( 3, 26), M( 3, 27), M( 3, 28), M( 3, 29), M( 3, 30),
 	M( 4, 1), M( 4, 2), M( 4, 3), M( 4, 4), M( 4, 5), M( 4, 6), M( 4, 7), M( 4, 8), M( 4, 9), M( 4, 10), M( 4, 11), M( 4, 12), M( 4, 13), M( 4, 14), M( 4, 15), M( 4, 16), M( 4, 17), M( 4, 18), M( 4, 19), M( 4, 20), M( 4, 21), M( 4, 22), M( 4, 23), M( 4, 24), M( 4, 25), M( 4, 26), M( 4, 27), M( 4, 28), M( 4, 29), M( 4, 30), M( 4, 31),
 	M( 5, 1), M( 5, 2), M( 5, 3), M( 5, 4), M( 5, 5), M( 5, 6), M( 5, 7), M( 5, 8), M( 5, 9), M( 5, 10), M( 5, 11), M( 5, 12), M( 5, 13), M( 5, 14), M( 5, 15), M( 5, 16), M( 5, 17), M( 5, 18), M( 5, 19), M( 5, 20), M( 5, 21), M( 5, 22), M( 5, 23), M( 5, 24), M( 5, 25), M( 5, 26), M( 5, 27), M( 5, 28), M( 5, 29), M( 5, 30),
 	M( 6, 1), M( 6, 2), M( 6, 3), M( 6, 4), M( 6, 5), M( 6, 6), M( 6, 7), M( 6, 8), M( 6, 9), M( 6, 10), M( 6, 11), M( 6, 12), M( 6, 13), M( 6, 14), M( 6, 15), M( 6, 16), M( 6, 17), M( 6, 18), M( 6, 19), M( 6, 20), M( 6, 21), M( 6, 22), M( 6, 23), M( 6, 24), M( 6, 25), M( 6, 26), M( 6, 27), M( 6, 28), M( 6, 29), M( 6, 30), M( 6, 31),
 	M( 7, 1), M( 7, 2), M( 7, 3), M( 7, 4), M( 7, 5), M( 7, 6), M( 7, 7), M( 7, 8), M( 7, 9), M( 7, 10), M( 7, 11), M( 7, 12), M( 7, 13), M( 7, 14), M( 7, 15), M( 7, 16), M( 7, 17), M( 7, 18), M( 7, 19), M( 7, 20), M( 7, 21), M( 7, 22), M( 7, 23), M( 7, 24), M( 7, 25), M( 7, 26), M( 7, 27), M( 7, 28), M( 7, 29), M( 7, 30), M( 7, 31),
 	M( 8, 1), M( 8, 2), M( 8, 3), M( 8, 4), M( 8, 5), M( 8, 6), M( 8, 7), M( 8, 8), M( 8, 9), M( 8, 10), M( 8, 11), M( 8, 12), M( 8, 13), M( 8, 14), M( 8, 15), M( 8, 16), M( 8, 17), M( 8, 18), M( 8, 19), M( 8, 20), M( 8, 21), M( 8, 22), M( 8, 23), M( 8, 24), M( 8, 25), M( 8, 26), M( 8, 27), M( 8, 28), M( 8, 29), M( 8, 30),
 	M( 9, 1), M( 9, 2), M( 9, 3), M( 9, 4), M( 9, 5), M( 9, 6), M( 9, 7), M( 9, 8), M( 9, 9), M( 9, 10), M( 9, 11), M( 9, 12), M( 9, 13), M( 9, 14), M( 9, 15), M( 9, 16), M( 9, 17), M( 9, 18), M( 9, 19), M( 9, 20), M( 9, 21), M( 9, 22), M( 9, 23), M( 9, 24), M( 9, 25), M( 9, 26), M( 9, 27), M( 9, 28), M( 9, 29), M( 9, 30), M( 9, 31),
 	M(10, 1), M(10, 2), M(10, 3), M(10, 4), M(10, 5), M(10, 6), M(10, 7), M(10, 8), M(10, 9), M(10, 10), M(10, 11), M(10, 12), M(10, 13), M(10, 14), M(10, 15), M(10, 16), M(10, 17), M(10, 18), M(10, 19), M(10, 20), M(10, 21), M(10, 22), M(10, 23), M(10, 24), M(10, 25), M(10, 26), M(10, 27), M(10, 28), M(10, 29), M(10, 30),
 	M(11, 1), M(11, 2), M(11, 3), M(11, 4), M(11, 5), M(11, 6), M(11, 7), M(11, 8), M(11, 9), M(11, 10), M(11, 11), M(11, 12), M(11, 13), M(11, 14), M(11, 15), M(11, 16), M(11, 17), M(11, 18), M(11, 19), M(11, 20), M(11, 21), M(11, 22), M(11, 23), M(11, 24), M(11, 25), M(11, 26), M(11, 27), M(11, 28), M(11, 29), M(11, 30), M(11, 31),
 };
 #undef M
 enum {
+enum DaysTillMonth {
 	ACCUM_JAN = 0,
 	ACCUM_FEB = ACCUM_JAN + 31,
 	ACCUM_MAR = ACCUM_FEB + 29,
 	ACCUM_APR = ACCUM_MAR + 31,
 	ACCUM_MAY = ACCUM_APR + 30,
 	ACCUM_JUN = ACCUM_MAY + 31,
 	ACCUM_JUL = ACCUM_JUN + 30,
 	ACCUM_AUG = ACCUM_JUL + 31,
 	ACCUM_SEP = ACCUM_AUG + 31,
 	ACCUM_OCT = ACCUM_SEP + 30,
 	ACCUM_NOV = ACCUM_OCT + 31,
 	ACCUM_DEC = ACCUM_NOV + 30,

src/fontcache.cpp

➞

Show inline comments

@@ @@ -30,28 +30,26 @@ int _font_height[FS_END]; @@
 #ifdef WITH_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 #endif
 static FT_Library _library = NULL;
 static FT_Face _face_small = NULL;
 static FT_Face _face_medium = NULL;
 static FT_Face _face_large = NULL;
 static int _ascender[FS_END];
 FreeTypeSettings _freetype;
 enum {
 	FACE_COLOUR = 1,
 	SHADOW_COLOUR = 2,
 };
 static const byte FACE_COLOUR   = 1;
 static const byte SHADOW_COLOUR = 2;
 /** Get the font loaded into a Freetype face by using a font-name.
  * If no appropiate font is found, the function returns an error */
 #ifdef WIN32
 #include <windows.h>
 #include <shlobj.h> /* SHGetFolderPath */
 #include "os/windows/win32.h"
 /**
  * Get the short DOS 8.3 format for paths.
  * FreeType doesn't support Unicode filenames and Windows' fopen (as used
  * by FreeType) doesn't support UTF-8 filenames. So we have to convert the

src/gamelog.cpp

➞

Show inline comments

@@ @@ -76,29 +76,27 @@ void GamelogReset() @@
 			if (lc->ct == GLCT_SETTING) free(lc->setting.name);
+		}
 		free(la->change);
+	}
 	free(_gamelog_action);
 	_gamelog_action  = NULL;
 	_gamelog_actions = 0;
 	_current_action  = NULL;
+}
 enum {
 	GAMELOG_BUF_LEN = 1024 ///< length of buffer for one line of text
 };
 static const uint GAMELOG_BUF_LEN = 1024; ///< length of buffer for one line of text
-static int _dbgofs = 0; ///< offset in current output buffer
+static uint _dbgofs = 0; ///< offset in current output buffer
 static void AddDebugText(char *buf, const char *s, ...) WARN_FORMAT(2, 3);
 static void AddDebugText(char *buf, const char *s, ...)
+{
 	if (GAMELOG_BUF_LEN <= _dbgofs) return;
 	va_list va;
 	va_start(va, s);
 	_dbgofs += vsnprintf(buf + _dbgofs, GAMELOG_BUF_LEN - _dbgofs, s, va);
 	va_end(va);

src/gfx.cpp

➞

Show inline comments

@@ @@ -65,28 +65,27 @@ static ReusableBuffer<uint8> _cursor_bac @@
 /**
  * The rect for repaint.
+ *
  * This rectangle defines the area which should be repaint by the video driver.
+ *
  * @ingroup dirty
  */
 static Rect _invalid_rect;
 static const byte *_colour_remap_ptr;
 static byte _string_colourremap[3]; ///< Recoloursprite for stringdrawing. The grf loader ensures, that ST_FONT sprites only use colours 0 to 2.
 enum {
 	DIRTY_BLOCK_HEIGHT   = 8,
 	DIRTY_BLOCK_WIDTH    = 64,
 };
 static const uint DIRTY_BLOCK_HEIGHT   = 8;
 static const uint DIRTY_BLOCK_WIDTH    = 64;
 static uint _dirty_bytes_per_line = 0;
 static byte *_dirty_blocks = NULL;
 void GfxScroll(int left, int top, int width, int height, int xo, int yo)
+{
 	Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
 	if (xo == 0 && yo == 0) return;
 	if (_cursor.visible) UndrawMouseCursor();
 #ifdef ENABLE_NETWORK

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -2178,28 +2178,26 @@ static void ReportNewsProductionChangeIn @@
 		default: NOT_REACHED();
+	}
 	SetDParam(2, abs(percent));
 	SetDParam(0, CargoSpec::Get(type)->name);
 	SetDParam(1, ind->index);
 	AddIndustryNewsItem(
 		percent >= 0 ? STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH : STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH,
 		ns,
 		ind->index
 	);
+}
 enum {
 	PERCENT_TRANSPORTED_60 = 153,
 	PERCENT_TRANSPORTED_80 = 204,
 };
 static const uint PERCENT_TRANSPORTED_60 = 153;
 static const uint PERCENT_TRANSPORTED_80 = 204;
 /** Change industry production or do closure
  * @param i Industry for which changes are performed
  * @param monthly true if it's the monthly call, false if it's the random call
  */
 static void ChangeIndustryProduction(Industry *i, bool monthly)
+{
 	StringID str = STR_NULL;
 	bool closeit = false;
 	const IndustrySpec *indspec = GetIndustrySpec(i->type);
 	bool standard = false;
 	bool suppress_message = false;

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -70,31 +70,31 @@ static const NWidgetPart _nested_land_in @@
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, LIW_BACKGROUND), EndContainer(),
 };
 static const WindowDesc _land_info_desc(
 	WDP_AUTO, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 ,
 	_nested_land_info_widgets, lengthof(_nested_land_info_widgets)
 );
 class LandInfoWindow : public Window {
 	enum {
+	enum LandInfoLines {
 		LAND_INFO_CENTERED_LINES   = 12,                       ///< Up to 12 centered lines
 		LAND_INFO_MULTICENTER_LINE = LAND_INFO_CENTERED_LINES, ///< One multicenter line
 		LAND_INFO_LINE_END,
 	};
 		LAND_INFO_LINE_BUFF_SIZE = 512,
 	};
 	static const uint LAND_INFO_LINE_BUFF_SIZE = 512;
 public:
 	char landinfo_data[LAND_INFO_LINE_END][LAND_INFO_LINE_BUFF_SIZE];
 	TileIndex tile;
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{

src/music/qtmidi.cpp

➞

Show inline comments

@@ @@ -32,47 +32,45 @@ @@
 #include "qtmidi.h"
 #include "../debug.h"
 #define Rect  OTTDRect
 #define Point OTTDPoint
 #include <QuickTime/QuickTime.h>
 #undef Rect
 #undef Point
 static FMusicDriver_QtMidi iFMusicDriver_QtMidi;
 enum {
 	midiType = 'Midi' ///< OSType code for MIDI songs.
 };
 static const uint MIDI_TYPE = 'Midi' ///< OSType code for MIDI songs.
 /**
  * Sets the @c OSType of a given file to @c 'Midi', but only if it's not
  * already set.
+ *
  * @param *ref A @c FSSpec structure referencing a file.
  */
 static void SetMIDITypeIfNeeded(const FSRef *ref)
+{
 	FSCatalogInfo catalogInfo;
 	assert(ref);
 	if (noErr != FSGetCatalogInfo(ref, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL)) return;
 	if (!(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)) {
 		FileInfo * const info = (FileInfo *) catalogInfo.finderInfo;
-		if (info->fileType != midiType && !(info->finderFlags & kIsAlias)) {
+		if (info->fileType != MIDI_TYPE && !(info->finderFlags & kIsAlias)) {
 			OSErr e;
-			info->fileType = midiType;
+			info->fileType = MIDI_TYPE;
 			e = FSSetCatalogInfo(ref, kFSCatInfoFinderInfo, &catalogInfo);
 			if (e == noErr) {
 				DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'");
 			} else {
 				DEBUG(driver, 0, "qtmidi: changing filetype to 'Midi' failed - error %d", e);
+			}
+		}
+	}
+}
 /**
@@ @@ -152,25 +150,25 @@ static void InitQuickTimeIfNeeded() @@
 	if (_quicktime_started) return;
 	DEBUG(driver, 2, "qtmidi: initializing Quicktime");
 	/* Be polite: check wether QuickTime is available and initialize it. */
 	_quicktime_started =
 		(noErr == Gestalt(gestaltQuickTime, &dummy)) &&
 		(noErr == EnterMovies());
 	if (!_quicktime_started) DEBUG(driver, 0, "qtmidi: Quicktime initialization failed!");
+}
 /** Possible states of the QuickTime music driver. */
 enum {
+enum QTStates {
 	QT_STATE_IDLE, ///< No file loaded.
 	QT_STATE_PLAY, ///< File loaded, playing.
 	QT_STATE_STOP, ///< File loaded, stopped.
 };
 static Movie _quicktime_movie;                  ///< Current QuickTime @c Movie.
 static byte  _quicktime_volume = 127;           ///< Current volume.
 static int   _quicktime_state  = QT_STATE_IDLE; ///< Current player state.
 /**

src/network/network_chat_gui.cpp

➞

Show inline comments

@@ @@ -26,27 +26,25 @@ @@
 #include "../window_func.h"
 #include "../core/geometry_func.hpp"
 #include "network.h"
 #include "network_client.h"
 #include "network_base.h"
 #include "table/strings.h"
 /* The draw buffer must be able to contain the chat message, client name and the "[All]" message,
  * some spaces and possible translations of [All] to other languages. */
 assert_compile((int)DRAW_STRING_BUFFER >= (int)NETWORK_CHAT_LENGTH + NETWORK_NAME_LENGTH + 40);
 enum {
 	NETWORK_CHAT_LINE_SPACING = 3,
 };
 static const uint NETWORK_CHAT_LINE_SPACING = 3;
 struct ChatMessage {
 	char message[DRAW_STRING_BUFFER];
 	TextColour colour;
 	Date end_date;
 };
 /* used for chat window */
 static ChatMessage *_chatmsg_list = NULL;
 static bool _chatmessage_dirty = false;
 static bool _chatmessage_visible = false;
 static bool _chat_tab_completion_active;

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -216,28 +216,26 @@ enum NetworkContentListWindowWidgets { @@
 	NCLWW_SELECT_UPDATE, ///< 'Select updates' button
 	NCLWW_UNSELECT,      ///< 'Unselect all' button
 	NCLWW_CANCEL,        ///< 'Cancel' button
 	NCLWW_DOWNLOAD,      ///< 'Download' button
 	NCLWW_SEL_ALL_UPDATE, ///< #NWID_SELECTION widget for select all/update buttons.
 };
 /** Window that lists the content that's at the content server */
 class NetworkContentListWindow : public QueryStringBaseWindow, ContentCallback {
 	typedef GUIList<const ContentInfo*> GUIContentList;
 	enum {
 		EDITBOX_MAX_SIZE = 50,
 		EDITBOX_MAX_LENGTH = 300,
 	};
 	static const uint EDITBOX_MAX_SIZE   =  50;
 	static const uint EDITBOX_MAX_LENGTH = 300;
 	/** Runtime saved values */
 	static Listing last_sorting;
 	static Filtering last_filtering;
 	/** The sorter functions */
 	static GUIContentList::SortFunction * const sorter_funcs[];
 	static GUIContentList::FilterFunction * const filter_funcs[];
 	GUIContentList content;      ///< List with content
 	const ContentInfo *selected; ///< The selected content info
 	int list_pos;                ///< Our position in the list
 	uint filesize_sum;           ///< The sum of all selected file sizes

src/network/network_gamelist.cpp

➞

Show inline comments

@@ @@ -123,29 +123,27 @@ void NetworkGameListRemoveItem(NetworkGa @@
 			free(remove);
 			remove = NULL;
 			DEBUG(net, 4, "[gamelist] removed server from list");
 			NetworkRebuildHostList();
 			UpdateNetworkGameWindow(false);
 			return;
+		}
 		prev_item = item;
+	}
+}
 enum {
 	MAX_GAME_LIST_REQUERY_COUNT  = 10, ///< How often do we requery in number of times per server?
 	REQUERY_EVERY_X_GAMELOOPS    = 60, ///< How often do we requery in time?
 	REFRESH_GAMEINFO_X_REQUERIES = 50, ///< Refresh the game info itself after REFRESH_GAMEINFO_X_REQUERIES * REQUERY_EVERY_X_GAMELOOPS game loops
 };
 static const uint MAX_GAME_LIST_REQUERY_COUNT  = 10; ///< How often do we requery in number of times per server?
 static const uint REQUERY_EVERY_X_GAMELOOPS    = 60; ///< How often do we requery in time?
 static const uint REFRESH_GAMEINFO_X_REQUERIES = 50; ///< Refresh the game info itself after REFRESH_GAMEINFO_X_REQUERIES * REQUERY_EVERY_X_GAMELOOPS game loops
 /** Requeries the (game) servers we have not gotten a reply from */
 void NetworkGameListRequery()
+{
 	NetworkGameListHandleDelayedInsert();
 	static uint8 requery_cnt = 0;
 	if (++requery_cnt < REQUERY_EVERY_X_GAMELOOPS) return;
 	requery_cnt = 0;
 	for (NetworkGameList *item = _network_game_list; item != NULL; item = item->next) {

src/network/network_udp.cpp

➞

Show inline comments

@@ @@ -27,29 +27,27 @@ @@
 #include "../core/endian_func.hpp"
 #include "../company_base.h"
 #include "../thread/thread.h"
 #include "../rev.h"
 #include "core/udp.h"
 static ThreadMutex *_network_udp_mutex = ThreadMutex::New();
 /** Session key to register ourselves to the master server */
 static uint64 _session_key = 0;
 enum {
 	ADVERTISE_NORMAL_INTERVAL = 30000, // interval between advertising in ticks (15 minutes)
 	ADVERTISE_RETRY_INTERVAL  =   300, // readvertise when no response after this many ticks (9 seconds)
 	ADVERTISE_RETRY_TIMES     =     3  // give up readvertising after this much failed retries
 };
 static const uint ADVERTISE_NORMAL_INTERVAL = 30000; ///< interval between advertising in ticks (15 minutes)
 static const uint ADVERTISE_RETRY_INTERVAL  =   300; ///< readvertise when no response after this many ticks (9 seconds)
 static const uint ADVERTISE_RETRY_TIMES     =     3; ///< give up readvertising after this much failed retries
 NetworkUDPSocketHandler *_udp_client_socket = NULL; ///< udp client socket
 NetworkUDPSocketHandler *_udp_server_socket = NULL; ///< udp server socket
 NetworkUDPSocketHandler *_udp_master_socket = NULL; ///< udp master socket
 ///*** Communication with the masterserver ***/
 class MasterNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
 protected:
 	DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_MASTER_ACK_REGISTER);
 	DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_MASTER_SESSION_KEY);
 public:

src/newgrf.cpp

➞

Show inline comments

@@ @@ -171,27 +171,25 @@ public: @@
 	FORCEINLINE void Skip(size_t len)
+	{
 		data += len;
 		/* It is valid to move the buffer to exactly the end of the data,
 		 * as there may not be any more data read. */
 		if (data > end) throw OTTDByteReaderSignal();
+	}
 };
 typedef void (*SpecialSpriteHandler)(ByteReader *buf);
 enum {
 	MAX_STATIONS = 256,
 };
 static const uint MAX_STATIONS = 256;
 /* Temporary data used when loading only */
 struct GRFTempEngineData {
 	uint16 cargo_allowed;
 	uint16 cargo_disallowed;
 	RailTypeLabel railtypelabel;
 	bool refitmask_valid;    ///< Did the newgrf set any refittability property? If not, default refittability will be applied.
 	uint8 rv_max_speed;      ///< Temporary storage of RV prop 15, maximum speed in mph/0.8
 };
 static GRFTempEngineData *_gted;
@@ @@ -6600,25 +6598,25 @@ static void FinaliseAirportsArray() @@
 	for (GRFFile **file = _grf_files.Begin(); file != end; file++) {
 		AirportSpec **&airportspec = (*file)->airportspec;
 		if (airportspec != NULL) {
 			for (int i = 0; i < NUM_AIRPORTS; i++) {
 				if (airportspec[i] != NULL && airportspec[i]->enabled) {
 					_airport_mngr.SetEntitySpec(airportspec[i]);
+				}
+			}
+		}
 		AirportTileSpec **&airporttilespec = (*file)->airtspec;
 		if (airporttilespec != NULL) {
-			for (int i = 0; i < NUM_AIRPORTTILES; i++) {
+			for (uint i = 0; i < NUM_AIRPORTTILES; i++) {
 				if (airporttilespec[i] != NULL && airporttilespec[i]->enabled) {
 					_airporttile_mngr.SetEntitySpec(airporttilespec[i]);
+				}
+			}
+		}
+	}
+}
 /* Here we perform initial decoding of some special sprites (as are they
  * described at http://www.ttdpatch.net/src/newgrf.txt, but this is only a very
  * partial implementation yet).
  * XXX: We consider GRF files trusted. It would be trivial to exploit OTTD by

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -145,25 +145,25 @@ static int MapOldSubType(const Vehicle * @@
 			return 2;
 		case VEH_ROAD:
 		case VEH_SHIP:     return 0;
 		case VEH_AIRCRAFT:
 		case VEH_DISASTER: return v->subtype;
 		case VEH_EFFECT:   return v->subtype << 1;
 		default: NOT_REACHED();
+	}
+}
 /* TTDP style aircraft movement states for GRF Action 2 Var 0xE2 */
 enum {
+enum TTDPAircraftMovementStates {
 	AMS_TTDP_HANGAR,
 	AMS_TTDP_TO_HANGAR,
 	AMS_TTDP_TO_PAD1,
 	AMS_TTDP_TO_PAD2,
 	AMS_TTDP_TO_PAD3,
 	AMS_TTDP_TO_ENTRY_2_AND_3,
 	AMS_TTDP_TO_ENTRY_2_AND_3_AND_H,
 	AMS_TTDP_TO_JUNCTION,
 	AMS_TTDP_LEAVE_RUNWAY,
 	AMS_TTDP_TO_INWAY,
 	AMS_TTDP_TO_RUNWAY,
 	AMS_TTDP_TO_OUTWAY,
@@ @@ -281,25 +281,25 @@ static byte MapAircraftMovementState(con @@
 					AMS_TTDP_HELI_LAND_AIRPORT : AMS_TTDP_HELI_LAND_HELIPORT;
 			} else {
 				return AMS_TTDP_FLIGHT_TO_TOWER;
+			}
 		default:
 			return AMS_TTDP_HANGAR;
+	}
+}
 /* TTDP style aircraft movement action for GRF Action 2 Var 0xE6 */
 enum {
+enum TTDPAircraftMovementActions {
 	AMA_TTDP_IN_HANGAR,
 	AMA_TTDP_ON_PAD1,
 	AMA_TTDP_ON_PAD2,
 	AMA_TTDP_ON_PAD3,
 	AMA_TTDP_HANGAR_TO_PAD1,
 	AMA_TTDP_HANGAR_TO_PAD2,
 	AMA_TTDP_HANGAR_TO_PAD3,
 	AMA_TTDP_LANDING_TO_PAD1,
 	AMA_TTDP_LANDING_TO_PAD2,
 	AMA_TTDP_LANDING_TO_PAD3,
 	AMA_TTDP_PAD1_TO_HANGAR,
 	AMA_TTDP_PAD2_TO_HANGAR,

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -138,28 +138,26 @@ private: @@
 	/** Runtime saved values */
 	static Listing last_sorting;
 	static Filtering last_filtering;
 	static GUIGRFConfigList::SortFunction * const sorter_funcs[];
 	static GUIGRFConfigList::FilterFunction * const filter_funcs[];
 	GUIGRFConfigList grfs;
 	const GRFConfig *sel;
 	int sel_pos;
 	enum {
 		EDITBOX_MAX_SIZE = 50,
 		EDITBOX_MAX_LENGTH = 300,
 	};
 	static const uint EDITBOX_MAX_SIZE   =  50;
 	static const uint EDITBOX_MAX_LENGTH = 300;
 	/**
 	 * (Re)build the grf as its amount has changed because
 	 * an item has been added or deleted for example
 	 */
 	void BuildGrfList()
+	{
 		if (!this->grfs.NeedRebuild()) return;
 		/* Create temporary array of grfs to use for listing */
 		this->grfs.Clear();

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -26,27 +26,25 @@ @@
 #include "date_func.h"
 #include "company_func.h"
 #include "animated_tile_func.h"
 #include "functions.h"
 #include "tunnelbridge_map.h"
 #include "newgrf.h"
 #include "core/random_func.hpp"
 #include "table/strings.h"
 static StationClass _station_classes[STAT_CLASS_MAX];
 enum {
 	MAX_SPECLIST = 255,
 };
 static const uint MAX_SPECLIST = 255;
 enum TriggerArea {
 	TA_TILE,
 	TA_PLATFORM,
 	TA_WHOLE,
 };
 struct ETileArea : TileArea {
 	ETileArea(const BaseStation *st, TileIndex tile, TriggerArea ta)
+	{
 		switch (ta) {
 			default: NOT_REACHED();

src/osk_gui.cpp

➞

Show inline comments

@@ @@ -42,25 +42,25 @@ enum OskWidgets { @@
 	OSK_WIDGET_QWERTY_LAST = OSK_WIDGET_QWERTY_FIRST + 11,   ///< Last widget of the qwerty row.
 	OSK_WIDGET_ASDFG_FIRST,                                  ///< First widget of the asdfg row.
 	OSK_WIDGET_ASDFG_LAST = OSK_WIDGET_ASDFG_FIRST + 11,     ///< Last widget of the asdfg row.
 	OSK_WIDGET_ZXCVB_FIRST,                                  ///< First widget of the zxcvb row.
 	OSK_WIDGET_ZXCVB_LAST = OSK_WIDGET_ZXCVB_FIRST + 11,     ///< Last widget of the zxcvb row.
 };
 char _keyboard_opt[2][OSK_KEYBOARD_ENTRIES * 4 + 1];
 static WChar _keyboard[2][OSK_KEYBOARD_ENTRIES];
 enum {
+enum KeyStateBits {
 	KEYS_NONE,
 	KEYS_SHIFT,
 	KEYS_CAPS
 };
 static byte _keystate = KEYS_NONE;
 struct OskWindow : public Window {
 	StringID caption;      ///< the caption for this window.
 	QueryString *qs;       ///< text-input
 	int text_btn;          ///< widget number of parent's text field
 	int ok_btn;            ///< widget number of parent's ok button (=0 when ok shouldn't be passed on)
 	int cancel_btn;        ///< widget number of parent's cancel button (=0 when cancel shouldn't be passed on; text will be reverted to original)

src/pathfinder/npf/npf.cpp

➞

Show inline comments

@@ @@ -12,70 +12,68 @@ @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../landscape.h"
 #include "../../network/network.h"
 #include "../../functions.h"
 #include "../../ship.h"
 #include "../../roadstop_base.h"
 #include "../pathfinder_func.h"
 #include "../pathfinder_type.h"
 #include "../follow_track.hpp"
 #include "aystar.h"
 enum {
 	NPF_HASH_BITS = 12, ///< The size of the hash used in pathfinding. Just changing this value should be sufficient to change the hash size. Should be an even value.
 	/* Do no change below values */
 	NPF_HASH_SIZE = 1 << NPF_HASH_BITS,
 	NPF_HASH_HALFBITS = NPF_HASH_BITS / 2,
 	NPF_HASH_HALFMASK = (1 << NPF_HASH_HALFBITS) - 1
 };
 static const uint NPF_HASH_BITS = 12; ///< The size of the hash used in pathfinding. Just changing this value should be sufficient to change the hash size. Should be an even value.
 /* Do no change below values */
 static const uint NPF_HASH_SIZE = 1 << NPF_HASH_BITS;
 static const uint NPF_HASH_HALFBITS = NPF_HASH_BITS / 2;
 static const uint NPF_HASH_HALFMASK = (1 << NPF_HASH_HALFBITS) - 1;
 /* Meant to be stored in AyStar.targetdata */
+/** Meant to be stored in AyStar.targetdata */
 struct NPFFindStationOrTileData {
 	TileIndex dest_coords;    ///< An indication of where the station is, for heuristic purposes, or the target tile
 	StationID station_index;  ///< station index we're heading for, or INVALID_STATION when we're heading for a tile
 	bool reserve_path;        ///< Indicates whether the found path should be reserved
 	StationType station_type; ///< The type of station we're heading for
 	bool not_articulated;     ///< The (road) vehicle is not articulated
 	const Vehicle *v;         ///< The vehicle we are pathfinding for
 };
 /* Indices into AyStar.userdata[] */
 enum {
 /** Indices into AyStar.userdata[] */
 enum AyStarUserDataType {
 	NPF_TYPE = 0,  ///< Contains a TransportTypes value
 	NPF_SUB_TYPE,  ///< Contains the sub transport type
 	NPF_OWNER,     ///< Contains an Owner value
 	NPF_RAILTYPES, ///< Contains a bitmask the compatible RailTypes of the engine when NPF_TYPE == TRANSPORT_RAIL. Unused otherwise.
 };
 /* Indices into AyStarNode.userdata[] */
 enum {
 /** Indices into AyStarNode.userdata[] */
 enum AyStarNodeUserDataType {
 	NPF_TRACKDIR_CHOICE = 0, ///< The trackdir chosen to get here
 	NPF_NODE_FLAGS,
 };
 /* Flags for AyStarNode.userdata[NPF_NODE_FLAGS]. Use NPFSetFlag() and NPFGetFlag() to use them. */
+/** Flags for AyStarNode.userdata[NPF_NODE_FLAGS]. Use NPFSetFlag() and NPFGetFlag() to use them. */
 enum NPFNodeFlag {
 	NPF_FLAG_SEEN_SIGNAL,       ///< Used to mark that a signal was seen on the way, for rail only
 	NPF_FLAG_2ND_SIGNAL,        ///< Used to mark that two signals were seen, rail only
 	NPF_FLAG_3RD_SIGNAL,        ///< Used to mark that three signals were seen, rail only
 	NPF_FLAG_REVERSE,           ///< Used to mark that this node was reached from the second start node, if applicable
 	NPF_FLAG_LAST_SIGNAL_RED,   ///< Used to mark that the last signal on this path was red
 	NPF_FLAG_LAST_SIGNAL_BLOCK, ///< Used to mark that the last signal on this path was a block signal
 	NPF_FLAG_IGNORE_START_TILE, ///< Used to mark that the start tile is invalid, and searching should start from the second tile on
 	NPF_FLAG_TARGET_RESERVED,   ///< Used to mark that the possible reservation target is already reserved
 	NPF_FLAG_IGNORE_RESERVED,   ///< Used to mark that reserved tiles should be considered impassable
 };
 /* Meant to be stored in AyStar.userpath */
+/** Meant to be stored in AyStar.userpath */
 struct NPFFoundTargetData {
 	uint best_bird_dist;    ///< The best heuristic found. Is 0 if the target was found
 	uint best_path_dist;    ///< The shortest path. Is UINT_MAX if no path is found
 	Trackdir best_trackdir; ///< The trackdir that leads to the shortest path/closest birds dist
 	AyStarNode node;        ///< The node within the target the search led us to
 	bool res_okay;          ///< True if a path reservation could be made
 };
 static AyStar _npf_aystar;
 /* The cost of each trackdir. A diagonal piece is the full NPF_TILE_LENGTH,
  * the shorter piece is sqrt(2)/2*NPF_TILE_LENGTH =~ 0.7071

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -2120,25 +2120,25 @@ static void DrawTrackBits(TileInfo *ti, @@
 		if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && HasReservedTracks(ti->tile, CornerToTrackBits(halftile_corner))) {
 			static const byte _corner_to_track_sprite[] = {3, 1, 2, 0};
 			DrawGroundSprite(_corner_to_track_sprite[halftile_corner] + rti->base_sprites.single_n, PALETTE_CRASH, NULL, 0, -TILE_HEIGHT);
+		}
+	}
+}
 /** Enums holding the offsets from base signal sprite,
  * according to the side it is representing.
  * The addtion of 2 per enum is necessary in order to "jump" over the
  * green state sprite, all signal sprites being in pair,
  * starting with the off-red state */
 enum {
+enum SignalOffsets {
 	SIGNAL_TO_SOUTHWEST =  0,
 	SIGNAL_TO_NORTHEAST =  2,
 	SIGNAL_TO_SOUTHEAST =  4,
 	SIGNAL_TO_NORTHWEST =  6,
 	SIGNAL_TO_EAST      =  8,
 	SIGNAL_TO_WEST      = 10,
 	SIGNAL_TO_SOUTH     = 12,
 	SIGNAL_TO_NORTH     = 14,
 };
 static void DrawSignals(TileIndex tile, TrackBits rails)
+{

src/signal.cpp

➞

Show inline comments

@@ @@ -11,30 +11,28 @@ @@
 #include "stdafx.h"
 #include "debug.h"
 #include "station_map.h"
 #include "tunnelbridge_map.h"
 #include "vehicle_func.h"
 #include "functions.h"
 #include "train.h"
 #include "company_base.h"
 /** these are the maximums used for updating signal blocks */
 enum {
 	SIG_TBU_SIZE    =  64, ///< number of signals entering to block
 	SIG_TBD_SIZE    = 256, ///< number of intersections - open nodes in current block
 	SIG_GLOB_SIZE   = 128, ///< number of open blocks (block can be opened more times until detected)
 	SIG_GLOB_UPDATE =  64, ///< how many items need to be in _globset to force update
 };
 static const uint SIG_TBU_SIZE    =  64; ///< number of signals entering to block
 static const uint SIG_TBD_SIZE    = 256; ///< number of intersections - open nodes in current block
 static const uint SIG_GLOB_SIZE   = 128; ///< number of open blocks (block can be opened more times until detected)
 static const uint SIG_GLOB_UPDATE =  64; ///< how many items need to be in _globset to force update
 assert_compile(SIG_GLOB_UPDATE <= SIG_GLOB_SIZE);
 /** incidating trackbits with given enterdir */
 static const TrackBits _enterdir_to_trackbits[DIAGDIR_END] = {
 	TRACK_BIT_3WAY_NE,
 	TRACK_BIT_3WAY_SE,
 	TRACK_BIT_3WAY_SW,
 	TRACK_BIT_3WAY_NW
 };
 /** incidating trackdirbits with given enterdir */

src/statusbar_gui.cpp

➞

Show inline comments

@@ @@ -74,30 +74,28 @@ static bool DrawScrollingStatusText(cons @@
 enum StatusbarWidget {
 	SBW_LEFT,   ///< left part of the statusbar; date is shown there
 	SBW_MIDDLE, ///< middle part; current news or company name or *** SAVING *** or *** PAUSED ***
 	SBW_RIGHT,  ///< right part; bank balance
 };
 struct StatusBarWindow : Window {
 	bool saving;
 	int ticker_scroll;
 	int reminder_timeout;
 	enum {
 		TICKER_STOP    = 1640, ///< scrolling is finished when counter reaches this value
 		REMINDER_START =   91, ///< initial value of the reminder counter (right dot on the right)
 		REMINDER_STOP  =    0, ///< reminder disappears when counter reaches this value
 		COUNTER_STEP   =    2, ///< this is subtracted from active counters every tick
 	};
 	static const int TICKER_STOP    = 1640; ///< scrolling is finished when counter reaches this value
 	static const int REMINDER_START =   91; ///< initial value of the reminder counter (right dot on the right)
 	static const int REMINDER_STOP  =    0; ///< reminder disappears when counter reaches this value
 	static const int COUNTER_STEP   =    2; ///< this is subtracted from active counters every tick
 	StatusBarWindow(const WindowDesc *desc) : Window()
+	{
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		this->ticker_scroll    =   TICKER_STOP;
 		this->reminder_timeout = REMINDER_STOP;
 		this->InitNested(desc);
+	}
 	virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
+	{

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -202,29 +202,27 @@ public: @@
  */
 static void PopupMainToolbMenu(Window *w, int widget, StringID string, int count)
+{
 	DropDownList *list = new DropDownList();
 	for (int i = 0; i < count; i++) {
 		list->push_back(new DropDownListStringItem(string + i, i, false));
+	}
 	ShowDropDownList(w, list, 0, widget, 140, true, true);
 	SndPlayFx(SND_15_BEEP);
+}
 /** Enum for the Company Toolbar's network related buttons */
 enum {
 	CTMN_CLIENT_LIST = -1, ///< Show the client list
 	CTMN_NEW_COMPANY = -2, ///< Create a new company
 	CTMN_SPECTATE    = -3, ///< Become spectator
 };
 static const int CTMN_CLIENT_LIST = -1; ///< Show the client list
 static const int CTMN_NEW_COMPANY = -2; ///< Create a new company
 static const int CTMN_SPECTATE    = -3; ///< Become spectator
 /**
  * Pop up a generic company list menu.
  */
 static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0)
+{
 	DropDownList *list = new DropDownList();
 #ifdef ENABLE_NETWORK
 	if (widget == TBN_COMPANIES && _networking) {
 		/* Add the client list button for the companies menu */
 		list->push_back(new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false));

src/train_gui.cpp

➞

Show inline comments

@@ @@ -117,28 +117,26 @@ struct CargoSummaryItem { @@
 	StringID subtype; ///< STR_EMPTY if none
 	uint capacity;    ///< Amount that can be carried
 	uint amount;      ///< Amount that is carried
 	StationID source; ///< One of the source stations
 	/** Used by CargoSummary::Find() and similiar functions */
 	FORCEINLINE bool operator != (const CargoSummaryItem &other) const
+	{
 		return this->cargo != other.cargo || this->subtype != other.subtype;
+	}
 };
 enum {
 	TRAIN_DETAILS_MIN_INDENT = 32, ///< Minimum indent level in the train details window
 	TRAIN_DETAILS_MAX_INDENT = 72, ///< Maximum indent level in the train details window; wider than this and we start on a new line
 };
 static const uint TRAIN_DETAILS_MIN_INDENT = 32; ///< Minimum indent level in the train details window
 static const uint TRAIN_DETAILS_MAX_INDENT = 72; ///< Maximum indent level in the train details window; wider than this and we start on a new line
 /** Container for the cargo summary information. */
 typedef SmallVector<CargoSummaryItem, 2> CargoSummary;
 /** Reused container of cargo details */
 static CargoSummary _cargo_summary;
 /**
  * Draw the details cargo tab for the given vehicle at the given position
+ *
  * @param item  Data to draw
  * @param left  The left most coordinate to draw
  * @param right The right most coordinate to draw
@@ @@ -298,25 +296,25 @@ void DrawTrainDetails(const Train *v, in @@
+{
 	/* draw the first 3 details tabs */
 	if (det_tab != TDW_TAB_TOTALS) {
 		bool rtl = _dynlang.text_dir == TD_RTL;
 		Direction dir = rtl ? DIR_E : DIR_W;
 		int x = rtl ? right : left;
 		int sprite_y_offset = 4 + (FONT_HEIGHT_NORMAL - 10) / 2;
 		int line_height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;
 		for (; v != NULL && vscroll_pos > -vscroll_cap; v = v->GetNextVehicle()) {
 			GetCargoSummaryOfArticulatedVehicle(v, &_cargo_summary);
 			/* Draw sprites */
-			int dx = 0;
+			uint dx = 0;
 			int px = x;
 			const Train *u = v;
 			do {
 				Point offset;
 				int width = u->GetDisplayImageWidth(&offset);
 				if (vscroll_pos <= 0 && vscroll_pos > -vscroll_cap) {
 					PaletteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 					DrawSprite(u->GetImage(dir), pal, px + (rtl ? -offset.x : offset.x), y - line_height * vscroll_pos + sprite_y_offset + offset.y);
+				}
 				px += rtl ? -width : width;
 				dx += width;
 				u = u->Next();

src/video/allegro_v.cpp

➞

Show inline comments

@@ @@ -309,28 +309,26 @@ static uint32 ConvertAllegroKeyIntoMy() @@
+	}
 	if (key_shifts & KB_SHIFT_FLAG) key |= WKC_SHIFT;
 	if (key_shifts & KB_CTRL_FLAG)  key |= WKC_CTRL;
 	if (key_shifts & KB_ALT_FLAG)   key |= WKC_ALT;
 #if 0
 	DEBUG(driver, 0, "Scancode character pressed %u", scancode);
 	DEBUG(driver, 0, "Unicode character pressed %u", unicode);
 #endif
 	return (key << 16) + unicode;
+}
 enum {
 	LEFT_BUTTON,
 	RIGHT_BUTTON,
 };
 static const uint LEFT_BUTTON  = 0;
 static const uint RIGHT_BUTTON = 1;
 static void PollEvent()
+{
 	poll_mouse();
 	bool mouse_action = false;
 	/* Mouse buttons */
 	static int prev_button_state;
 	if (prev_button_state != mouse_b) {
 		uint diff = prev_button_state ^ mouse_b;
 		while (diff != 0) {

src/video/cocoa/event.mm

➞

Show inline comments

@@ @@ -40,25 +40,25 @@ @@
 #import <sys/time.h> /* gettimeofday */
 /**
  * Important notice regarding all modifications!!!!!!!
  * There are certain limitations because the file is objective C++.
  * gdb has limitations.
  * C++ and objective C code can't be joined in all cases (classes stuff).
  * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information.
  */
 /* Right Mouse Button Emulation enum */
 enum {
+enum RightMouseButtonEmulationState {
 	RMBE_COMMAND,
 	RMBE_CONTROL,
 	RMBE_OFF,
 };
 static bool _show_mouse = true;
 static unsigned int _current_mods;
 static bool _tab_is_down;
 static bool _emulating_right_button;
 #ifdef _DEBUG
 static uint32 _tEvent;

0 comments (0 inline, 0 general)