From 32cbe57178129d371752e29e857fa454a046f7c3 Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 4 Oct 2009 17:10:57 +0000 Subject: (svn r17692) -Codechange: minor coding style fixes --- src/ai/ai_info_dummy.cpp | 2 +- src/ai/api/ai_abstractlist.cpp | 6 ++++-- src/ai/api/ai_abstractlist.hpp | 3 ++- src/ai/api/ai_error.cpp | 3 ++- src/ai/api/ai_list.cpp | 3 ++- src/ai/api/squirrel_export.awk | 6 ++++-- src/autoreplace_gui.cpp | 3 ++- src/aystar.cpp | 3 ++- src/network/core/tcp_content.cpp | 3 ++- src/terraform_gui.cpp | 3 ++- src/tgp.cpp | 3 ++- src/water_cmd.cpp | 6 +++--- 12 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/ai/ai_info_dummy.cpp b/src/ai/ai_info_dummy.cpp index c10adbc88..9036d2dfd 100644 --- a/src/ai/ai_info_dummy.cpp +++ b/src/ai/ai_info_dummy.cpp @@ -66,7 +66,7 @@ void AI_CreateAIDummy(HSQUIRRELVM vm) /* 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. */ diff --git a/src/ai/api/ai_abstractlist.cpp b/src/ai/api/ai_abstractlist.cpp index 0a2b3e224..6647b725e 100644 --- a/src/ai/api/ai_abstractlist.cpp +++ b/src/ai/api/ai_abstractlist.cpp @@ -178,7 +178,8 @@ public: 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 @@ public: 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 */ diff --git a/src/ai/api/ai_abstractlist.hpp b/src/ai/api/ai_abstractlist.hpp index be266b960..86be9dc21 100644 --- a/src/ai/api/ai_abstractlist.hpp +++ b/src/ai/api/ai_abstractlist.hpp @@ -267,7 +267,8 @@ public: * @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); diff --git a/src/ai/api/ai_error.cpp b/src/ai/api/ai_error.cpp index 82b537681..2031d57b2 100644 --- a/src/ai/api/ai_error.cpp +++ b/src/ai/api/ai_error.cpp @@ -61,6 +61,7 @@ AIError::AIErrorMapString AIError::error_map_string = AIError::AIErrorMapString( 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); } diff --git a/src/ai/api/ai_list.cpp b/src/ai/api/ai_list.cpp index 29446aec4..f93e504f1 100644 --- a/src/ai/api/ai_list.cpp +++ b/src/ai/api/ai_list.cpp @@ -28,7 +28,8 @@ void AIList::RemoveItem(int32 item) 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")); diff --git a/src/ai/api/squirrel_export.awk b/src/ai/api/squirrel_export.awk index d33cfe4a4..b9ea9e519 100644 --- 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 @@ function array_sort(ARRAY, ELEMENTS, temp, i, j) { 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, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (" name " *)instance; }" diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 3d00bfa3b..22298fe69 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -408,7 +408,8 @@ public: 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); diff --git a/src/aystar.cpp b/src/aystar.cpp index dfd3a3a81..ef8b7657e 100644 --- a/src/aystar.cpp +++ b/src/aystar.cpp @@ -240,7 +240,8 @@ void AyStarMain_Clear(AyStar *aystar) * 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 */ diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp index b46b1bbbe..a56f31d8d 100644 --- a/src/network/core/tcp_content.cpp +++ b/src/network/core/tcp_content.cpp @@ -121,7 +121,8 @@ void NetworkContentSocketHandler::Recv_Packets() * @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; \ diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 35714f81d..1fee3d21c 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -660,7 +660,8 @@ struct ScenarioEditorLandscapeGenerationWindow : Window { this->GetWidget(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 diff --git a/src/tgp.cpp b/src/tgp.cpp index 2740e0ee3..f4157ecf0 100644 --- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -181,7 +181,8 @@ struct HeightMap * @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]; } }; diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 147df8909..65040837e 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -554,8 +554,7 @@ struct LocksDrawTileStruct { #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 @@ void DrawShoreTile(Slope tileh) 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; -- cgit v1.2.3-70-g09d2