Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/…

…deng
skyjake · Jan 16, 2012 · 6edc728 · 6edc728
2 parents 473c4f0 + 2a2f822
commit 6edc728
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -65,11 +65,11 @@ defineTest(doPostLink) {
 
 # Configure for Debug/Release build.
 CONFIG(debug, debug|release) {
-    echo(Debug build.)
+    !win32: echo(Debug build.)
     DEFINES += _DEBUG
     CONFIG += deng_rangecheck
 } else {
-    echo(Release build.)
+    !win32: echo(Release build.)
     DEFINES += NDEBUG
 }
 

diff --git a/doomsday/engine/api/doomsday.def b/doomsday/engine/api/doomsday.def
@@ -1,6 +1,6 @@
 ; Doomsday Engine API (Routines exported from Doomsday.exe).
 ;
-; Highest ordinal is currently: --> 755 <--
+; Highest ordinal is currently: --> 756 <--
 ; Other free ordinals:
 ;   54, 340, 341
 
@@ -185,6 +185,7 @@ EXPORTS
     ; String.
     Str_New                     @461 NONAME
     Str_Init                    @462 NONAME
+    Str_InitStatic              @756 NONAME
     Str_Free                    @463 NONAME
     Str_Delete                  @464 NONAME
     Str_Clear                   @465 NONAME

diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro
@@ -31,10 +31,10 @@ win32 {
 DEFINES += __DOOMSDAY__
 
 !isEmpty(DENG_BUILD) {
-    echo(Build number: $$DENG_BUILD)
+    !win32: echo(Build number: $$DENG_BUILD)
     DEFINES += DOOMSDAY_BUILD_TEXT=\\\"$$DENG_BUILD\\\"
 } else {
-    echo(DENG_BUILD is not defined.)
+    !win32: echo(DENG_BUILD is not defined.)
 }
 
 unix:!macx {

diff --git a/doomsday/engine/portable/src/cl_mobj.c b/doomsday/engine/portable/src/cl_mobj.c
@@ -223,7 +223,7 @@ void ClMobj_EnableLocalActions(struct mobj_s *mo, boolean enable)
 boolean ClMobj_LocalActionsEnabled(struct mobj_s *mo)
 {
     clmoinfo_t* info = ClMobj_GetInfo(mo);
-    if(!isClient || !info) return;
+    if(!isClient || !info) return true;
     return (info->flags & CLMF_LOCAL_ACTIONS) != 0;
 }