Merge branch 'master' into mapdata-c++

doomsday/client/include/audio/s_cache.h

@@ -57,7 +57,7 @@ uint Sfx_GetSoundLength(int id);
 void Sfx_GetCacheInfo(uint *cacheBytes, uint *sampleCount);
 
 #ifdef __cplusplus
-} // __cplusplus
+} // extern "C"
 #endif
 
 #endif /* LIBDENG_SOUND_CACHE_H */

doomsday/plugins/common/include/fi_lib.h

@@ -109,7 +109,7 @@ int FI_PrivilegedResponder(const void* ev);
 void NetCl_UpdateFinaleState(Reader* msg);
 
 #ifdef __cplusplus
-} extern "C"
+} // extern "C"
 #endif
 
 #endif /* LIBCOMMON_INFINE_LIB */

doomsday/plugins/common/include/hu_automap.h

@@ -224,6 +224,7 @@ boolean UIAutomap_SetZoomMax(uiwidget_t* obj, boolean on);
 void UIAutomap_ParallaxLayerOrigin(uiwidget_t* obj, coord_t* x, coord_t* y);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
+
 #endif /* LIBCOMMON_GUI_LIBRARY_UIAUTOMAP_H */

doomsday/plugins/dehread/include/dehread.h

@@ -42,11 +42,7 @@ struct font_s;
 #include <de/libdeng2.h>
 #include <de/types.h>
 
-extern "C" {
-
-void    DP_Initialize(void);
-
-}
+DENG_EXTERN_C void DP_Initialize(void);
 
 // Internal:
 extern ded_t* ded; // @todo Remove me.

doomsday/plugins/hexen/defs/hexen/anim.ded

