Skip to content

Commit

Permalink
SHERLOCK: SS: Renamed darts.cpp to scalpel_darts.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
dreammaster committed Aug 7, 2015
1 parent dc3e1ed commit b2e98f4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion engines/sherlock/module.mk
@@ -1,13 +1,13 @@
MODULE := engines/sherlock

MODULE_OBJS = \
scalpel/darts.o \
scalpel/scalpel.o \
scalpel/3do/movie_decoder.o \
scalpel/drivers/adlib.o \
scalpel/drivers/mt32.o \
scalpel/tsage/logo.o \
scalpel/tsage/resources.o \
scalpel/scalpel_darts.o \
scalpel/scalpel_debugger.o \
scalpel/scalpel_fixed_text.o \
scalpel/scalpel_inventory.o \
Expand Down
2 changes: 1 addition & 1 deletion engines/sherlock/scalpel/scalpel.h
Expand Up @@ -24,7 +24,7 @@
#define SHERLOCK_SCALPEL_H

#include "sherlock/sherlock.h"
#include "sherlock/scalpel/darts.h"
#include "sherlock/scalpel/scalpel_darts.h"

namespace Sherlock {

Expand Down
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "sherlock/scalpel/darts.h"
#include "sherlock/scalpel/scalpel_darts.h"
#include "sherlock/scalpel/scalpel.h"

namespace Sherlock {
Expand Down
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef SHERLOCK_DARTS_H
#define SHERLOCK_DARTS_H
#ifndef SHERLOCK_SCALPEL_DARTS_H
#define SHERLOCK_SCALPEL_DARTS_H

#include "sherlock/image_file.h"

Expand Down

2 comments on commit b2e98f4

@bluegr
Copy link
Member

@bluegr bluegr commented on b2e98f4 Aug 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit superfluous... after all, the file is placed in a 'scalpel' folder already

@PaulGilbert
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I had named Tattoo's dart game file as tattoo_darts.cpp, so it seemed to fit in better with the convention of having sclapel_* and tattoo_* prefixes for file/classes present in both games.

Please sign in to comment.