From f50cc657be4f82e4fcef2ccb6aa1641df3eeb4e5 Mon Sep 17 00:00:00 2001
From: joris <joris.dauphin@gmail.com>
Date: Wed, 3 Apr 2013 11:09:28 +0200
Subject: [PATCH] [AStyle]
---
src/ai/ai_magic.cpp | 6 +++---
src/network/net_lowlevel.cpp | 3 ++-
src/network/net_message.cpp | 4 ++--
src/network/network.cpp | 5 ++---
src/video/graphic.cpp | 8 ++++----
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/ai/ai_magic.cpp b/src/ai/ai_magic.cpp
index de86d1bca..1a8f00dca 100644
--- a/src/ai/ai_magic.cpp
+++ b/src/ai/ai_magic.cpp
@@ -67,9 +67,9 @@ void AiCheckMagic()
// Check if we can cast this spell. SpellIsAvailable checks for upgrades.
if (unit.Type->CanCastSpell[j] && SpellIsAvailable(player, j)
&& SpellTypeTable[j]->AICast) {
- if (AutoCastSpell(unit, *SpellTypeTable[j])) {
- return; // cast only one spell per time
- }
+ if (AutoCastSpell(unit, *SpellTypeTable[j])) {
+ return; // cast only one spell per time
+ }
}
}
}
diff --git a/src/network/net_lowlevel.cpp b/src/network/net_lowlevel.cpp
index 43805ff74..b1909bdc4 100644
--- a/src/network/net_lowlevel.cpp
+++ b/src/network/net_lowlevel.cpp
@@ -528,7 +528,8 @@ int SocketSet::Select(int timeout)
} while (retval == -1 && errno == EINTR);
#endif
- for (size_t i = 0; i != this->Sockets.size(); ++i) {
+ for (size_t i = 0; i != this->Sockets.size(); ++i)
+ {
this->SocketReady[i] = FD_ISSET(this->Sockets[i], &mask);
}
return retval;
diff --git a/src/network/net_message.cpp b/src/network/net_message.cpp
index 448da8fe2..a5e448e07 100644
--- a/src/network/net_message.cpp
+++ b/src/network/net_message.cpp
@@ -85,7 +85,7 @@ int serialize8(unsigned char *buf, int8_t data)
return sizeof(data);
}
template <int N>
-int serialize(unsigned char *buf, const char (&data)[N])
+int serialize(unsigned char *buf, const char(&data)[N])
{
if (buf) {
memcpy(buf, data, N);
@@ -124,7 +124,7 @@ int deserialize8(const unsigned char *buf, int8_t *data)
return sizeof(*data);
}
template <int N>
-int deserialize(const unsigned char *buf, char (&data)[N])
+int deserialize(const unsigned char *buf, char(&data)[N])
{
memcpy(data, buf, N);
return N;
diff --git a/src/network/network.cpp b/src/network/network.cpp
index d936186dd..fde29f3ae 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -257,8 +257,7 @@ public:
/**
** Network Selection Info
*/
-struct NetworkSelectionHeader
-{
+struct NetworkSelectionHeader {
unsigned char Type[MaxNetworkCommands]; /// Command
unsigned NumberSent : 6; /// New Number Selected
unsigned Add : 1; /// Adding to Selection
@@ -1188,7 +1187,7 @@ void NetworkRecover()
continue;
}
int secs = (FrameCounter - NetworkLastFrame[Hosts[i].PlyNr]) /
- (FRAMES_PER_SECOND * VideoSyncSpeed / 100);
+ (FRAMES_PER_SECOND * VideoSyncSpeed / 100);
// FIXME: display a menu while we wait
if (secs >= 3 && secs < NetworkTimeout) {
if (FrameCounter % FRAMES_PER_SECOND < (unsigned long)NetworkUpdates) {
diff --git a/src/video/graphic.cpp b/src/video/graphic.cpp
index c609b0ba5..0f43cd926 100644
--- a/src/video/graphic.cpp
+++ b/src/video/graphic.cpp
@@ -723,14 +723,14 @@ void CGraphic::Load(bool grayscale)
break;
}
case 4: {
- Uint32* p;
+ Uint32 *p;
for (int i = 0; i < Height; ++i) {
for (int j = 0; j < Width; ++j) {
p = (Uint32 *)(Surface->pixels) + i * Width + j * bpp;
const Uint32 gray = ((Uint8)((*p) * redGray) >> f->Rshift) +
- ((Uint8)(*(p + 1) * greenGray) >> f->Gshift) +
- ((Uint8)(*(p + 2) * blueGray) >> f->Bshift) +
- ((Uint8)(*(p + 3)) >> f->Ashift);
+ ((Uint8)(*(p + 1) * greenGray) >> f->Gshift) +
+ ((Uint8)(*(p + 2) * blueGray) >> f->Bshift) +
+ ((Uint8)(*(p + 3)) >> f->Ashift);
*p = gray;
}
}