Skip to content

Commit fc209ee

Browse files
committed
Merge branch 'development' into ModuleMan
2 parents f701bc2 + ed50778 commit fc209ee

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.clang-format

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ AlignAfterOpenBracket: Align
66
AlignConsecutiveMacros: false
77
AlignConsecutiveAssignments: false
88
AlignConsecutiveDeclarations: false
9-
AlignEscapedNewlines: DontAlign
9+
AlignEscapedNewlines: DontAlign
1010
AlignOperands: true
11-
AlignTrailingComments: false
11+
AlignTrailingComments: false
1212
AllowAllArgumentsOnNextLine: true
1313
AllowAllConstructorInitializersOnNextLine: true
1414
AllowAllParametersOfDeclarationOnNextLine: true
@@ -73,7 +73,7 @@ PenaltyBreakTemplateDeclaration: 10
7373
PenaltyExcessCharacter: 1000000
7474
PenaltyReturnTypeOnItsOwnLine: 6000
7575
PointerAlignment: Left
76-
ReflowComments: false
76+
ReflowComments: true
7777
SortIncludes: false
7878
SortUsingDeclarations: false
7979
SpaceAfterCStyleCast: false
@@ -95,6 +95,7 @@ SpacesInCStyleCastParentheses: false
9595
SpacesInParentheses: false
9696
SpacesInSquareBrackets: false
9797
SpaceBeforeSquareBrackets: false
98+
#InsertNewlineAtEOF: true
9899
Standard: c++17
99100
StatementMacros:
100101
- Q_UNUSED

Source/Managers/NetworkClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ namespace RTE {
788788
set_clip_rect(targetBitmap, targetBox.GetCorner().m_X, targetBox.GetCorner().m_Y, targetBox.GetCorner().m_X + targetBox.GetWidth() - 1, targetBox.GetCorner().m_Y + targetBox.GetHeight() - 1);
789789

790790
// Choose the correct blitting function based on transparency setting
791-
void (*pfBlit)(BITMAP* source, BITMAP* dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height) = m_BackgroundLayers[frame][i].DrawTrans ? &masked_blit : &blit;
791+
void (*pfBlit)(BITMAP * source, BITMAP * dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height) = m_BackgroundLayers[frame][i].DrawTrans ? &masked_blit : &blit;
792792

793793
// See if this SceneLayer is wider AND higher than the target bitmap; then use simple wrapping logic - otherwise need to tile
794794
if (m_BackgroundBitmaps[i]->w >= targetBitmap->w && m_BackgroundBitmaps[i]->h >= targetBitmap->h) {

0 commit comments

Comments
 (0)