From 6c7f8fc8b4974a4546190d5c2e9abcdfa74f9382 Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 4 Oct 2009 20:51:50 +0000 Subject: [PATCH] (svn r17701) -Codechange: don't start line with a space if it's not inside comment --- src/ai/ai_scanner.hpp | 2 +- src/console.cpp | 2 +- src/network/network_gui.cpp | 2 +- src/network/network_udp.cpp | 2 +- src/pbs.cpp | 2 +- src/roadstop.cpp | 7 ++++--- src/strings.cpp | 2 +- src/table/build_industry.h | 8 ++++---- src/table/cargo_const.h | 2 +- src/table/road_land.h | 4 ++-- src/video/cocoa/cocoa_v.mm | 10 +++++----- src/video/cocoa/wnd_quartz.mm | 6 +++--- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp index e6a074235f..e65a7f3543 100644 --- a/src/ai/ai_scanner.hpp +++ b/src/ai/ai_scanner.hpp @@ -69,7 +69,7 @@ public: void RescanAIDir(); #if defined(ENABLE_NETWORK) - bool HasAI(const struct ContentInfo *ci, bool md5sum); + bool HasAI(const struct ContentInfo *ci, bool md5sum); #endif private: typedef std::map AILibraryList; diff --git a/src/console.cpp b/src/console.cpp index c37d995d4b..f0f97686ab 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -312,7 +312,7 @@ void IConsoleVarHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook * _base = item_new; \ } else { \ item_before->next = item_new; \ - } \ + } \ \ item_new->next = item; \ /* END - Alphabetical insert */ \ diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 41685aab92..085be44d8f 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -942,7 +942,7 @@ void ShowNetworkGameWindow() /* add all servers from the config file to our list */ for (char **iter = _network_host_list.Begin(); iter != _network_host_list.End(); iter++) { NetworkAddServer(*iter); - } + } } new NetworkGameWindow(&_network_game_window_desc); diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index 7f65d1658b..a4b388e918 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -528,7 +528,7 @@ void NetworkUDPAdvertiseThread(void *pntr) } /* Register us to the master server - This function checks if it needs to send an advertise */ + * This function checks if it needs to send an advertise */ void NetworkUDPAdvertise() { /* Check if we should send an advertise */ diff --git a/src/pbs.cpp b/src/pbs.cpp index 7a66180d29..a0e6531b6b 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -130,7 +130,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t) * @param tile the tile * @param t the track */ - void UnreserveRailTrack(TileIndex tile, Track t) +void UnreserveRailTrack(TileIndex tile, Track t) { assert((GetTileTrackStatus(tile, TRANSPORT_RAIL, 0) & TrackToTrackBits(t)) != 0); diff --git a/src/roadstop.cpp b/src/roadstop.cpp index ac7ece2ad0..969c1d21dd 100644 --- a/src/roadstop.cpp +++ b/src/roadstop.cpp @@ -18,9 +18,10 @@ RoadStopPool _roadstop_pool("RoadStop"); INSTANTIATE_POOL_METHODS(RoadStop) -/** De-Initializes a RoadStops. This includes clearing all slots that vehicles might - * have and unlinks it from the linked list of road stops at the given station - */ +/** + * De-Initializes RoadStops. This includes clearing all slots that vehicles might + * have and unlinks it from the linked list of road stops at the given station + */ RoadStop::~RoadStop() { if (CleaningPool()) return; diff --git a/src/strings.cpp b/src/strings.cpp index 66eb6b92b9..bfe583148d 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -535,7 +535,7 @@ static const Units units[] = { */ uint ConvertSpeedToDisplaySpeed(uint speed) { - return (speed * units[_settings_game.locale.units].s_m) >> units[_settings_game.locale.units].s_s; + return (speed * units[_settings_game.locale.units].s_m) >> units[_settings_game.locale.units].s_s; } /** diff --git a/src/table/build_industry.h b/src/table/build_industry.h index 4eeb2890f1..fbbe117183 100644 --- a/src/table/build_industry.h +++ b/src/table/build_industry.h @@ -1181,10 +1181,10 @@ enum { */ #define MI(tbl, sndc, snd, d, pc, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col, \ - c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \ - {tbl, lengthof(tbl), (uint8)min(255, d), 0, d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ - {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \ - sndc, snd, 0, 0, true, {INVALID_INDUSTRYTYPE, 0, NULL, NULL, INVALID_INDUSTRYTYPE}} + c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \ + {tbl, lengthof(tbl), (uint8)min(255, d), 0, d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ + {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \ + sndc, snd, 0, 0, true, {INVALID_INDUSTRYTYPE, 0, NULL, NULL, INVALID_INDUSTRYTYPE}} /* Format: tile table count and sounds table cost multiplier appear chances(4ingame, 4random) map colour diff --git a/src/table/cargo_const.h b/src/table/cargo_const.h index 410713f115..6862515805 100644 --- a/src/table/cargo_const.h +++ b/src/table/cargo_const.h @@ -10,7 +10,7 @@ /** @file cargo_const.h Table of all default cargo types */ #define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m) \ - {bt, label, c, c, e, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, NULL, NULL, 0} + {bt, label, c, c, e, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, NULL, NULL, 0} static const CargoSpec _default_cargo[] = { MK( 0, 'PASS', 152, 1, 3185, 0, 24, false, TE_PASSENGERS, STR_CARGO_PLURAL_PASSENGERS, STR_CARGO_SINGULAR_PASSENGER, STR_PASSENGERS, STR_QUANTITY_PASSENGERS, STR_ABBREV_PASSENGERS, diff --git a/src/table/road_land.h b/src/table/road_land.h index 9da2107edc..fb8e42ea1d 100644 --- a/src/table/road_land.h +++ b/src/table/road_land.h @@ -75,8 +75,8 @@ static const DrawTileSprites _tram_depot[] = { static const SpriteID _road_tile_sprites_1[16] = { - 0, 0x546, 0x545, 0x53B, 0x544, 0x534, 0x53E, 0x539, - 0x543, 0x53C, 0x535, 0x538, 0x53D, 0x537, 0x53A, 0x536 + 0, 0x546, 0x545, 0x53B, 0x544, 0x534, 0x53E, 0x539, + 0x543, 0x53C, 0x535, 0x538, 0x53D, 0x537, 0x53A, 0x536 }; static const SpriteID _road_frontwire_sprites_1[16] = { diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index 12630af812..41dd4611bb 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -246,14 +246,14 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp) #ifdef ENABLE_COCOA_QUARTZ #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - /* + /* * If we get here we are running 10.4 or earlier and either openttd was compiled without the quickdraw driver * or it failed to load for some reason. Fall back to Quartz if possible even though that driver is slower. */ - if (MacOSVersionIsAtLeast(10, 4, 0)) { - ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); - if (ret != NULL) return ret; - } + if (MacOSVersionIsAtLeast(10, 4, 0)) { + ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); + if (ret != NULL) return ret; + } #endif #endif diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index 797880a780..95a2e981c7 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -351,7 +351,7 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace() /* Calculate total area we are blitting */ for (n = 0; n < dirtyRectCount; n++) { blitArea += dirtyRects[n].size.width * dirtyRects[n].size.height; - } + } /* * This might be completely stupid, but in my extremely subjective opinion it feels faster @@ -396,8 +396,8 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace() clippedImage = CGImageCreateWithImageInRect(fullImage, clipRect); CGContextDrawImage(viewContext, blitRect, clippedImage); CGImageRelease(clippedImage); - } - } + } + } CGImageRelease(fullImage); }