From c5b34444af495322255f4b427b3bcc10de8d3e7d Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 10 Feb 2010 17:37:47 +0000 Subject: [PATCH] (svn r19084) -Codechange: minor coding-style fixups --- src/console_internal.h | 2 +- src/fios.h | 2 +- src/pathfinder/npf/aystar.h | 2 +- src/pathfinder/npf/queue.h | 2 +- src/texteff.cpp | 2 +- src/unmovable_cmd.cpp | 2 +- src/video/cocoa/wnd_quartz.mm | 2 +- src/video/cocoa/wnd_quickdraw.mm | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/console_internal.h b/src/console_internal.h index 0be93bf199..b7c6362b7f 100644 --- a/src/console_internal.h +++ b/src/console_internal.h @@ -31,7 +31,7 @@ enum IConsoleHookTypes { * for general flow of permissions or special action needed in some cases */ typedef bool IConsoleHook(); -struct IConsoleHooks{ +struct IConsoleHooks { IConsoleHook *access; ///< trigger when accessing the command IConsoleHook *pre; ///< trigger before the command is executed IConsoleHook *post; ///< trigger after the command is executed diff --git a/src/fios.h b/src/fios.h index 06a4856ae2..4338be727e 100644 --- a/src/fios.h +++ b/src/fios.h @@ -33,7 +33,7 @@ enum { MAX_FILE_SLOTS = 64 }; -enum SaveLoadDialogMode{ +enum SaveLoadDialogMode { SLD_LOAD_GAME, SLD_LOAD_SCENARIO, SLD_SAVE_GAME, diff --git a/src/pathfinder/npf/aystar.h b/src/pathfinder/npf/aystar.h index 56c1804e0c..426a292a0c 100644 --- a/src/pathfinder/npf/aystar.h +++ b/src/pathfinder/npf/aystar.h @@ -32,7 +32,7 @@ enum { AYSTAR_DONE }; -enum{ +enum { AYSTAR_INVALID_NODE = -1, }; diff --git a/src/pathfinder/npf/queue.h b/src/pathfinder/npf/queue.h index 76421e9acb..fc913de350 100644 --- a/src/pathfinder/npf/queue.h +++ b/src/pathfinder/npf/queue.h @@ -37,7 +37,7 @@ struct BinaryHeapNode { }; -struct Queue{ +struct Queue { /* * Pushes an element into the queue, at the appropriate place for the queue. * Requires the queue pointer to be of an appropriate type, of course. diff --git a/src/texteff.cpp b/src/texteff.cpp index c1c133e8db..0feb522db7 100644 --- a/src/texteff.cpp +++ b/src/texteff.cpp @@ -18,7 +18,7 @@ #include "settings_type.h" /** Container for all information about a text effect */ -struct TextEffect : public ViewportSign{ +struct TextEffect : public ViewportSign { uint64 params_1; ///< DParam parameter StringID string_id; ///< String to draw for the text effect, if INVALID_STRING_ID then it's not valid uint8 duration; ///< How long the text effect should stay, in ticks (applies only when mode == TE_RISING) diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp index 8e412b16f5..c48263abd2 100644 --- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -224,7 +224,7 @@ static void DrawTile_Unmovable(TileInfo *ti) DrawBridgeMiddle(ti); break; - case UNMOVABLE_HQ:{ + case UNMOVABLE_HQ: { assert(IsCompanyHQ(ti->tile)); PaletteID palette = COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile)); diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index 76608f8ef6..18a87e2aa9 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -63,7 +63,7 @@ class WindowQuartzSubdriver; @end /* Delegate for our NSWindow to send ask for quit on close */ -@interface OTTD_QuartzWindowDelegate : NSObject{ +@interface OTTD_QuartzWindowDelegate : NSObject { WindowQuartzSubdriver *driver; } diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm index ffea0bfe74..f4c72cc1fa 100644 --- a/src/video/cocoa/wnd_quickdraw.mm +++ b/src/video/cocoa/wnd_quickdraw.mm @@ -63,7 +63,7 @@ class WindowQuickdrawSubdriver; @end /* Delegate for our NSWindow to send ask for quit on close */ -@interface OTTD_QuickdrawWindowDelegate : NSObject{ +@interface OTTD_QuickdrawWindowDelegate : NSObject { WindowQuickdrawSubdriver *driver; }