aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-03-30 08:49:38 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-03-30 08:49:38 -0400
commitbf8596a280f067bcfc0ff81bec0e94bb860230c8 (patch)
tree37386329c455bfad035e3aa72804ca2b6fbefff4
parent0b1bfa28f33410acc1c3b95df1c1b748ce55b447 (diff)
Inv and textures
-rw-r--r--include/quest.hpp (renamed from include/Quest.hpp)10
-rw-r--r--include/texture.hpp (renamed from include/Texture.hpp)0
2 files changed, 2 insertions, 8 deletions
diff --git a/include/Quest.hpp b/include/quest.hpp
index eaf9426..311aade 100644
--- a/include/Quest.hpp
+++ b/include/quest.hpp
@@ -8,9 +8,8 @@
#ifndef QUEST_H
#define QUEST_H
-#include <cstring>
+#include <string>
-#include <common.hpp>
#include <inventory.hpp>
/**
@@ -20,16 +19,11 @@
#define DEBUG
-struct need_t {
- std::string name;
- int n;
-};
-
typedef struct {
std::string title;
std::string desc;
struct item_t reward;
- std::vector<struct need_t> need;
+ std::vector<std::pair<std::string,int>> need;
} Quest;
/**
diff --git a/include/Texture.hpp b/include/texture.hpp
index 4202043..4202043 100644
--- a/include/Texture.hpp
+++ b/include/texture.hpp