45f23a4926
Merge commit 'HEAD@{3}'
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00
fcd1455f44
Merge commit 'HEAD@{4}'
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5346 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:14 +00:00
aed2a94cd0
Move two vars into more local scope, and improve two asserts, then add a
...
fallback fix for non-debug builds. This to improve tracing of bug #11908 :
crash - some assertion failed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5345 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 19:44:23 +00:00
68ad79d44a
Move warning flags out of CPPFLAGS for raw Makefiles
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5344 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 15:58:51 +00:00
5ea6c60eee
Do not initialize music sound system when --nosound option given.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5343 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 15:32:06 +00:00
a8dc963d37
Backport from path branch: Fix sMove->DestinationX|Y to use world coordinates, as they should be.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5342 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 15:25:58 +00:00
238e9664a2
All readmes:
...
* add 16 to the valid values for the configuration option textureSize
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5341 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-27 19:22:12 +00:00
89f6301a6f
Do not create or remove subdirs if we are building directly from the source directory
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5339 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-26 18:20:54 +00:00
9343c485b0
Revert "Some endianness swaping, as found in tags/2.1_beta3. Apparently was forgotten to port back..."
...
This reverts commit r5335.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5337 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-26 12:57:16 +00:00
b524a3f8bd
Some endianness swaping, as found in tags/2.1_beta3. Apparently was forgotten to port back...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5335 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-26 12:47:36 +00:00
bc810ca2e2
Reset to the start of the playlist when we've reached the end of it, don't move past the end first. This addresses bug #11879 in part (by preventing it even further from occuring).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5333 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 20:15:20 +00:00
9bf7563e4b
Import ChangeLog changes r5330 and r5331 from branches/2.1
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5332 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 14:19:06 +00:00
1c6ff360db
Use if (condition) something; else something-else; instead of if (condition) something; if (!condition) something-else;
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5329 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 14:01:18 +00:00
da0b168df3
Don't pass a NULL pointer to cdAudio_OpenTrack
...
This should fix bug #11879
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5328 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 14:00:20 +00:00
9fcaf6c08f
Slight refactoring of cdAudio_PlayTrack to use a switch on the enum, instead of an if, if-else structure
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5327 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 13:56:17 +00:00
7af41b6f3a
Substitute / with $(DIRSEP) where necessary. Fixes last remainder of bug #11883 (hopefully).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5326 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 00:13:18 +00:00
050ec39c11
Use the (also new in this commit) relative variants of the directories almost everywhere.
...
Exception is when generating the .wz files, where we need the path to the build directory and building a reverse relative path to $(srcdir) will be messy.
Also silence submake.mk a great deal.
Bug #11883 should be fixed now for the most part.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:41:52 +00:00
876b00154a
Forgot one uppercase makefile.raw...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5324 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:19:09 +00:00
286aea9a79
Do not abort if mkdir complains about already existing directories.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5323 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:53:30 +00:00
fad0231d54
Refer to the Makefile in lowercase notation to please Windows' make.
...
Fixes part of bug #11883 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5322 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:49:10 +00:00
fd2bfb0e0f
Prepare for another fix for parts of bug #11883 : Issues with the improved raw Makefiles
...
- Rename Makefile.raw to lowercase
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:48:45 +00:00
16bd0a829a
Part of bug #11883 : Issues with the improved raw Makefiles.
...
- Provide the missing Windows commands
- Remove TEST_D, because it has no suitable syntactical equivalent on Windows.
(Just create directories unconditionaly. You will probably notice if there exits a file of the same name...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5320 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:34:56 +00:00
73b35ab8d6
Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious.
...
Their use is currently flawed, since it will not work in directories with spaces in them... (
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:19:54 +00:00
ee0be13767
Secure autogen.sh against pathnames with spaces
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5318 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:03:52 +00:00
452b737b64
Output gameTime for debug messages. Should make it easier to recognize relevant messages and their relation over time.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5317 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 18:07:45 +00:00
cf8430a142
update-po
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5316 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 18:07:12 +00:00
2b0bd03914
Updates to the betawidget library; being to document vector.[ch], fix a bug in vectorAdd, const correctness for the widget type system, remove a rouge newline in geom.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5315 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 10:11:03 +00:00
21a883121a
* Add an ASSERT to trap a corner case which I don't think ever occurs.
...
The info from this ASSERT is needed for a proper (and fully educated) fix of bug #11865 . Thus please attach a backtrace to bug #11865 when this ASSERT gets triggered, and if possible add which VTOL type you ordered to or from a rearming pad at the time.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5314 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 21:16:23 +00:00
276e201c01
* Get rid of "delayed return" in vtolHappy; just return false as soon as we've determined a VTOL isn't happy
...
* Use return (val == expected); instead of if (val == expected) return true; else return false;
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5313 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 21:15:58 +00:00
826208f675
Backport nearest fix from pathfinding branch.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5310 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 18:00:37 +00:00
3632863673
English readmes:
...
* really use the correct warzone-directory for 2.1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5309 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 16:47:26 +00:00
9bd8b24921
Boost raw Makefiles
...
- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:54:47 +00:00
aa2c897bd2
Usage of system() requires inclusion of cstdlib
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5307 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:49:12 +00:00
4846760772
Add the beginnings of a type-checking system for betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5306 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 12:18:19 +00:00
cab361eec0
* Only use TABs for indentation, not for alignment
...
* No whitespace on the end of lines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5305 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 23:28:34 +00:00
2dbcfca6dd
All readmes:
...
* unified usage of folder/directory, correct warzone-directory for 2.1
German readmes:
* added information that is in the English counterparts only
English readmes:
* minor clean-ups
English text readme:
* Forgot to cutoff text after 80 characters in 'Configuration file'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5302 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 18:42:54 +00:00
13aeeafc97
Less ASSERT(false, ... crap, use ASSERT(!"description", ... instead
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5301 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 18:22:49 +00:00
6ffe6f8f49
Fix a typo in betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5300 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 17:55:52 +00:00
ee0e17d2e6
Add EVT_MOUSE_CLICK support and fix a typo.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5299 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 17:53:08 +00:00
b16387ada8
Minor cleanup to minimise patch #686
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5298 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 17:39:11 +00:00
9fffb2817a
0 -> '\0' to check the emptyness of a char[]
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5297 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 17:39:00 +00:00
dcd337ca20
English readmes:
...
* renamed section 'WZ-dir and configuration file' and occurences of 'WZ-dir' to 'Warzone directory' for convenience
* added new section 'Configuration file' as the previous section containing that name did not contain enough information on the configuration file (only its name)
* devs, please take a look at the section 'Configuration file' and tell me, if something is wrong
* XHTML readme only: changed 'Music' according to r5261, r5281 by per
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5296 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 13:26:14 +00:00
c3d5cc4b93
Make the drawChildren method virtual and fix some typos.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5295 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-22 12:03:42 +00:00
91c7638ddb
Check malloc's return value
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5294 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:35 +00:00
8987ee3aff
Slight refactoring to return as soon as possible, thus not damaging code-readability by large amounts of scope-nesting (specifically if-branches)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5293 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:29 +00:00
952cd00d05
Only iterator over the linked list `songList` once to determine the end. Then store a pointer to the last ->next pointer and use it to append to the list instead.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5292 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:26 +00:00
f7ead00bb0
* Don't use strtok to separate out lines from files as the line reading loop already takes care of that
...
* Remove now double variable filename and rename line_buf to filename
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5291 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:21 +00:00
3fd663fd85
Add --disable-sound to the configure script, to disable sound at compile time
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5290 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:51 +00:00
5e4a60ed64
Do not ignore /configure.ac in the .gitignore file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5289 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:30 +00:00
4f63fba465
Add the map 8c-cockate by forum user zydonk. Original work licensed under the GPL.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5286 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:38:53 +00:00
Dennis Schridde
Per Inge Mathisen
Steven Koenig
Giel van Schijndel
Freddie Witherden