mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17701) -Codechange: don't start line with a space if it's not inside comment

This commit is contained in:
smatz 2009-10-04 20:51:50 +00:00
parent b243f6ca97
commit 6c7f8fc8b4
12 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/ai_scanner.hpp
View File

@ -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<const char *, class AILibrary *, StringCompare> AILibraryList;

2
src/console.cpp
View File

@ -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 */ \

2
src/network/network_gui.cpp
View File

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

2
src/network/network_udp.cpp
View File

@ -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 */

2
src/pbs.cpp
View File

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

7
src/roadstop.cpp
View File

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

2
src/strings.cpp
View File

@ -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;
}
/**

8
src/table/build_industry.h
View File

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

2
src/table/cargo_const.h
View File

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

4
src/table/road_land.h
View File

@ -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] = {

10
src/video/cocoa/cocoa_v.mm
View File

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

6
src/video/cocoa/wnd_quartz.mm
View File

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