diff options
| author | Stijn Buys <ingar@osirion.org> | 2007-12-17 14:48:43 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2007-12-17 14:48:43 +0000 |
| commit | f14ad6c7f3efd0c91a1ab8a4013b1975ddb02545 (patch) | |
| tree | 5c8f380210d69a664a9d7c9ff09ecb9dba4a4cfd /src | |
| parent | 09f307b6cb4f7c69e5b0685acc0bdd18e9d57d40 (diff) | |
minor updates
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Makefile.am | 5 | ||||
| -rw-r--r-- | src/common/file.cc | 2 | ||||
| -rw-r--r-- | src/game/shipspecs.h | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index d7fc6e6..431cb8c 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -3,7 +3,8 @@ METASOURCES = AUTO libcommon_la_LDFLAGS = -avoid-version -no-undefined noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = color.cc console.cc file.cc functions.cc inifile.cc \ - vector3f.cc + path.cc vector3f.cc -noinst_HEADERS = color.h console.h file.h functions.h inifile.h vector3f.h +noinst_HEADERS = color.h console.h file.h functions.h inifile.h path.h \ + vector3f.h diff --git a/src/common/file.cc b/src/common/file.cc index 73537ec..6f4d6d4 100644 --- a/src/common/file.cc +++ b/src/common/file.cc @@ -59,7 +59,7 @@ void File::open(const char * filename, ios_base::openmode mode) std::ifstream::open(fn.c_str(), mode); if (!this->is_open()) { - conmesg << "File could not open " << filename << std::endl; + conwarn << "Could not open " << filename << std::endl; } else { condebug << "File opened " << fn << std::endl; } diff --git a/src/game/shipspecs.h b/src/game/shipspecs.h index a907057..daefc40 100644 --- a/src/game/shipspecs.h +++ b/src/game/shipspecs.h @@ -8,6 +8,14 @@ #define __INCLUDED_SHIPSPECS_H__ class ShipSpecs { + +public: + /// acceleration + float acceleration; + /// maximum speed + float speed_max; + /// yaw turn speed + float yaw_speed; }; #endif // __INCLUDED_SHIPSPECS_H__ |