summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/depend/depend.cpp3
-rw-r--r--src/object_gui.cpp1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/depend/depend.cpp b/src/depend/depend.cpp
index 1805e3286..1d375aed6 100644
--- a/src/depend/depend.cpp
+++ b/src/depend/depend.cpp
@@ -83,7 +83,7 @@ public:
* @param filename the file to open
* @post the file is open; otherwise the application is killed.
*/
- File(const char *filename) : filename(filename)
+ File(const char *filename)
{
this->fp = fopen(filename, "r");
if (this->fp == NULL) {
@@ -129,7 +129,6 @@ public:
private:
FILE *fp; ///< The currently opened file.
char *dirname; ///< The directory of the file.
- const char *filename; ///< The name of the file.
};
/** A token returned by the tokenizer. */
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index a5e065cbd..2938e3b5b 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -30,7 +30,6 @@ static uint8 _selected_object_view; ///< the view of the selected objec
class BuildObjectWindow : public PickerWindowBase {
static const int OBJECT_MARGIN = 4; ///< The margin (in pixels) around an object.
int line_height; ///< The height of a single line.
- int object_height; ///< The height of the object box.
int info_height; ///< The height of the info box.
Scrollbar *vscroll; ///< The scrollbar.