aboutsummaryrefslogtreecommitdiffstats
path: root/include/entities.h
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-03 15:45:10 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-03-03 15:45:10 -0500
commitfe5ea7fe415857f49d6630f2b0f50e1246c38eee (patch)
tree8a14040bb753143bdd583f813578df4c83191557 /include/entities.h
parent90f3d2ff9fe7297dae0bdcee9c441e53177a0fb7 (diff)
c++'d more stuff
Diffstat (limited to 'include/entities.h')
-rw-r--r--include/entities.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/entities.h b/include/entities.h
index 3b8a19b..334bfeb 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -254,11 +254,11 @@ class Object : public Entity{
private:
std::string iname;
public:
- char *pickupDialog;
+ std::string pickupDialog;
bool questObject = false;
Object();
- Object(std::string in,const char *pd);
+ Object(std::string in,std::string pd);
~Object();
void reloadTexture(void);