Mercurial > hg > openttd
changeset 13185:d49a7e07754e draft
(svn r17692) -Codechange: minor coding style fixes
author | smatz <smatz@openttd.org> |
---|---|
date | Sun, 04 Oct 2009 17:10:57 +0000 |
parents | 9739a25d0d7e |
children | afdfdda87cd4 |
files | src/ai/ai_info_dummy.cpp src/ai/api/ai_abstractlist.cpp src/ai/api/ai_abstractlist.hpp src/ai/api/ai_error.cpp src/ai/api/ai_list.cpp src/ai/api/squirrel_export.awk src/autoreplace_gui.cpp src/aystar.cpp src/network/core/tcp_content.cpp src/terraform_gui.cpp src/tgp.cpp src/water_cmd.cpp |
diffstat | 12 files changed, 28 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ai/ai_info_dummy.cpp +++ b/src/ai/ai_info_dummy.cpp @@ -66,7 +66,7 @@ /* 2) We construct the AI's code. This is done by merging a header, body and footer */ char dummy_script[4096]; char *dp = dummy_script; - dp = strecpy(dp, "class DummyAI extends AIController {\n function Start() {\n", lastof(dummy_script)); + dp = strecpy(dp, "class DummyAI extends AIController {\n function Start()\n {\n", lastof(dummy_script)); /* As special trick we need to split the error message on newlines and * emit each newline as a separate error printing string. */
--- a/src/ai/api/ai_abstractlist.cpp +++ b/src/ai/api/ai_abstractlist.cpp @@ -178,7 +178,8 @@ return item_current; } - void End() { + void End() + { this->bucket_list = NULL; this->has_no_more_items = true; this->item_next = 0; @@ -286,7 +287,8 @@ return item_current; } - void Remove(int item) { + void Remove(int item) + { if (!this->HasNext()) return; /* If we remove the 'next' item, skip to the next */
--- a/src/ai/api/ai_abstractlist.hpp +++ b/src/ai/api/ai_abstractlist.hpp @@ -267,7 +267,8 @@ * @note Example: * list.Valuate(AIBridge.GetPrice, 5); * list.Valuate(AIBridge.GetMaxLength); - * function MyVal(bridge_id, myparam) { + * function MyVal(bridge_id, myparam) + * { * return myparam * bridge_id; // This is silly * } * list.Valuate(MyVal, 12);
--- a/src/ai/api/ai_error.cpp +++ b/src/ai/api/ai_error.cpp @@ -61,6 +61,7 @@ error_map_string[ai_error_msg] = message; } -/* static */ AIError::ErrorCategories AIError::GetErrorCategory() { +/* static */ AIError::ErrorCategories AIError::GetErrorCategory() +{ return (AIError::ErrorCategories)(GetLastError() >> (uint)ERR_CAT_BIT_SIZE); }
--- a/src/ai/api/ai_list.cpp +++ b/src/ai/api/ai_list.cpp @@ -28,7 +28,8 @@ AIAbstractList::RemoveItem(item); } -SQInteger AIList::_set(HSQUIRRELVM vm) { +SQInteger AIList::_set(HSQUIRRELVM vm) +{ if (sq_gettype(vm, 2) != OT_INTEGER) return SQ_ERROR; if (sq_gettype(vm, 3) != OT_INTEGER || sq_gettype(vm, 3) == OT_NULL) { return sq_throwerror(vm, _SC("you can only assign integers to this list"));
--- a/src/ai/api/squirrel_export.awk +++ b/src/ai/api/squirrel_export.awk @@ -13,7 +13,8 @@ # # Simple insertion sort. -function array_sort(ARRAY, ELEMENTS, temp, i, j) { +function array_sort(ARRAY, ELEMENTS, temp, i, j) +{ for (i = 2; i <= ELEMENTS; i++) for (j = i; ARRAY[j - 1] > ARRAY[j]; --j) { temp = ARRAY[j] @@ -23,7 +24,8 @@ return } -function dump_class_templates(name) { +function dump_class_templates(name) +{ print " template <> " name " *GetParam(ForceType<" name " *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (" name " *)instance; }" print " template <> " name " &GetParam(ForceType<" name " &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(" name " *)instance; }" print " template <> const " name " *GetParam(ForceType<const " name " *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (" name " *)instance; }"
--- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -408,7 +408,8 @@ this->SetDirty(); } - virtual void OnResize(Point delta) { + virtual void OnResize(Point delta) + { this->vscroll.UpdateCapacity(delta.y / (int)this->resize.step_height); this->vscroll2.UpdateCapacity(delta.y / (int)this->resize.step_height);
--- a/src/aystar.cpp +++ b/src/aystar.cpp @@ -240,7 +240,8 @@ * aystar->clear() is called. Note that when you stop the algorithm halfway, * you should still call clear() yourself! */ -int AyStarMain_Main(AyStar *aystar) { +int AyStarMain_Main(AyStar *aystar) +{ int r, i = 0; /* Loop through the OpenList * Quit if result is no AYSTAR_STILL_BUSY or is more than loops_per_tick */
--- a/src/network/core/tcp_content.cpp +++ b/src/network/core/tcp_content.cpp @@ -121,7 +121,8 @@ * @param type the packet type to create the stub for */ #define DEFINE_UNAVAILABLE_CONTENT_RECEIVE_COMMAND(type) \ -bool NetworkContentSocketHandler::NetworkPacketReceive_## type ##_command(Packet *p) { \ +bool NetworkContentSocketHandler::NetworkPacketReceive_## type ##_command(Packet *p) \ +{ \ DEBUG(net, 0, "[tcp/content] received illegal packet type %d from %s", \ type, this->client_addr.GetAddressAsString()); \ return false; \
--- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -660,7 +660,8 @@ this->GetWidget<NWidgetCore>(ETTW_PLACE_DESERT_LIGHTHOUSE)->tool_tip = (_settings_game.game_creation.landscape == LT_TROPIC) ? STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA : STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE; } - virtual void OnPaint() { + virtual void OnPaint() + { this->DrawWidgets(); if (this->IsWidgetLowered(ETTW_LOWER_LAND) || this->IsWidgetLowered(ETTW_RAISE_LAND)) { // change area-size if raise/lower corner is selected
--- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -181,7 +181,8 @@ * @param y Y position * @return height as fixed point number */ - inline height_t &height(uint x, uint y) { + inline height_t &height(uint x, uint y) + { return h[x + y * dim_x]; } };
--- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -554,8 +554,7 @@ #include "table/water_land.h" static void DrawWaterStuff(const TileInfo *ti, const WaterDrawTileStruct *wdts, - SpriteID palette, uint base, bool draw_ground -) + SpriteID palette, uint base, bool draw_ground) { SpriteID image; SpriteID water_base = GetCanalSprite(CF_WATERSLOPE, ti->tile); @@ -635,7 +634,8 @@ DrawGroundSprite(SPR_SHORE_BASE + tileh_to_shoresprite[tileh], PAL_NONE); } -void DrawWaterClassGround(const TileInfo *ti) { +void DrawWaterClassGround(const TileInfo *ti) +{ switch (GetWaterClass(ti->tile)) { case WATER_CLASS_SEA: DrawSeaWater(ti->tile); break; case WATER_CLASS_CANAL: DrawCanalWater(ti->tile); break;