[deng] 01/03: import upstream 1.15.5
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Nov 16 00:36:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit 6b7af60d2c29ff8d874fe726a3e36b06641cfb76
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Nov 15 19:35:32 2015 +0000
import upstream 1.15.5
---
doomsday/api/dd_version.h | 4 +--
doomsday/client/net.dengine.client.pack/Info.dei | 2 +-
.../net.dengine.client.pack/defaultstyle.pack/Info | 2 +-
.../net.dengine.client.pack/renderer.pack/Info | 2 +-
.../renderer.pack/lensflares.pack/Info | 2 +-
doomsday/doc/output/doomsday.6 | 2 +-
doomsday/doc/readme/readme.ame | 2 +-
doomsday/doc/server/server.ame | 2 +-
doomsday/doc/shell-text/shell-text.ame | 2 +-
doomsday/libappfw/appfw.doxy | 2 +-
doomsday/libcore/net.dengine.stdlib.pack/Info | 2 +-
doomsday/libgui/gui.doxy | 2 +-
doomsday/libgui/net.dengine.stdlib.gui.pack/Info | 2 +-
doomsday/net.dengine.base.pack/Info | 2 +-
doomsday/plugins/hexen/src/a_action.c | 35 +++++++++++-----------
doomsday/sdk-qch.doxy | 4 +--
doomsday/tools/savegametool/src/main.cpp | 2 +-
.../tools/savegametool/src/nativetranslator.cpp | 2 +-
18 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/doomsday/api/dd_version.h b/doomsday/api/dd_version.h
index 78f14e1..cba9596 100644
--- a/doomsday/api/dd_version.h
+++ b/doomsday/api/dd_version.h
@@ -51,8 +51,8 @@ extern "C" {
* Revision number increases with each small (maintenance) release.
*/
-#define DOOMSDAY_VERSION_BASE "1.15.4"
-#define DOOMSDAY_VERSION_NUMBER 1,15,4,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.15.5"
+#define DOOMSDAY_VERSION_NUMBER 1,15,5,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff --git a/doomsday/client/net.dengine.client.pack/Info.dei b/doomsday/client/net.dengine.client.pack/Info.dei
index b933862..a4efda1 100644
--- a/doomsday/client/net.dengine.client.pack/Info.dei
+++ b/doomsday/client/net.dengine.client.pack/Info.dei
@@ -1,7 +1,7 @@
# Client's primary resources
title: Doomsday Client
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core client
diff --git a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
index 128ce32..d80f38f 100644
--- a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
@@ -1,4 +1,4 @@
title: Doomsday Default UI Style
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: ui style
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
index 8c02605..3500c7a 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
@@ -1,6 +1,6 @@
# General resources for the renderer
title: Doomsday Renderer
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
index 14ea8be..431f905 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Default Lens Flares
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core fx
diff --git a/doomsday/doc/output/doomsday.6 b/doomsday/doc/output/doomsday.6
index 1830150..e94a751 100644
--- a/doomsday/doc/output/doomsday.6
+++ b/doomsday/doc/output/doomsday.6
@@ -1,5 +1,5 @@
.\" manual page generated by Amethyst (mdoc+tbl)
-.Dd October 1, 2015
+.Dd November 1, 2015
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
diff --git a/doomsday/doc/readme/readme.ame b/doomsday/doc/readme/readme.ame
index 8754e57..aefeb6b 100644
--- a/doomsday/doc/readme/readme.ame
+++ b/doomsday/doc/readme/readme.ame
@@ -5,7 +5,7 @@
@macro{TITLE}{ doomsday }
}
@macro{ONELINER}{ Enhanced source port of Doom, Heretic and Hexen }
- at macro{VERSION}{ Version 1.15.4 }
+ at macro{VERSION}{ Version 1.15.5 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/server/server.ame b/doomsday/doc/server/server.ame
index 2789f7a..fdc0a7a 100644
--- a/doomsday/doc/server/server.ame
+++ b/doomsday/doc/server/server.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-server
@macro{TITLE}{ doomsday-server }
@macro{ONELINER}{ Doomsday Engine multiplayer daemon }
- at macro{VERSION}{ Version 1.15.4 }
+ at macro{VERSION}{ Version 1.15.5 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/shell-text/shell-text.ame b/doomsday/doc/shell-text/shell-text.ame
index ec3706c..d8a9460 100644
--- a/doomsday/doc/shell-text/shell-text.ame
+++ b/doomsday/doc/shell-text/shell-text.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-shell-text
@macro{TITLE}{ doomsday-shell-text }
@macro{ONELINER}{ Utility for controlling and monitoring Doomsday servers }
- at macro{VERSION}{ Version 1.15.4 }
+ at macro{VERSION}{ Version 1.15.5 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/libappfw/appfw.doxy b/doomsday/libappfw/appfw.doxy
index 8d3d01d..3b8bbba 100644
--- a/doomsday/libappfw/appfw.doxy
+++ b/doomsday/libappfw/appfw.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libappfw"
-PROJECT_NUMBER = 1.15.4
+PROJECT_NUMBER = 1.15.5
PROJECT_BRIEF = "Application Framework"
OUTPUT_DIRECTORY = ../apidoc/appfw/
diff --git a/doomsday/libcore/net.dengine.stdlib.pack/Info b/doomsday/libcore/net.dengine.stdlib.pack/Info
index 3568dfa..3e32197 100644
--- a/doomsday/libcore/net.dengine.stdlib.pack/Info
+++ b/doomsday/libcore/net.dengine.stdlib.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core script
diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy
index b06f56a..173ec89 100644
--- a/doomsday/libgui/gui.doxy
+++ b/doomsday/libgui/gui.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libgui"
-PROJECT_NUMBER = 1.15.4
+PROJECT_NUMBER = 1.15.5
PROJECT_BRIEF = "Graphics, Audio and Input Library"
OUTPUT_DIRECTORY = ../apidoc/gui/
diff --git a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
index 9f822bc..9b1e3f8 100644
--- a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
+++ b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library: GUI
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core script gui
diff --git a/doomsday/net.dengine.base.pack/Info b/doomsday/net.dengine.base.pack/Info
index 706e607..a935a78 100644
--- a/doomsday/net.dengine.base.pack/Info
+++ b/doomsday/net.dengine.base.pack/Info
@@ -1,6 +1,6 @@
# Shared resources for all Doomsday applications
title: Doomsday Base
-version: 1.15.4
+version: 1.15.5
license: GPL 3+
tags: core
diff --git a/doomsday/plugins/hexen/src/a_action.c b/doomsday/plugins/hexen/src/a_action.c
index 7df625a..751869c 100644
--- a/doomsday/plugins/hexen/src/a_action.c
+++ b/doomsday/plugins/hexen/src/a_action.c
@@ -67,22 +67,21 @@ void X_DestroyLUTs(void)
void C_DECL A_PotteryExplode(mobj_t* actor)
{
int i, maxBits = (P_Random() & 3) + 3;
+ mobj_t* potteryBit;
for(i = 0; i < maxBits; ++i)
{
- mobj_t* mo;
-
- if((mo = P_SpawnMobj(MT_POTTERYBIT1, actor->origin, P_Random() << 24, 0)))
+ if((potteryBit = P_SpawnMobj(MT_POTTERYBIT1, actor->origin, P_Random() << 24, 0)))
{
- P_MobjChangeState(mo, P_GetState(mo->type, SN_SPAWN) + (P_Random() % 5));
+ P_MobjChangeState(potteryBit, P_GetState(potteryBit->type, SN_SPAWN) + (P_Random() % 5));
- mo->mom[MZ] = FIX2FLT(((P_Random() & 7) + 5) * (3 * FRACUNIT / 4));
- mo->mom[MX] = FIX2FLT((P_Random() - P_Random()) << 10);
- mo->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 10);
+ potteryBit->mom[MZ] = FIX2FLT(((P_Random() & 7) + 5) * (3 * FRACUNIT / 4));
+ potteryBit->mom[MX] = FIX2FLT((P_Random() - P_Random()) << 10);
+ potteryBit->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 10);
}
}
- S_StartSound(SFX_POTTERY_EXPLODE, actor);
+ S_StartSound(SFX_POTTERY_EXPLODE, potteryBit);
if(actor->args[0])
{
@@ -114,7 +113,7 @@ void C_DECL A_PotteryCheck(mobj_t* actor)
{
pmo = players[CONSOLEPLAYER].plr->mo;
if(P_CheckSight(actor, pmo) &&
- (abs(M_PointToAngle2(pmo->origin, actor->origin) - pmo->angle) <= ANGLE_45))
+ (abs((int32_t)(M_PointToAngle2(pmo->origin, actor->origin) - pmo->angle)) <= ANGLE_45))
{
// Previous state (pottery bit waiting state).
P_MobjChangeState(actor, actor->state - &STATES[0] - 1);
@@ -131,7 +130,7 @@ void C_DECL A_PotteryCheck(mobj_t* actor)
pmo = players[i].plr->mo;
if(P_CheckSight(actor, pmo) &&
- (abs(M_PointToAngle2(pmo->origin, actor->origin) - pmo->angle) <= ANGLE_45))
+ (abs((int32_t)(M_PointToAngle2(pmo->origin, actor->origin) - pmo->angle)) <= ANGLE_45))
{
// Previous state (pottery bit waiting state).
P_MobjChangeState(actor, actor->state - &STATES[0] - 1);
@@ -590,7 +589,7 @@ dd_bool A_LocalQuake(byte* args, mobj_t* actor)
int lastfound = 0;
int success = false;
- actor = actor; // Shutup compiler warning.
+ DENG_UNUSED(actor);
// Find all quake foci.
do
@@ -826,10 +825,10 @@ void C_DECL A_ThrustImpale(mobj_t *actor)
void C_DECL A_SoAExplode(mobj_t* actor)
{
int i;
+ mobj_t* chunk = NULL;
for(i = 0; i < 10; ++i)
{
- mobj_t* mo;
coord_t pos[3];
pos[VX] = actor->origin[VX];
@@ -840,13 +839,13 @@ void C_DECL A_SoAExplode(mobj_t* actor)
pos[VY] += FIX2FLT((P_Random() - 128) << 12);
pos[VZ] += FIX2FLT(P_Random() * FLT2FIX(actor->height) / 256);
- if((mo = P_SpawnMobj(MT_ZARMORCHUNK, pos, P_Random() << 24, 0)))
+ if((chunk = P_SpawnMobj(MT_ZARMORCHUNK, pos, P_Random() << 24, 0)))
{
- P_MobjChangeState(mo, P_GetState(mo->type, SN_SPAWN) + i);
+ P_MobjChangeState(chunk, P_GetState(chunk->type, SN_SPAWN) + i);
- mo->mom[MZ] = ((P_Random() & 7) + 5);
- mo->mom[MX] = FIX2FLT((P_Random() - P_Random()) << 10);
- mo->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 10);
+ chunk->mom[MZ] = ((P_Random() & 7) + 5);
+ chunk->mom[MX] = FIX2FLT((P_Random() - P_Random()) << 10);
+ chunk->mom[MY] = FIX2FLT((P_Random() - P_Random()) << 10);
}
}
@@ -863,7 +862,7 @@ void C_DECL A_SoAExplode(mobj_t* actor)
}
}
- S_StartSound(SFX_SUITOFARMOR_BREAK, actor);
+ S_StartSound(SFX_SUITOFARMOR_BREAK, chunk);
P_MobjRemove(actor, false);
}
#if MSVC
diff --git a/doomsday/sdk-qch.doxy b/doomsday/sdk-qch.doxy
index 9a6b72b..8c3a9ba 100644
--- a/doomsday/sdk-qch.doxy
+++ b/doomsday/sdk-qch.doxy
@@ -5,8 +5,8 @@ OUTPUT_DIRECTORY = apidoc-qch/
# Also generate help files for Qt Creator
GENERATE_QHP = YES
QCH_FILE = "doomsday.qch"
-QHP_NAMESPACE = "net.dengine.sdk.1154"
-QHP_VIRTUAL_FOLDER = "doomsday-1.15.4"
+QHP_NAMESPACE = "net.dengine.sdk.1155"
+QHP_VIRTUAL_FOLDER = "doomsday-1.15.5"
QHG_LOCATION = "../build/scripts/qhelp.py"
# Dynamic HTML doesn't work inside Qt Creator
diff --git a/doomsday/tools/savegametool/src/main.cpp b/doomsday/tools/savegametool/src/main.cpp
index 765b977..35c878c 100644
--- a/doomsday/tools/savegametool/src/main.cpp
+++ b/doomsday/tools/savegametool/src/main.cpp
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
try
{
TextApp app(argc, argv);
- app.setMetadata("Deng Team", "dengine.net", "Savegame Tool", "1.0.0");
+ app.setMetadata("Deng Team", "dengine.net", "Savegame Tool", "1.0.1");
app.initSubsystems(App::DisablePlugins | App::DisablePersistentData);
// Name the log output file appropriately.
diff --git a/doomsday/tools/savegametool/src/nativetranslator.cpp b/doomsday/tools/savegametool/src/nativetranslator.cpp
index e098eac..0a9d78a 100644
--- a/doomsday/tools/savegametool/src/nativetranslator.cpp
+++ b/doomsday/tools/savegametool/src/nativetranslator.cpp
@@ -222,7 +222,7 @@ DENG2_PIMPL(NativeTranslator)
// determine the game identity key unambigously, without some assistance.
if(gamemode == 4 /*doom2*/)
{
- if(fallbackGameId.isEmpty())
+ if(!fallbackGameId.isEmpty())
{
return fallbackGameId;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list