Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-08-23 10:31:45 +0000
committerStijn Buys <ingar@osirion.org>2008-08-23 10:31:45 +0000
commitdaf84bb6292eb5bf5434889a887535ec54c21b6b (patch)
tree1674d55039da9a100bf1d2a4a8596b793b6841a8
parent7668b60981dadeced3b5c8ee27c16575d59844de (diff)
fixes for gcc 4.3.1, added g_devel
-rw-r--r--doc/TODO10
-rw-r--r--src/audio/buffers.cc2
-rw-r--r--src/audio/sources.cc2
-rw-r--r--src/core/netclient.cc1
-rw-r--r--src/core/netconnection.cc1
-rw-r--r--src/core/netserver.cc1
-rw-r--r--src/filesystem/filesystem.cc3
-rw-r--r--src/game/game.cc5
-rw-r--r--src/game/game.h2
-rw-r--r--src/game/ship.cc14
-rw-r--r--src/math/matrix4f.cc6
-rw-r--r--src/model/vertexarray.cc2
-rw-r--r--src/render/textures.cc2
-rw-r--r--src/render/tga.cc2
14 files changed, 39 insertions, 14 deletions
diff --git a/doc/TODO b/doc/TODO
index 7e253a3..c6ab76f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -62,12 +62,13 @@ network:
zone/system chat (requires zones)
group/clan chat (requires groups)
rcon authentication, rcon command, servers must be able to disable rcon
+ RSA based authentication (player id)
send clients only updates from the current zone/server-side distance check
fix lag/client interpolation
rename cl_prediction to cl_interpolation
detect and disconnect clients behaving badly
- EXT messages, update extended property "ext id prop value prop value etc", type checking/serperator etc..
+ EXT messages, update extended property "ext id prop value prop value etc", type checking/seperator etc..
EXT zone/color/shield/armor/health
stable ent/die
@@ -87,6 +88,7 @@ client:
view_next, view_prev (ok)
tracking camera absolute speed/position
visual feedback on impulse drive
+ fast fullscreen/windowed mode switch
render:
render pipeline (ok)
@@ -97,7 +99,9 @@ render:
test/fix? lighting without sun in zone.ini
sun light strenght
- skysphere distortion at the poles
+ sphere texture distortion at the poles
+ PNG support
+ impulse drive rendering
gui:
a gui library with widgets and buttons
@@ -113,7 +117,7 @@ sound:
game:
add impulse drive (ok)
- implement player credits
+ player credits
entity health/shield/armor
gui concept artwork
docking
diff --git a/src/audio/buffers.cc b/src/audio/buffers.cc
index 4e26c33..af14cb1 100644
--- a/src/audio/buffers.cc
+++ b/src/audio/buffers.cc
@@ -4,6 +4,8 @@
the terms of the GNU General Public License version 2
*/
+#include <string.h>
+
#include "audio/buffers.h"
#include "audio/pcm.h"
#include "audio/wav.h"
diff --git a/src/audio/sources.cc b/src/audio/sources.cc
index b52c5a4..584f366 100644
--- a/src/audio/sources.cc
+++ b/src/audio/sources.cc
@@ -4,6 +4,8 @@
the terms of the GNU General Public License version 2
*/
+#include <string.h>
+
#include "audio/sources.h"
#include "sys/sys.h"
diff --git a/src/core/netclient.cc b/src/core/netclient.cc
index fa89e47..1289319 100644
--- a/src/core/netclient.cc
+++ b/src/core/netclient.cc
@@ -4,6 +4,7 @@
the terms of the GNU General Public License version 2
*/
+#include <string.h>
#include <zlib.h>
#include <iostream>
diff --git a/src/core/netconnection.cc b/src/core/netconnection.cc
index 0b33652..ed1a91b 100644
--- a/src/core/netconnection.cc
+++ b/src/core/netconnection.cc
@@ -5,6 +5,7 @@
*/
#include <zlib.h>
+#include <string.h>
#include <sstream>
diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index dd70bcf..dcc152f 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -4,6 +4,7 @@
the terms of the GNU General Public License version 2
*/
+#include <string.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/filesystem/filesystem.cc b/src/filesystem/filesystem.cc
index 0150b66..0fec129 100644
--- a/src/filesystem/filesystem.cc
+++ b/src/filesystem/filesystem.cc
@@ -4,7 +4,8 @@
the terms of the GNU General Public License version 2
*/
-// project headers
+#include <stdlib.h>
+
#include <list>
#include "filesystem/filesystem.h"
diff --git a/src/game/game.cc b/src/game/game.cc
index 5f754df..d0b4466 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -22,8 +22,6 @@
namespace game
{
-
-
ShipModel *default_shipmodel = 0;
core::Zone *default_zone = 0;
@@ -221,6 +219,9 @@ void Game::init()
g_impulseacceleration = core::Cvar::get("g_impulseacceleration", "4", core::Cvar::Game | core::Cvar::Archive);
g_impulseacceleration->set_info("[float] standard acceleration of the impulse drive");
+ g_devel = core::Cvar::get("g_devel", "0", core::Cvar::Archive);
+ g_devel->set_info("[bool] enable or disable developer mode");
+
// indicate the module is ready to run frames
module_running = true;
}
diff --git a/src/game/game.h b/src/game/game.h
index 36f7321..b9e6104 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -54,6 +54,8 @@ public:
core::Cvar *g_impulsespeed;
core::Cvar *g_impulseacceleration;
+ core::Cvar *g_devel;
+
private:
bool load_world();
diff --git a/src/game/ship.cc b/src/game/ship.cc
index 4ddd118..e46adc1 100644
--- a/src/game/ship.cc
+++ b/src/game/ship.cc
@@ -69,7 +69,11 @@ void Ship::impulse()
}
entity_eventstate = core::Entity::ImpulseInitiate;
- entity_timer = 3;
+ if (Game::instance()->g_devel->value()) {
+ entity_timer = 0;
+ } else {
+ entity_timer = 10;
+ }
ship_impulsedrive_timer = core::server()->time();
entity_dirty = true;
}
@@ -79,7 +83,7 @@ void Ship::impulse()
void Ship::jump(std::string const &args)
{
- if (!jumpdrive()) {
+ if (!jumpdrive() && !Game::instance()->g_devel->value()) {
core::server()->send(owner(), "This ship is not equiped with a hyperspace drive!");
return;
@@ -124,7 +128,11 @@ void Ship::jump(std::string const &args)
}
entity_eventstate = core::Entity::JumpInitiate;
- entity_timer = 10;
+ if (Game::instance()->g_devel->value()) {
+ entity_timer = 0;
+ } else {
+ entity_timer = 10;
+ }
ship_jumpdrive_timer = core::server()->time();
entity_dirty = true;
}
diff --git a/src/math/matrix4f.cc b/src/math/matrix4f.cc
index d73b12e..094bbd6 100644
--- a/src/math/matrix4f.cc
+++ b/src/math/matrix4f.cc
@@ -4,12 +4,12 @@
the terms of the GNU General Public License version 2
*/
-// project headers
-#include "math/matrix4f.h"
+#include <string.h>
-// C++ headers
#include <cmath>
+#include "math/matrix4f.h"
+
namespace math
{
diff --git a/src/model/vertexarray.cc b/src/model/vertexarray.cc
index 0562bea..dc5e23e 100644
--- a/src/model/vertexarray.cc
+++ b/src/model/vertexarray.cc
@@ -5,6 +5,8 @@
the terms of the GNU General Public License version 2
*/
+#include <string.h>
+
#include "math/mathlib.h"
#include "model/vertexarray.h"
#include "sys/sys.h"
diff --git a/src/render/textures.cc b/src/render/textures.cc
index d69fa68..2bc6c05 100644
--- a/src/render/textures.cc
+++ b/src/render/textures.cc
@@ -4,7 +4,7 @@
the terms of the GNU General Public License version 2
*/
-
+#include <string.h>
#include "render/gl.h"
#include "render/textures.h"
diff --git a/src/render/tga.cc b/src/render/tga.cc
index fb65910..6a85130 100644
--- a/src/render/tga.cc
+++ b/src/render/tga.cc
@@ -25,7 +25,7 @@
TGA multi-byte integer values have LSB first
*/
-
+#include <string.h>
#include <fstream>
#include <sstream>