summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-12 20:16:57 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-12 20:16:57 +0300
commite53c7e4aa23a057f250d6a5d038b3f46b3f8db95 (patch)
tree69ef9b37c07244fbc3579b7bb4c0ae3516c8b837 /src
parent6c13867fcaa82514f9b113430a00a0db0921977f (diff)
downloadmv-e53c7e4aa23a057f250d6a5d038b3f46b3f8db95.tar.gz
mv-e53c7e4aa23a057f250d6a5d038b3f46b3f8db95.tar.bz2
mv-e53c7e4aa23a057f250d6a5d038b3f46b3f8db95.tar.xz
mv-e53c7e4aa23a057f250d6a5d038b3f46b3f8db95.zip
Fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/actions/actions.cpp3
-rw-r--r--src/filefilter.txt1
-rw-r--r--src/fs/virtfs/direntry.h4
-rw-r--r--src/game.cpp4
-rw-r--r--src/resources/item/itemoptionslist.h2
5 files changed, 6 insertions, 8 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 8de4f8793..338a749b0 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1174,8 +1174,7 @@ impHandler(undress)
const size_t sz = pars.size();
if (sz == 0)
{
- if (!target)
- target = localPlayer->getTarget();
+ target = localPlayer->getTarget();
}
else
{
diff --git a/src/filefilter.txt b/src/filefilter.txt
index 042855084..37988ae54 100644
--- a/src/filefilter.txt
+++ b/src/filefilter.txt
@@ -10,7 +10,6 @@
~ RULE_4_2_A_B_space_around_word
~ RULE_4_4_A_do_not_write_over_80_columns_per_line
~ RULE_4_5_A_brace_for_namespace_should_be_located_in_seperate_line
-~ RULE_4_5_A_braces_for_function_definition_should_be_located_in_seperate_line
~ RULE_4_5_A_braces_for_type_definition_should_be_located_in_seperate_line
~ RULE_4_5_A_indent_blocks_inside_of_function
~ RULE_4_5_A_matching_braces_inside_of_function_should_be_located_same_column
diff --git a/src/fs/virtfs/direntry.h b/src/fs/virtfs/direntry.h
index 7eac95a0a..faa33be47 100644
--- a/src/fs/virtfs/direntry.h
+++ b/src/fs/virtfs/direntry.h
@@ -31,8 +31,8 @@ namespace VirtFs
struct DirEntry final : public FsEntry
{
DirEntry(const std::string &userDir,
- const std::string &rootDir,
- FsFuncs *restrict const funcs);
+ const std::string &rootDir,
+ FsFuncs *restrict const funcs);
A_DELETE_COPY(DirEntry)
diff --git a/src/game.cpp b/src/game.cpp
index 929d828d9..352a6be44 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -541,8 +541,6 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot,
// Search for an unused screenshot name
std::stringstream filename;
std::fstream testExists;
- bool found = false;
- static unsigned int screenshotCount = 0;
time_t rawtime;
char buffer [100];
@@ -567,6 +565,8 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot,
serverName.c_str(), buffer);
}
+ bool found = false;
+ static unsigned int screenshotCount = 0;
do
{
screenshotCount++;
diff --git a/src/resources/item/itemoptionslist.h b/src/resources/item/itemoptionslist.h
index 725340f45..f5b3365f5 100644
--- a/src/resources/item/itemoptionslist.h
+++ b/src/resources/item/itemoptionslist.h
@@ -47,7 +47,7 @@ struct ItemOptionsList final
options = new ItemOption[amount];
}
- A_DEFAULT_COPY(ItemOptionsList)
+ A_DELETE_COPY(ItemOptionsList)
~ItemOptionsList()
{