@@ -21,119 +21,119 @@ Header { Version = 6; }
 Group
 {
   Flags = precache;
-  Texture { ID = "BOSSK1"; Tics = 0; };
-  Texture { ID = "BOSSK2"; Tics = 0; };
+  Texture { ID = "BOSSK1"; };
+  Texture { ID = "BOSSK2"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SPAWN1"; Tics = 0; };
-  Texture { ID = "SPAWN2"; Tics = 0; };
-  Texture { ID = "SPAWN3"; Tics = 0; };
-  Texture { ID = "SPAWN4"; Tics = 0; };
+  Texture { ID = "SPAWN01"; };
+  Texture { ID = "SPAWN02"; };
+  Texture { ID = "SPAWN03"; };
+  Texture { ID = "SPAWN04"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SPAWN5"; Tics = 0; };
-  Texture { ID = "SPAWN6"; Tics = 0; };
-  Texture { ID = "SPAWN7"; Tics = 0; };
+  Texture { ID = "SPAWN05"; };
+  Texture { ID = "SPAWN06"; };
+  Texture { ID = "SPAWN07"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SPAWN8"; Tics = 0; };
-  Texture { ID = "SPAWN9"; Tics = 0; };
-  Texture { ID = "SPAWN10"; Tics = 0; };
+  Texture { ID = "SPAWN08"; };
+  Texture { ID = "SPAWN09"; };
+  Texture { ID = "SPAWN10"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SPAWN11"; Tics = 0; };
-  Texture { ID = "SPAWN12"; Tics = 0; };
+  Texture { ID = "SPAWN11"; };
+  Texture { ID = "SPAWN12"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW51_OFF"; Tics = 0; };
-  Texture { ID = "SW51_ON"; Tics = 0; };
+  Texture { ID = "SW51_OFF"; };
+  Texture { ID = "SW51_ON"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW52_OFF"; Tics = 0; };
-  Texture { ID = "SW52_ON"; Tics = 0; };
+  Texture { ID = "SW52_OFF"; };
+  Texture { ID = "SW52_ON"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW53_DN"; Tics = 0; };
-  Texture { ID = "SW53_MD"; Tics = 0; };
-  Texture { ID = "SW53_UP"; Tics = 0; };
+  Texture { ID = "SW53_DN"; };
+  Texture { ID = "SW53_MD"; };
+  Texture { ID = "SW53_UP"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW_1_DN"; Tics = 0; };
-  Texture { ID = "SW_1_MD"; Tics = 0; };
-  Texture { ID = "SW_1_UP"; Tics = 0; };
+  Texture { ID = "SW_1_DN"; };
+  Texture { ID = "SW_1_MD"; };
+  Texture { ID = "SW_1_UP"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW_2_DN"; Tics = 0; };
-  Texture { ID = "SW_2_MD"; Tics = 0; };
-  Texture { ID = "SW_2_UP"; Tics = 0; };
+  Texture { ID = "SW_2_DN"; };
+  Texture { ID = "SW_2_MD"; };
+  Texture { ID = "SW_2_UP"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW_EL1"; Tics = 0; };
-  Texture { ID = "SW_EL2"; Tics = 0; };
-  Texture { ID = "SW_EL3"; Tics = 0; };
-  Texture { ID = "SW_EL4"; Tics = 0; };
-  Texture { ID = "SW_EL5"; Tics = 0; };
+  Texture { ID = "SW_EL1"; };
+  Texture { ID = "SW_EL2"; };
+  Texture { ID = "SW_EL3"; };
+  Texture { ID = "SW_EL4"; };
+  Texture { ID = "SW_EL5"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "SW_OL1"; Tics = 0; };
-  Texture { ID = "SW_OL2"; Tics = 0; };
-  Texture { ID = "SW_OL3"; Tics = 0; };
-  Texture { ID = "SW_OL4"; Tics = 0; };
-  Texture { ID = "SW_OL5"; Tics = 0; };
+  Texture { ID = "SW_OL1"; };
+  Texture { ID = "SW_OL2"; };
+  Texture { ID = "SW_OL3"; };
+  Texture { ID = "SW_OL4"; };
+  Texture { ID = "SW_OL5"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "VALVE01"; Tics = 0; };
-  Texture { ID = "VALVE02"; Tics = 0; };
+  Texture { ID = "VALVE01"; };
+  Texture { ID = "VALVE02"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "VALVE1"; Tics = 0; };
-  Texture { ID = "VALVE2"; Tics = 0; };
+  Texture { ID = "VALVE1"; };
+  Texture { ID = "VALVE2"; };
 }
 
 Group
 {
   Flags = precache;
-  Texture { ID = "GLASS01"; Tics = 0; };
-  Texture { ID = "GLASS03"; Tics = 0; };
-  Texture { ID = "GLASS05"; Tics = 0; };
-  Texture { ID = "GLASS07"; Tics = 0; };
+  Texture { ID = "GLASS01"; };
+  Texture { ID = "GLASS03"; };
+  Texture { ID = "GLASS05"; };
+  Texture { ID = "GLASS07"; };
 }

doomsday/server/src/serversystem.cpp

@@ -199,7 +199,7 @@ DENG2_PIMPL(ServerSystem)
 
         if(shellUsers.count())
         {
-            Con_Message("%i connected shell user%s.",
+            Con_Message("%i shell user%s.",
                         shellUsers.count(),
                         shellUsers.count() == 1? "" : "s");
         }
@@ -327,7 +327,8 @@ void ServerSystem::userDestroyed()
 
     d->users.remove(u->id());
 
-    LOG_DEBUG("%i remote users remain") << d->users.size();
+    LOG_DEBUG("%i remote users and %i shell users remain")
+            << d->users.size() << d->shellUsers.count();
 }
 
 void ServerSystem::printStatus()

doomsday/tools/amethyst/.gitignore

@@ -0,0 +1,3 @@
+*.pro.user
+*.user.*
+inst

doomsday/tools/amethyst/amethyst.pro

@@ -0,0 +1,146 @@
+# Amethyst (c) 2002-2011 Jaakko Keränen <jaakko.keranen@iki.fi>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+QT += core
+QT -= gui
+
+CONFIG += console
+CONFIG -= app_bundle
+
+TEMPLATE = app
+TARGET = amethyst
+
+SOURCES += \
+    src/block.cpp \
+    src/callstack.cpp \
+    src/command.cpp \
+    src/commandline.cpp \
+    src/commandrule.cpp \
+    src/commandruleset.cpp \
+    src/contextrelation.cpp \
+    src/formatrule.cpp \
+    src/gem.cpp \
+    src/gemclass.cpp \
+    src/gemtest.cpp \
+    src/gemtestcommand.cpp \
+    src/length.cpp \
+    src/lengthrule.cpp \
+    src/linkable.cpp \
+    src/macro.cpp \
+    src/main.cpp \
+    src/outputcontext.cpp \
+    src/outputstate.cpp \
+    src/processor.cpp \
+    src/rule.cpp \
+    src/ruleset.cpp \
+    src/schedule.cpp \
+    src/shard.cpp \
+    src/source.cpp \
+    src/string.cpp \
+    src/structurecounter.cpp \
+    src/token.cpp \
+    src/utils.cpp \
+    src/exception.cpp
+
+HEADERS += \
+    src/block.h \
+    src/callstack.h \
+    src/command.h \
+    src/commandline.h \
+    src/commandrule.h \
+    src/commandruleset.h \
+    src/contextrelation.h \
+    src/defs.h \
+    src/exception.h \
+    src/formatrule.h \
+    src/gem.h \
+    src/gemclass.h \
+    src/gemtest.h \
+    src/gemtestcommand.h \
+    src/length.h \
+    src/lengthrule.h \
+    src/linkable.h \
+    src/list.h \
+    src/macro.h \
+    src/outputcontext.h \
+    src/outputstate.h \
+    src/processor.h \
+    src/rule.h \
+    src/ruleset.h \
+    src/schedule.h \
+    src/shard.h \
+    src/source.h \
+    src/string.h \
+    src/stringlist.h \
+    src/structurecounter.h \
+    src/token.h \
+    src/uniquelist.h \
+    src/utils.h
+
+OTHER_FILES += plan.txt changelog.txt
+
+# Compiler options.
+*-gcc* {
+    QMAKE_CXXFLAGS += -pedantic
+    !mac:!win32: QMAKE_CXXFLAGS += -std=c++0x
+}
+win32-msvc* {
+    DEFINES += _CRT_SECURE_NO_WARNINGS
+}
+
+# Installation.
+library.files += \
+    lib/amestd.ame \
+    lib/ametxt.ame \
+    lib/amehtml.ame \
+    lib/amertf.ame \
+    lib/ameman.ame \
+    lib/amewiki.ame
+
+unix {
+    isEmpty(PREFIX) {
+        PREFIX = /usr/local
+    }
+    BINDIR = $$PREFIX/bin
+    SHAREDIR = $$PREFIX/share/amethyst
+    DOCDIR = $$PREFIX/share/doc/amethyst
+    AMELIBDIR = $$SHAREDIR/lib
+
+    # Default location for the library files.
+    DEFINES += AME_LIBDIR=\\\"$$AMELIBDIR\\\"
+
+    INSTALLS += target library
+    target.path = $$BINDIR
+
+    library.path = $$AMELIBDIR
+}
+win32 {
+    isEmpty(PREFIX) {
+        PREFIX = $$PWD/inst
+    }
+    BINDIR = $$PREFIX
+    AMELIBDIR = $$PREFIX/lib
+    DOCDIR = $%PREFIX/doc
+
+    INSTALLS += target qtcore library #guide
+    target.path = $$BINDIR
+
+    CONFIG(debug, debug|release): qtver = d4
+    else: qtver = 4
+    qtcore.files = $$[QT_INSTALL_LIBS]/QtCore$${qtver}.dll
+    qtcore.path = $$BINDIR
+
+    library.path = $$AMELIBDIR
+}