Fix fild types in services and corporations

diff --git a/include/stg/corp_conf.h b/include/stg/corp_conf.h
index 88a84f1841c51d46f5bfb7520a816cb2032c1bd4..e29a5dcf24bf27934f7ee32ec6f368d274eddae0 100644 (file)
--- a/include/stg/corp_conf.h
+++ b/include/stg/corp_conf.h
@@ -1,10 +1,15 @@
 #ifndef CORP_CONF_H
 #define CORP_CONF_H
 
 #ifndef CORP_CONF_H
 #define CORP_CONF_H
 

+#include <string>
+

 struct CORP_CONF
 {
 struct CORP_CONF
 {

-string  name;
-double  cash;
+CORP_CONF(const std::string & n) : name(n), cash(0) {}
+CORP_CONF(const std::string & n, double c) : name(n), cash(c) {}
+
+std::string name;
+double      cash;

 };
 
 #endif //CORP_CONF_H
 };
 
 #endif //CORP_CONF_H

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index 6c958c41289e5357b9756189023c731632d7201a..ea3495b3dd686052dbb5570f09072b998a994285 100644 (file)
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -1,12 +1,28 @@
 #ifndef SERVICE_CONF_H
 #define SERVICE_CONF_H
 
 #ifndef SERVICE_CONF_H
 #define SERVICE_CONF_H
 

+#include <string>
+

 struct SERVICE_CONF
 {
 struct SERVICE_CONF
 {

-string  name;
-string  comment;
-double  cost;
-int     payDay;
+SERVICE_CONF(const std::string & n)
+    : name(n), comment(), cost(0), payDay(0)
+{}
+SERVICE_CONF(const std::string & n, double c)
+    : name(n), comment(), cost(c), payDay(0)
+{}
+SERVICE_CONF(const std::string & n, double c, unsigned p)
+    : name(n), comment(), cost(c), payDay(p)
+{}
+SERVICE_CONF(const std::string & n, double c,
+             unsigned p, const std::string & com)
+    : name(n), comment(com), cost(c), payDay(p)
+{}
+
+std::string name;
+std::string comment;
+double      cost;
+unsigned    payDay;

 };
 
 #endif //SERVICE_CONF_H
 };
 
 #endif //SERVICE_CONF_H