Author: muggenhor
Date: Tue Jul 22 17:11:07 2008
New Revision: 5638
URL: http://svn.gna.org/viewcvs/warzone?rev=5638&view=rev
Log:
Merged revisions
5098,5102,5126-5128,5131,5135-5136,5139-5141,5148,5150,5153,5155,5164,5166,5168-5169,5171,5174-5175,5180,5184,5186,5192-5193,5215-5217,5219,5222,5225-5226,5228-5229,5232,5235-5236,5242-5243,5246,5255-5257,5259,5274,5284,5287-5288,5303-5304,5311-5312,5330-5331,5334,5336,5338,5340,5351,5396-5398,5420,5447,5469,5522,5528,5538,5542-5543,5546-5548,5553,5558,5560-5561,5564,5568,5574-5577,5584-5585,5587,5589-5590,5594-5597,5600-5603,5606-5609,5611,5614-5617,5622,5625,5629-5631
via svnmerge from
svn+ssh://[EMAIL PROTECTED]/svn/warzone/trunk
........
r5543 | muggenhor | 2008-07-14 17:09:00 +0200 (ma, 14 jul 2008) | 3 lines
* Don't #inlcude treap.h in frame.h as only a single file within Warzone
depends on the treap code
* Use a forward declaration in strres.h to declare a pointer to a TREAP
instead of importing the full treap.h declarations in strres.h and thus large
portions of the codebase
* Rename TREAP's forward declaration name from _treap to TREAP
........
r5546 | muggenhor | 2008-07-14 19:53:03 +0200 (ma, 14 jul 2008) | 1 line
Remove macro TREAP_NODE_BASE and move its contents directly into TREAP_NODE
as that's the only place where this macro is used.
........
r5547 | muggenhor | 2008-07-14 22:22:19 +0200 (ma, 14 jul 2008) | 3 lines
* Remove unused functions treapReset, treapDisplayRec and treapDisplay
* Remove unused macro TREAP_DISPLAY
* Directly use function treapGetSmallest, treapDel, treapFind and
treapDestroy instead of macros TREAP_GETSMALLEST, TREAP_DEL, TREAP_FIND and
TREAP_DESTROY respectively
........
r5548 | muggenhor | 2008-07-14 22:25:48 +0200 (ma, 14 jul 2008) | 1 line
Get rid of macro TREAP_NODE_DEBUG and move its contents to the only location
where it's used: struct TREAP_NODE
........
r5553 | muggenhor | 2008-07-15 01:17:23 +0200 (di, 15 jul 2008) | 1 line
Don't bother checking whether bitflag ID_ALLOC is set before removing it, the
end result is the same anyway: ID_ALLOC being absent from the bitmask/number
........
r5558 | muggenhor | 2008-07-15 13:46:12 +0200 (di, 15 jul 2008) | 1 line
Don't bother checking whether bitflag ID_ALLOC is set before removing it, the
end result is the same anyway: ID_ALLOC being absent from the bitmask/number
........
r5629 | muggenhor | 2008-07-21 02:52:33 +0200 (ma, 21 jul 2008) | 1 line
Don't #define DEBUG_GROUP0 in places where it cannot possibly be used
........
r5630 | muggenhor | 2008-07-21 02:57:32 +0200 (ma, 21 jul 2008) | 3 lines
* Use calloc instead of malloc followed by memset(0)
* Use an unsigned int instead of UDWORD as we don't depend on the size
guarantee
* Move the definition of aUsage into #ifdef DEBUG_CHECK_FOR_UNUSED_STRINGS,
because that's the only place where it's used
........
r5631 | muggenhor | 2008-07-21 03:00:37 +0200 (ma, 21 jul 2008) | 1 line
Fix a wrong call to calloc (parameter list was malloc style)
........
Modified:
branches/2.1/ (props changed)
branches/2.1/lib/framework/frame.h
branches/2.1/lib/framework/resource_parser.y
branches/2.1/lib/framework/strres.c
branches/2.1/lib/framework/strres.h
branches/2.1/lib/framework/treap.c
branches/2.1/lib/framework/treap.h
branches/2.1/lib/script/interp.c
branches/2.1/src/cluster.c
branches/2.1/src/formation.c
branches/2.1/src/levels.c
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
