# HG changeset patch # User tron # Date 1106485775 0 # Node ID 1bab892228cd50d7dee68f5c2837ec7ac10963fa # Parent 6c05bdeb9d41694b51edb4baee3f5e8d1a8d0f9b (svn r1610) Remove trailing whitespace (last time ever, i hope) diff -r 6c05bdeb9d41 -r 1bab892228cd airport_gui.c --- a/airport_gui.c Sun Jan 23 13:08:01 2005 +0000 +++ b/airport_gui.c Sun Jan 23 13:09:35 2005 +0000 @@ -203,7 +203,7 @@ CheckRedrawStationCoverage(w); } break; - + case WE_DESTROY: ResetObjectToPlace(); break; diff -r 6c05bdeb9d41 -r 1bab892228cd console.c --- a/console.c Sun Jan 23 13:08:01 2005 +0000 +++ b/console.c Sun Jan 23 13:09:35 2005 +0000 @@ -1089,7 +1089,7 @@ uint c; uint i; uint l; - + if (strlen(cmdstr) == 0) // only execute if there is something typed obviously return; diff -r 6c05bdeb9d41 -r 1bab892228cd dedicated.c --- a/dedicated.c Sun Jan 23 13:08:01 2005 +0000 +++ b/dedicated.c Sun Jan 23 13:09:35 2005 +0000 @@ -105,7 +105,7 @@ void CreateWindowsConsoleThread(void) { /* Create event to signal when console input is ready */ - hEvent = CreateEvent(NULL, false, false, "keyboard input"); + hEvent = CreateEvent(NULL, false, false, "keyboard input"); hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)CheckForConsoleInput, 0, 0, NULL); if (hThread == NULL) @@ -151,7 +151,7 @@ #ifdef WIN32 CloseWindowsConsoleThread(); #endif - free(_dedicated_video_mem); + free(_dedicated_video_mem); } static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {} @@ -183,7 +183,7 @@ { if (WaitForSingleObject(hEvent, 1) == WAIT_OBJECT_0) return true; - + return false; } #endif diff -r 6c05bdeb9d41 -r 1bab892228cd fileio.c --- a/fileio.c Sun Jan 23 13:08:01 2005 +0000 +++ b/fileio.c Sun Jan 23 13:09:35 2005 +0000 @@ -87,7 +87,7 @@ static inline void FioCloseFile(int slot) { if (_fio.handles[slot] != NULL) { - fclose(_fio.handles[slot]); + fclose(_fio.handles[slot]); _fio.handles[slot] = NULL; } } diff -r 6c05bdeb9d41 -r 1bab892228cd main_gui.c --- a/main_gui.c Sun Jan 23 13:08:01 2005 +0000 +++ b/main_gui.c Sun Jan 23 13:09:35 2005 +0000 @@ -121,7 +121,7 @@ * @param cursor How should the cursor image change? E.g. cursor with depot image in it * @param mode Tile highlighting mode, e.g. drawing a rectangle or a dot on the ground * @param placeproc Procedure which will be called when someone clicks on the map - + * @return true if the button is clicked, false if it's unclicked */ diff -r 6c05bdeb9d41 -r 1bab892228cd namegen.c --- a/namegen.c Sun Jan 23 13:08:01 2005 +0000 +++ b/namegen.c Sun Jan 23 13:09:35 2005 +0000 @@ -13,7 +13,7 @@ return SeedChance(shift_by, max + bias, seed) - bias; } -static void ReplaceWords(const char *org, const char *rep, char *buf) +static void ReplaceWords(const char *org, const char *rep, char *buf) { if (strncmp(buf, org, 4) == 0) strncpy(buf, rep, 4); } diff -r 6c05bdeb9d41 -r 1bab892228cd player_gui.c --- a/player_gui.c Sun Jan 23 13:08:01 2005 +0000 +++ b/player_gui.c Sun Jan 23 13:09:35 2005 +0000 @@ -927,5 +927,5 @@ w->window_number = _opt.diff_level; WP(w, highscore_d).rank = SaveHighScoreValue(p); } - } + } } diff -r 6c05bdeb9d41 -r 1bab892228cd rail_cmd.c --- a/rail_cmd.c Sun Jan 23 13:08:01 2005 +0000 +++ b/rail_cmd.c Sun Jan 23 13:09:35 2005 +0000 @@ -1140,7 +1140,7 @@ /* Do it? */ if (flags & DC_EXEC) { - + _map3_lo[tile] &= ~c; /* removed last signal from tile? */ @@ -1149,7 +1149,7 @@ _map2[tile] &= ~0xF0; CLRBIT(_map3_hi[tile], 2); // remove any possible semaphores } - + SetSignalsOnBothDir(tile, track); MarkTileDirtyByTile(tile); @@ -1289,7 +1289,7 @@ return CMD_ERROR; cost += ret; }; - + m5 &= RAIL_BIT_MASK; if (flags & DC_EXEC) goto regular_track; diff -r 6c05bdeb9d41 -r 1bab892228cd road_gui.c --- a/road_gui.c Sun Jan 23 13:08:01 2005 +0000 +++ b/road_gui.c Sun Jan 23 13:09:35 2005 +0000 @@ -465,7 +465,7 @@ CheckRedrawStationCoverage(w); } break; - + case WE_DESTROY: ResetObjectToPlace(); break; diff -r 6c05bdeb9d41 -r 1bab892228cd train_cmd.c --- a/train_cmd.c Sun Jan 23 13:08:01 2005 +0000 +++ b/train_cmd.c Sun Jan 23 13:09:35 2005 +0000 @@ -367,7 +367,7 @@ return (rvi->base_cost * (_price.build_railvehicle >> 3)) >> 5; } -void AddRearEngineToMultiheadedTrain(Vehicle *v, Vehicle *u, bool building) +void AddRearEngineToMultiheadedTrain(Vehicle *v, Vehicle *u, bool building) { u->direction = v->direction; u->owner = v->owner; @@ -387,7 +387,7 @@ if (building) v->next = u; u->engine_type = v->engine_type; u->build_year = v->build_year; - if (building) + if (building) v->value = u->value = v->value >> 1; else u->value = v->value; @@ -2399,7 +2399,7 @@ ChangeTrainDirRandomly(v); } - if (state >= 4440 && !(v->tick_counter&0x1F)) + if (state >= 4440 && !(v->tick_counter&0x1F)) DeleteLastWagon(v); } diff -r 6c05bdeb9d41 -r 1bab892228cd ttd.c --- a/ttd.c Sun Jan 23 13:08:01 2005 +0000 +++ b/ttd.c Sun Jan 23 13:09:35 2005 +0000 @@ -729,7 +729,7 @@ LoadIntroGame(); _switch_mode = SM_NONE; NetworkClientConnectGame(network_conn, rport); - } + } } #endif /* ENABLE_NETWORK */ diff -r 6c05bdeb9d41 -r 1bab892228cd tunnelbridge_cmd.c --- a/tunnelbridge_cmd.c Sun Jan 23 13:08:01 2005 +0000 +++ b/tunnelbridge_cmd.c Sun Jan 23 13:09:35 2005 +0000 @@ -817,8 +817,8 @@ return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); return DoClearBridge(tile, flags); - } - + } + return CMD_ERROR; } diff -r 6c05bdeb9d41 -r 1bab892228cd vehicle.c --- a/vehicle.c Sun Jan 23 13:08:01 2005 +0000 +++ b/vehicle.c Sun Jan 23 13:09:35 2005 +0000 @@ -1361,20 +1361,20 @@ settings, a vehicle can be replaced twice.. check if this is the situation here */ if (old_engine_type == new_engine_type && v->age == 0) return CMD_ERROR; - + if ( v->type == VEH_Train ) { u = GetLastVehicleInChain(v); if ( RailVehInfo(new_engine_type)->flags & RVI_MULTIHEAD ) build_cost = build_cost >> 1; //multiheaded engines have EstimateTrainCost() for both engines - + if ( old_engine_type != new_engine_type ) { - + // prevent that the rear engine can get replaced to something else than the front engine if ( v->u.rail.first_engine != 0xffff && RailVehInfo(old_engine_type)->flags & RVI_MULTIHEAD && RailVehInfo(old_engine_type)->flags ) { Vehicle *first = GetFirstVehicleInChain(v); if ( first->engine_type != new_engine_type ) return CMD_ERROR; } - + // checks if the engine is the first one if ( v->u.rail.first_engine == 0xffff ) { if ( RailVehInfo(new_engine_type)->flags & RVI_MULTIHEAD ) { @@ -1431,7 +1431,7 @@ InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - + if (v->engine_type != new_engine_type) { byte sprite = v->spritenum; byte cargo_type = v->cargo_type; @@ -1471,7 +1471,7 @@ } else { v->cargo_type = rvi->cargo_type; } - + if ( rvi2->flags & RVI_MULTIHEAD && !(rvi->flags & RVI_MULTIHEAD) && v->index == first->index) { if (old_engine_type == u->engine_type ) { Vehicle *w; @@ -1482,11 +1482,11 @@ DeleteVehicle(u); } } - + if ( rvi->flags & RVI_MULTIHEAD && rvi2->flags & RVI_MULTIHEAD && v->index == first->index ) { CmdReplaceVehicle(x, y, flags, u->index, p2); } - + if ( rvi->flags & RVI_MULTIHEAD && !(rvi2->flags & RVI_MULTIHEAD) && v->index == first->index ) { if ( old_engine_type != u->engine_type ) { Vehicle *w; @@ -1496,7 +1496,7 @@ } } } - + // updates the id of the front engine in the other units, since the front engine just got a new engine_id // this is needed for wagon override if ( v->u.rail.first_engine == 0xffff && v->next != NULL ) { @@ -1505,7 +1505,7 @@ veh->u.rail.first_engine = new_engine_type; } while ( (veh=veh->next) != NULL ); } - + break; } case VEH_Road: diff -r 6c05bdeb9d41 -r 1bab892228cd viewport.c --- a/viewport.c Sun Jan 23 13:08:01 2005 +0000 +++ b/viewport.c Sun Jan 23 13:09:35 2005 +0000 @@ -689,7 +689,7 @@ diffx = myabs(TileX(start)-TileX(ti->tile)); diffy = myabs(TileY(start)-TileY(ti->tile)); - + side = myabs( diffx-diffy ); if(dir<2) side = 0; @@ -697,7 +697,7 @@ if (thd->make_square_red) image |= 0x3048000; DrawSelectionSprite(image, ti); - } + } return; } @@ -1963,7 +1963,7 @@ _special_mouse_mode = WSM_PRESIZE; } -/* returns information about the 2x1 piece to be build. +/* returns information about the 2x1 piece to be build. * The lower bits (0-3) are the track type. */ static byte Check2x1AutoRail(int mode) { @@ -2025,7 +2025,7 @@ b = (Check2x1AutoRail(3)) | HT_LINE; else if (dx==-16) b = (Check2x1AutoRail(2)) | HT_LINE; - else + else b = HT_LINE | HT_DIR_X; y = thd->selstart.y; } else if (w == 16) { // Or Y direction? @@ -2033,7 +2033,7 @@ b = (Check2x1AutoRail(1)) | HT_LINE; else if (dy==-16) // 2x1 other direction b = (Check2x1AutoRail(0)) | HT_LINE; - else + else b = HT_LINE | HT_DIR_Y; x = thd->selstart.x; } else if (w > h * 2) { // still count as x dir? @@ -2131,7 +2131,7 @@ thd->selend.y = y; } -// while dragging +// while dragging bool VpHandlePlaceSizingDrag(void) { Window *w; @@ -2160,7 +2160,7 @@ // mouse button released.. // keep the selected tool, but reset it to the original mode. _special_mouse_mode = WSM_NONE; - if (_thd.next_drawstyle == HT_RECT) + if (_thd.next_drawstyle == HT_RECT) _thd.place_mode = VHM_RECT; else if ((e.place.userdata & 0xF) == VPM_SIGNALDIRS) // some might call this a hack... -- Dominik _thd.place_mode = VHM_RECT; diff -r 6c05bdeb9d41 -r 1bab892228cd viewport.h --- a/viewport.h Sun Jan 23 13:08:01 2005 +0000 +++ b/viewport.h Sun Jan 23 13:09:35 2005 +0000 @@ -79,7 +79,7 @@ HT_RAIL = 0x10, /* autorail (one piece) * (uses lower bits to indicate direction) */ - /* lower bits (used with HT_LINE and HT_RAIL): + /* lower bits (used with HT_LINE and HT_RAIL): * (see ASCII art in autorail.h for a visual interpretation) */ HT_DIR_X = 0, // X direction HT_DIR_Y = 1, // Y direction diff -r 6c05bdeb9d41 -r 1bab892228cd window.c --- a/window.c Sun Jan 23 13:08:01 2005 +0000 +++ b/window.c Sun Jan 23 13:09:35 2005 +0000 @@ -52,8 +52,8 @@ if (e.click.widget == 0) { /* 'X' */ DeleteWindow(w); return; - } - + } + if (e.click.widget == 1) /* 'Title bar' */ StartWindowDrag(w); }