summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Greffrath2015-03-05 20:52:09 +0100
committerFabian Greffrath2015-03-05 20:52:09 +0100
commit70e39d13808d9a6de004bde9570a2db001cc95e4 (patch)
tree3ce90fd01acb0459f9287231ce84024267ced69e
parentbfda08cf5275a70a705b3d290ca5271d40481993 (diff)
parent622653dde922a486a056b63d37dc6d7d6f26f3a4 (diff)
downloadchocolate-doom-70e39d13808d9a6de004bde9570a2db001cc95e4.tar.gz
chocolate-doom-70e39d13808d9a6de004bde9570a2db001cc95e4.tar.bz2
chocolate-doom-70e39d13808d9a6de004bde9570a2db001cc95e4.zip
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
-rw-r--r--HACKING13
1 files changed, 9 insertions, 4 deletions
diff --git a/HACKING b/HACKING
index 3bbe23d0..db20f963 100644
--- a/HACKING
+++ b/HACKING
@@ -64,11 +64,15 @@ typedef struct
void FunctionName(int argument, int arg2, int arg3, int arg4, int arg5,
int arg6, int arg7)
{
- if (condition)
+ int assign_var;
+
+ assign_var = arg2 + arg3 * arg4 * (arg5 + arg6);
+
+ if (foo && !bar || baz && qux || !(foo && bar && baz))
{
body;
}
- else if (condition)
+ else if (xyz + 4 < abc * 4 + 3)
{
body;
}
@@ -97,9 +101,10 @@ void FunctionName(int argument, int arg2, int arg3, int arg4, int arg5,
break;
}
- for (a=0; a<10; ++a)
+ for (a = 0; a < 10; ++a)
{
- loop_body;
+ FunctionCall(arg1, arg2, arg3, arg4,
+ arg_split_onto_second_line);
}
while (a < 10)