Commit: b6baa8338ec7d92a3c7814095445b01433c0a4bb
Trac URL:
http://developer.wz2100.net/changeset/b6baa8338ec7d92a3c7814095445b01433c0a4bb
Author: buginator <bugina...@gna.org>
Date: Fri Nov 5 22:42:34 2010 -0400
Actually copy the default template name
(cherry picked from commit 5132e5cace5f6e2299e4ef0b6ed9267738e28ff5)
src/design.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/design.c b/src/design.c
index cd4bc8f..17cf78d 100644
--- a/src/design.c
+++ b/src/design.c
@@ -1420,7 +1420,7 @@ static void intSetEditBoxTextFromTemplate( DROID_TEMPLATE
*psTemplate )
}
else
{
- GetDefaultTemplateName(psTemplate);
+ sstrcpy(aCurrName, GetDefaultTemplateName(psTemplate));
}
widgSetString(psWScreen, IDDES_NAMEBOX, aCurrName);
-------------------------
Commit: f825a85f5d6a07f2dec44c4b8273688fa8144160
Trac URL:
http://developer.wz2100.net/changeset/f825a85f5d6a07f2dec44c4b8273688fa8144160
Author: buginator <bugina...@gna.org>
Date: Sat Nov 13 13:40:10 2010 -0500
CHANGELOG: Fix unit explosion color for turret
fixes ticket:2294
(cherry picked from commit f4e8221ef53c4f9af6b3f5f2af3c7e5b28c89654)
Conflicts:
src/component.c
src/effects.c
src/effects.h
src/component.c | 5 +++--
src/effects.c | 17 ++++++++++++++---
src/effects.h | 2 ++
3 files changed, 19 insertions(+), 5 deletions(-)
-------------------------
Commit: 0ed42c0b2db0ab964505033c4e652305bc0115f0
Trac URL:
http://developer.wz2100.net/changeset/0ed42c0b2db0ab964505033c4e652305bc0115f0
Author: buginator <bugina...@gna.org>
Date: Sun Nov 7 21:47:31 2010 -0500
Forgot the include for f4e8221ef53c4f9af6b3f5f2af3c7e5b28c89654
(cherry picked from commit d4639fea223ab74f4953af8ee4263c2699f712e4)
src/effects.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/effects.c b/src/effects.c
index 51276d6..bc6151c 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -69,7 +69,7 @@
#include "multiplay.h"
#include "game.h"
-
+#include "component.h"
#define GRAVITON_GRAVITY ((float)-800)
#define EFFECT_X_FLIP 0x1
-------------------------
Commit: f8517a7716e2fe11a78fc49ca73ac92b2f7d5211
Trac URL:
http://developer.wz2100.net/changeset/f8517a7716e2fe11a78fc49ca73ac92b2f7d5211
Author: buginator <bugina...@gna.org>
Date: Mon Nov 8 19:17:58 2010 -0500
Fix another memory clobbering issue. (dereferenced pointer)
Patch Author: Safety0ff
fixes ticket:2300
Original detective work done by Ai_Tak (ticket:1656)
Signed-off-by: buginator <bugina...@gna.org>
(cherry picked from commit 1a6fb8a7547f23ce2bd7af153ac839cba999e2b0)
lib/script/event.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
-------------------------
Commit: 03914be31b07f317fab32764502769ac6e7bbef6
Trac URL:
http://developer.wz2100.net/changeset/03914be31b07f317fab32764502769ac6e7bbef6
Author: buginator <bugina...@gna.org>
Date: Sat Nov 13 13:48:18 2010 -0500
When doing a map preview, no need to process stuff that is only useful in-game.
This speeds up the preview screen back to 2.x speeds.
(cherry picked from commit 5f42d0032a9c8dc0b4de60cbef7f9bba8b0b70f0)
Conflicts:
src/game.c
src/map.c
src/game.c | 4 ++--
src/map.c | 10 ++++++++--
src/map.h | 2 +-
src/multiint.c | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
-------------------------
Commit: c1b44daf1e8458b12afe3701f63d8888a01058e7
Trac URL:
http://developer.wz2100.net/changeset/c1b44daf1e8458b12afe3701f63d8888a01058e7
Author: buginator <bugina...@gna.org>
Date: Thu Nov 11 19:41:08 2010 -0500
Fix underflow, if a pre-built structure has part of it in water.
NOTE: since this is going on, on our mission maps, we just fix the issue,
instead of
removing the item, since the item in question might be used by the scripts, and
removing
it would break things.
fixes ticket:2302
(cherry picked from commit 94bedce442051a0cb1562fb0f8962c54e60e9fa3)
src/map.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
-------------------------
Commit: d4588c69f3376418e180cb6c4ead206f81c431a4
Trac URL:
http://developer.wz2100.net/changeset/d4588c69f3376418e180cb6c4ead206f81c431a4
Author: buginator <bugina...@gna.org>
Date: Thu Nov 11 19:57:24 2010 -0500
Never call mapShutdown() or environReset() in mid-missions, since we come back
to the main map, and that data must be valid or we get no textures, and the
water
heights will be incorrect.
Also complain loudly if the mission type is wrong (should never happen!)
fixes ticket:2262
(cherry picked from commit b859c3d6997a9860662b1be8753c643fc48f2a72)
src/mission.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
-------------------------
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
