TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix compile-time error when building without editor

Browse source
This commit is contained in:
zicodxx 2012-03-28 09:56:31 +02:00
parent e7048d09ae
commit 3554fd442c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20120328
--------
main/slew.c: Fix compile-time error when building without editor
20120324
--------
arch/ogl/gr.c, arch/sdl/gr.c, ui/menubar.c: Draw the editor menubar properly - by drawing in response to EVENT_WINDOW_DRAW and initialising the screen canvas properly. The latter fixes a lot of other editor drawing issues as well

8
main/slew.c
View file

@ -184,7 +184,9 @@ int do_slew_movement(object *obj, int check_keys )
if (!slew_obj || slew_obj->control_type!=CT_SLEW) return 0;
if (check_keys) {
if (EditorWindow) {
#ifdef EDITOR
if (EditorWindow)
{
obj->mtype.phys_info.velocity.x += VEL_SPEED * keyd_pressed[KEY_PAD9] * FrameTime;
obj->mtype.phys_info.velocity.x -= VEL_SPEED * keyd_pressed[KEY_PAD7] * FrameTime;
obj->mtype.phys_info.velocity.y += VEL_SPEED * keyd_pressed[KEY_PADMINUS] * FrameTime;
@ -200,7 +202,9 @@ int do_slew_movement(object *obj, int check_keys )
rotang.h += keyd_pressed[KEY_PAD6] * FrameTime / ROT_SPEED;
rotang.h -= keyd_pressed[KEY_PAD4] * FrameTime / ROT_SPEED;
}
else {
else
#endif
{
obj->mtype.phys_info.velocity.x += VEL_SPEED * Controls.sideways_thrust_time;
obj->mtype.phys_info.velocity.y += VEL_SPEED * Controls.vertical_thrust_time;
obj->mtype.phys_info.velocity.z += VEL_SPEED * Controls.forward_thrust_time;