410c511363
Don't duplicate $CFLAGS in $__BOTHFLAGS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5624 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 23:22:36 +00:00
09f59a0200
Use some more options from the __BUILD_CONFIG.USER file in __BUILD_CONFIG
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5623 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 23:15:37 +00:00
d71055a5e0
* Replace uses of strcpy, strcat and sprintf with sstrcpy, sstrcat and ssprintf where possible
...
* Merge a translation string into it's printf formatting string (i.e. make the format string the translated string)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5621 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 22:46:55 +00:00
1feee6ea95
Replace uses of "\n" and std::endl with uses of constant `endl`, which is defined to the platform's native line ending.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5620 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 22:46:50 +00:00
d451b3f5a1
Remove the terminating newline ('\n') from ctime's output to allow different newline styles (e.g. "\r\n" on Windows)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5619 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 22:46:46 +00:00
e029c11bb4
In the MinGW stack dumper, use dbgDumpHeader to dump a generic debug info header, instead of custom crafted (and duplicated) code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5618 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 22:46:26 +00:00
1311a3dc19
Don't define EXTDIR as a subdir of the devpackage, define it as the dir of the devpackage
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 16:18:34 +00:00
461c6f1002
Don't #include debug.h as we depend on dumpinfo.h instead (thus #include that file instead)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 15:27:17 +00:00
345bd3692d
Allow UTF-8 strings in the sources when running xgettext over it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5610 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 13:50:48 +00:00
944ec2031b
Checked every *.po for correct update of %u%% to %3.0f%% in "%s - Damage %u%%" to "%s - Damage %3.0f%%"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5605 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 07:07:00 +00:00
a8fddd4c1a
de.po:
...
* updated --> everything translated, 2 fuzzies left
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5604 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 05:32:16 +00:00
d22a2dcf82
Add table entries to the language tables in i18n.c for the newly added translations of r5596:5597
...
* Basque (eu)
* Latvian (lv)
* Norwegian Nynorsk (nn)
* Slovenian (sl)
* Swedish Sweden (se_SE)
* Turkish (tr)
* Uzbek Cyrillic (uz)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5599 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 22:23:06 +00:00
3814e5f511
* Update the locale lists for Windows and Unix: add all languages in po/ to them
...
* Change the Windows locale list to allow specifying sublanguages as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5598 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 22:01:20 +00:00
b26d8dd809
Add the most significant changes to the 2.1 branch to the 2.1_beta4 portion of the ChangeLog
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5593 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 20:25:49 +00:00
468320c140
Merge changelog changes of r5340 from the 2.1 branch into trunk
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 20:21:36 +00:00
8a4ccb21a7
Merge changelog changes of r5587 from the 2.1 branch into trunk
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 20:15:10 +00:00
4c2fedaff6
Save the current state of the cairo context before drawing and restore once finished.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 19:34:51 +00:00
1b8a62deca
Make the treap code specific for string resources
...
Because the treap management code is only used by the code for string resources, make it specific for these string resources and don't use casting back & forth from void* all over the place. This simplifies the interaction of string resource code with treap code.
This will allow an easier cleanup and eventually a removal of string resource code. As the string resource code can eventually be replaced with gettext code instead.
This closes #18
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5586 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 19:15:02 +00:00
34b73dcdb5
Invert logically wrong assertion (i.e. assert a pointer to be non-null rather than null)
...
This fixes bug #12047 (assert failure as soon as you open one of the design/manufacture/construct/research windows)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5583 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 14:28:36 +00:00
a76577d94e
Add some more informative debug messages to the ASSERTs of CHECK_OBJECT
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5582 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 01:23:16 +00:00
ed3f1508b8
* Remove the dumpLog function and associated code from debug.c
...
* Add a new function dbgDumpLog to dumpinfo.cpp for dumping the last debug messages
* Add a debug output callback to dumpinfo.cpp which is used to fetch the debug messages and store them in a ring buffer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5581 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 01:08:07 +00:00
859196ed2c
Move duplicated code, for printing to ''all'' debug output callbacks, to a function of its own.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5580 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-18 23:13:49 +00:00
9d77329842
* Add a new statically-sized string macro vssprintf, which allows printing to statically sized strings just like ssprintf, with as difference that this macro function operates similar to vsprintf rather than sprintf
...
* Replace uses of strncmp, snprintf and vsnprintf with sstrcmp, ssprintf and vssprintf respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5579 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-18 22:47:28 +00:00
36a4191818
Switch to an OpenGL compositing mode; some clean-up still required.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5578 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-18 22:21:54 +00:00
5554dbe695
* Move duplicated code to fetch a tabbed widget form by ID to a function of its own: widgGetTabbedFormById
...
* In widgSetTabs depend on functions widgGetNumTabMajor and widgGetNumTabMinor respectively instead of duplicating their code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5573 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-18 15:17:29 +00:00
5bb3421545
Prototype and document widgetAddTimerEventHandler.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5572 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-18 12:10:47 +00:00
7458d5b499
Fix some more compiler warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5571 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 21:19:33 +00:00
2f254ade34
Make sure variables are defined before anything else.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5570 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 19:14:35 +00:00
3fb1c3e234
Add debug log calls to repair structure code to help debug
...
repair structure problems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5569 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 15:47:33 +00:00
f0fd48673d
Add the 4c-cockpit map by zydonk.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5567 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 13:00:45 +00:00
e827d8e580
Update of the 8c-cockate map by zydonk.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:55:01 +00:00
eb3ac2e356
Fix bug #11911 : two patrol buttons. Patrol now has a new icon, drawn by
...
elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:06:26 +00:00
d98f300696
Show all buildings in radar window. This makes the building under attack
...
colour change feature work correctly, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5563 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 11:13:36 +00:00
94aca87927
Fix bug #12016 : radar is broker on trunk, reported by Michael Strobel. We now
...
use the texture rectangle extension to draw the radar window, which should be
supported on even the oldest OpenGL-capable hardware out there.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5562 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 20:06:09 +00:00
ac5c52031b
Get rid of unnecessary assignment of `volume` to `music_volume`; just utilize clipf right away on `volume`
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5559 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 13:01:22 +00:00
0d670c0409
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
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5558 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 11:46:12 +00:00
b48b8058e8
Add support for timer events and fix a bug in event id generation.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5557 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 10:12:03 +00:00
bef2d4cd6a
Update Xcode project for the addition of src/positiondef.h in r5531 and the removal of lib/framework/treapint.h in r5544
...
Patch by Tim Baumgartner
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5556 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:43:55 +00:00
355d0c0760
Make it so that the event-removal system in betawidget actually works.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5555 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:41:53 +00:00
86dd924881
Minor cosmetic improvements to betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5554 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:19:51 +00:00
d7a0c2fa9b
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
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5553 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:17:23 +00:00
fede6c6e51
Fix a bug in vectorAt which could cause a segfault; add vectorHead which returns the last element added to the vector.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5552 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:08:37 +00:00
0c4b256797
* Out with the (unnecessary! as the size guarantee isn't required) WORDs from treap.[ch]
...
* Restructure treapStringCmp to be __readable__
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5551 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 22:09:31 +00:00
8db7c031ff
Fix some compile errors that occur when DEBUG_TREAP is #defined
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5550 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 22:09:15 +00:00
379a905c6c
* Move the type definitions of TREAP_NODE and TREAP from treap.h to treap.c (use a forward declaration in the header instead)
...
* Don't strdup strings retrieved from __FILE__ directives; just store const char* the pointer instead (prevents a memory leak as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5549 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:41:22 +00:00
9e70aaf07c
Get rid of macro TREAP_NODE_DEBUG and move its contents to the only location where it's used: struct TREAP_NODE
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5548 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:25:48 +00:00
077d4efefe
* 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
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5547 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:22:19 +00:00
9f3371dc33
Remove macro TREAP_NODE_BASE and move its contents directly into TREAP_NODE as that's the only place where this macro is used.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5546 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 17:53:03 +00:00
6e9db52984
Get rid of the unused, default comparison function for the values in treap nodes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5545 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 17:49:10 +00:00
730188c081
* Get rid of treapint.h which declares prototypes for functions that are only used in treap.c.
...
* Declare these functions with static linkage instead.
* Update autotools buildsystem, Code::Blocks project and MSVC project, raw win32 Makefiles don't need an update
NOTE: This may require updating of buildsystems not mentioned above
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5544 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 15:19:08 +00:00
Giel van Schijndel
Steven Koenig
Freddie Witherden
Per Inge Mathisen