Commit Graph

1946 Commits (0fc9820f4a030a99d41861d089158427631f8e87)

Author SHA1 Message Date
Freddie Witherden d4168f712c Make it possible for an event handler to remove itself.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5527 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 15:40:58 +00:00
Per Inge Mathisen c2fe7de339 The fix to bug #11829: When three players join mp dialog, one drops, in r5258
had a little bug of its own, that made player 3, 5, and 7 drop instead. Fixed!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5521 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 20:36:59 +00:00
Per Inge Mathisen 58792b6df1 Fix erronous error reporting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5517 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 16:21:00 +00:00
Per Inge Mathisen e2064a4927 Add error check in NETsendGAMESTRUCT - dump warning to log if fails.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5516 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:50:18 +00:00
Per Inge Mathisen a2ca8dedaf Improve logging in NETbcast. Change parameter type of NETBroadcastPlayerInfo so
that it takes unsigned like all its users.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5515 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:20:47 +00:00
Per Inge Mathisen 117fa9e961 Cosmetic improvements to netplay debug log calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5514 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:02:55 +00:00
Dennis Schridde 022315eef0 Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
Giel van Schijndel 623044cf7c Add some debug messages when failing to create an AUDIO_STREAM in sound_PlayStreamWithBuf
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5467 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 15:47:27 +00:00
Per Inge Mathisen 1f831ebd3d Add beginnings of self-test to openal and general audio subsystems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5456 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 19:07:42 +00:00
Freddie Witherden 7d5723455c Add keycode.h to the repository (which I forgot in r5445).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5449 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 16:51:17 +00:00
Per Inge Mathisen 2aeda4d91e Improve playlist selftest. It now covers the entire playlist API. Remove unused
playlist declaration from header file.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5448 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 16:19:57 +00:00
Freddie Witherden 631ff7879b Add a dedicated text input event. Switch to our own custom keycode enum rather than depending on SDLs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5445 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 15:46:46 +00:00
Per Inge Mathisen ee6452eb64 Revert r5426. It will not work quite like that, since the pointers refer
to a list in audio.c. The horror! The horror!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5428 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 18:24:42 +00:00
Per Inge Mathisen 74aeca0093 Change current_queue_sample to a pointer to an AUDIO_SAMPLE instead of
an integer value. This fixes the problem of AL_INVALID being used for
invalid values, while it is really a perfectly valid ID for a sample.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5426 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 17:45:33 +00:00
Per Inge Mathisen 4d1d5b4c11 Add an error check to patch #1082: Fix AL_INVALID_NAME bug, to catch the
currently impossible case of the sample not being in the active list.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5425 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 17:11:58 +00:00
Freddie Witherden 4f07f76034 Add an initial spacer implementation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5424 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 16:55:15 +00:00
Freddie Witherden f99660d986 Fix a bug in the resize asserts; fix another bug in the hBox implementation causing sizing and positioning of child widgets to fail.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5423 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 16:46:53 +00:00
Per Inge Mathisen 22d4eb3fe1 patch #1082: Fix AL_INVALID_NAME bug, sans one no good assert.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 16:12:14 +00:00
Freddie Witherden 8e7d4d0d09 Commit hBox.[ch]; a preliminary horizontal layout container.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5418 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 11:19:29 +00:00
Freddie Witherden 0160a3e859 Make sure that we clear the cairo context before we begin drawing to it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 10:15:52 +00:00
Freddie Witherden f2b30f27c8 Update some function prototypes for betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5416 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-08 09:15:13 +00:00
Freddie Witherden 2dc1063859 Allow widgetResizeImpl to work with containers (by re-laying them out).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5415 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-07 22:39:52 +00:00
Freddie Witherden 20d7cc06be Add support for masking mouse click events as well as mouse movement events.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-07 21:19:58 +00:00
Freddie Witherden 8895e7efba Add experimental support for masks in betawidget. This allows for non-rectangular widgets.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5413 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-07 19:10:23 +00:00
Dennis Schridde 302a557478 Rename "raw" Makefiles to "win32" Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +00:00
Dennis Schridde ec5aeaf3c7 Make "SCRIPT" release function just indirectly point to scriptFreeCode, so the function types are strictly compatible.
Clean scriptFreeCode's formating and remove unnecessary checks for ptr!=NULL before freeing.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5400 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:02:46 +00:00
Giel van Schijndel a4e8c96977 Move the code to spawn GDB, and arrange for a communication pipe, to a separate function: execGdb
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5391 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:41:33 +00:00
Giel van Schijndel 619e1e1943 * Deal with a failure of exeve() by writing a debug message indicating that it failed and terminating the child of our fork()
* Flush the write end of the pipe after writing all GDB commands into it
 * Process the return data (both return value and the contents of the output integer) from waitpid()

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5390 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:41:25 +00:00
Giel van Schijndel 2d6615a30a Refactor function gdbExtendedBacktrace:
* return as soon as an error condition is detected, thus preventing the need for deep nested if-branches.
 * Add some additional comments
 * Return true or false, false indicating an error, true indicating success

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5389 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:41:17 +00:00
Giel van Schijndel 6953f0fd6d Move the code that provides GDB backtraces in a function of its own to refactor it later (i.e. get rid of the deep if-branch nesting)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5388 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:41:07 +00:00
Giel van Schijndel aadfec4677 Document the gdb commands; what they do and why they're there
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5387 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:41:00 +00:00
Giel van Schijndel 38eea0b640 The syscall open() returns -1 on an error *not* 0, as 0 is a *valid* file descriptor:
* Thus check for a return value of -1, not 0

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:40:52 +00:00
Giel van Schijndel f8e5f8ddb8 * Don't duplicate code just because there's a single platform (Mac OSX) on which it isn't used
* Instead compile that code on all platforms except for the given one (Mac OSX)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:40:43 +00:00
Giel van Schijndel 43bdd9575d Factor out the code to retrieve absolute program paths and move it into a separate function of its own: fetchProgramPath
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5384 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 22:40:20 +00:00
Freddie Witherden 84be0c975d Use eventMisc for FOCUS and BLUR events.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5382 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-04 13:09:23 +00:00
Freddie Witherden c152583935 Fix a bug in vectorMap that could result in a segfault.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5357 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-03 16:19:41 +00:00
Freddie Witherden fc935ca02b Fix indentation (tabs => spaces).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5355 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-02 23:23:23 +00:00
Freddie Witherden 1661c61ac0 Major redesign; widgets now use compositing (rendering off-screen).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5354 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-02 23:18:32 +00:00
Giel van Schijndel a7ab3d9982 Merge lexer rules for the script_lexer that match different forms of the same token (e.g. upper/lower case variants)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5353 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-02 11:29:19 +00:00
Giel van Schijndel fd6b6262ba Apply patch #1078: Expand the GDB exceptionhandler.
With our current backtrace dumps I quite oftenly find that in case of segfaults, which combined with assert failures are the most common crash cause, I cannot easily see what value the dereferenced pointer held.

To be able to see this the exception handler will now invoke the "disassemble" and "info registers" commands when producing a back trace using GDB. This gives us the ability to see the precise assembly instruction that triggered the crash, together with the value of the register that was used as pointer.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5352 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-01 20:40:40 +00:00
Dennis Schridde fec1f446d3 Use clipf to clip float values
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5349 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-29 12:07:32 +00:00
Dennis Schridde 6b8aeb1aaa Add clipf() to clip float values
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5348 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-29 12:07:26 +00:00
Dennis Schridde 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
Per Inge Mathisen 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
Dennis Schridde 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
Dennis Schridde 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Freddie Witherden 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
Dennis Schridde 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
Freddie Witherden 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
Giel van Schijndel 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
Giel van Schijndel 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
Freddie Witherden 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
Freddie Witherden 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
Freddie Witherden 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Freddie Witherden 57cb40c1ed Some more work on betawidget's event system.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5283 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:23:00 +00:00
Per Inge Mathisen d3123eaac4 Fix issue in patch #1075 - use "/" separator for physfs paths.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5282 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 16:35:24 +00:00
Per Inge Mathisen a1c47bccf8 patch #1075: Simplify playlist code. Thanks to Giel for patch review.
The playlist file is no a simple list of files to play during the game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5281 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 15:40:56 +00:00
Dennis Schridde 4f77bdc8e6 Fix: warning: 'static' is not at beginning of declaration
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5280 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-20 14:04:10 +00:00
Per Inge Mathisen 4c73e82896 Fix --selftest check in nettypes.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5273 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 16:44:38 +00:00
Dennis Schridde a128c9df88 Add more vector functions and try to get a common order into them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5269 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 22:21:48 +00:00
Dennis Schridde 419aa5a56b New vector functions: Vector2i_New, Vector2i_Compare and use bool instead of BOOL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5264 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:26:13 +00:00
Dennis Schridde c9b9e98dc9 Fix "Create default playlist file; This is an ugly HACK which should be FIXME'd into oblivion some other time" by adding a default playlist file to base.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5263 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:25:35 +00:00
Per Inge Mathisen 925c3daced Quick fix for crash if --nosound is used together with a soundtrack file
(which is now created by default). Someone should look more carefully at 
this code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5262 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 16:29:10 +00:00
Per Inge Mathisen 1c3835ce23 Add original music soundtracks. If you have a playlist already, you need to delete it
or add the music to it manually.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5261 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-17 19:32:17 +00:00
Per Inge Mathisen 0d706d02fd Forward port workaround for eventRemoveContext crash from 2.1. This will leak some memory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5260 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-16 20:38:26 +00:00
Per Inge Mathisen 94f523d9ef Fix bug #11829: When three players join mp dialog, one drops
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5258 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-16 19:39:42 +00:00
Dennis Schridde a31dce8cbc More vector functions: Conversion and integer division
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5247 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 20:11:27 +00:00
Giel van Schijndel f9171b825f Use sizeof instead of magic numbers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5245 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 13:51:31 +00:00
Giel van Schijndel 05d71e2b19 Don't bother warning about some unused parameters in exchndl.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-09 19:58:56 +00:00
Per Inge Mathisen 14460d938a Make sure that packet size is turned into big endian before we send it.
This breaks network compatibility with everything older than this commit.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 14:22:44 +00:00
Per Inge Mathisen a05859644a Fix two mistakes in r5176 (static string cleanup) that made us copy far
less from two strings than we should.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 13:30:05 +00:00
Dennis Schridde 504ffcc625 Dont output any warnings in external sqlite.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-07 19:11:14 +00:00
Dennis Schridde a3ff407679 Rename VectorXY_Set to VectorXY_New and make it conform to API of the other vector functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5223 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-06 22:21:18 +00:00
Freddie Witherden 5fe6816fdd Fix building on OS X (some bozo forgot to update the Xcode project when adding new .c files). Update the font on OS X to Lucida Grande. Correct Framework install path to allow for moving executables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5221 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-06 17:42:21 +00:00
Giel van Schijndel 2be33c4286 Use WZ_DECL_UNUSED to squelch warnings about unused parameters in the PhysicsFS SQLite-VFS implementation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5212 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 19:50:50 +00:00
Giel van Schijndel 3b4df24942 Use WZ_DECL_UNUSED for the data parameter of debug_callback_win32debug to squelch the warning about it being unused
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5211 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 17:50:40 +00:00
Dennis Schridde 8836ce7a4b warning: converting of negative value `-0x000000001' to `UDWORD'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5206 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-31 23:17:27 +00:00
Giel van Schijndel 91fc8a3b53 * Change colours for some of the status bars in the mission "completion score screen" to be more "vivid"
* Add a new colour: WZCOL_MENU_SHADOW
  * Use this colour instead of WZCOL_MENU_BACKGROUND to create a "Black shadow"

Closes #11; patch by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5201 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 22:08:49 +00:00
Giel van Schijndel 19b80a1a6b Make sure to parse `database` __before__ `file` (i.e. group it with other tokens starting with a `d`) to make sure that it gets recognised at all
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5198 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 20:55:49 +00:00
Giel van Schijndel c0296aa371 * Apparently the %destructor feature of Bison is implemented differently for 2.1 than it is for 2.3 (or it is broken in 2.1); so don't use it when compiling with Bison 2.1 (leak memory instead)
* Assume __all__ windows builds use Bison 2.1 (this isn't correct, but it's the best I can currently do, as Bison provides no version macros aside from a string macro)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5196 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-27 21:37:54 +00:00
Giel van Schijndel 1d739ce56b * Pass the table name as well from the .wrf resource file
* "table" will now attempt to load the given resource type from the given table (in the currently opened database)
 * Maintain the current database's name (for error message, etc.)
 * Pass the table name to the database loading functions and use it (in combination with sqlite3_mprintf) to produce the SQL statements


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5189 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:59 +00:00
Giel van Schijndel 452c167e9a * Add a new resource loading function type: RES_TABLELOAD
* Add two new keywords to the .wrf files: "database" and "table"
  * "database" will cause the given filename to be opened as a database file (using SQLite3)
  * "table" will attempt to load the given resource type from the currently opened database
 * Don't open the database in the file loading functions (src/data.c) anymore; turn them in table loading functions instead (which get the current database passed as a paramter)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5188 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:53 +00:00
Giel van Schijndel f6693eebdf Fix a typo strrcat => sstrcat
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5183 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:42:02 +00:00
Per Inge Mathisen 8419a7008b Use calloc instead of malloc+memset, and make sure we clear the right memory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5181 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:40:56 +00:00
Per Inge Mathisen a5e528ebec Fix radarTexture crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5179 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:29:10 +00:00
Giel van Schijndel 855ec725d4 Use sstrcpy|sstrcat instead of strlcpy|strlcat for manipulation of statically sized strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5176 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 13:46:49 +00:00
Per Inge Mathisen 8243c4b2fb Fix the infamous eventRemoveContext crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5167 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 13:58:26 +00:00
Roman C d89f43106d Make sure we print out script call stack when division by zero occurs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5152 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 14:29:11 +00:00
Per Inge Mathisen 4d845c8067 Fix debug log calls going off when they shouldn't
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5147 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 19:33:05 +00:00
Dennis Schridde f94ee4683d *cough*
rad2deg should not look like deg2rad...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5146 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 18:27:48 +00:00
Giel van Schijndel 2102ab0475 Fix warnings: remove unused variables
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5144 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-20 19:57:26 +00:00
Roman C ebaecc07f6 Fix memory leaks in script_paryer.y the correct way.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5142 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-19 13:53:04 +00:00
Per Inge Mathisen d6d6a9919e Commit API only from patch #907: Make texture coordinates into static array.
This fixes a bug with maps smaller than max visible tiles area which would
either crash or create seams, re-reported by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5134 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 21:48:23 +00:00
Giel van Schijndel 0118573321 Work around Flex 2.5.33 implicitly defining yyget_extra() (rather than forward declaring it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5130 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 10:49:33 +00:00
Per Inge Mathisen 410570c6c1 Set proper svn eol-style on a bunch of files that did not have it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5125 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-16 17:31:51 +00:00
Dennis Schridde 5b703fb634 Dump OpenGL implementation information to console
Author: Buginator
Signed-off-by: Dennis Schridde <devurandom@gna.org>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5123 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-15 17:32:39 +00:00
Dennis Schridde b77dfdadad Simplification and slight speedup for trigSin/trigCos. Make trigIntSqrt wrap sqrtf, since the old lookup implementation was probably slower than that.
Author: Björn Bredthauer <Bjoern.Bredthauer@gmx.de>
Date: Thu, 15 May 2008 01:28:55 +0200
Signed-off-by: Dennis Schridde <devurandom@gna.org>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5122 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-15 00:19:47 +00:00
Dennis Schridde 2334f84c84 Remove unneccessary modulo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5120 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 22:59:00 +00:00
Dennis Schridde 1bc654f8b5 Add float variant to pie_RotateTranslate
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 21:15:59 +00:00
Dennis Schridde be2b8a35ab clip() function for integers (Like CLIP macro) and some slightly altered comments/variable names.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5104 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:19:10 +00:00
Dennis Schridde 6493ff1d2d More vector functions:
- Set() functions for Vector3i and 3uw
- Add() for Vector3i


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:18:53 +00:00
Giel van Schijndel 5828b26a10 * Add functions for changing the volume of an already created AUDIO_STREAM: sound_GetStreamVolume and sound_SetStreamVolume
* Use these functions in cdaudio.c to change the volume of the currently playing AUDIO_STREAM in function sound_SetMusicVolume

This fixes bug #11579 ("Music volume slider dont work")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5101 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 14:01:25 +00:00
Giel van Schijndel 44986c3473 * Make sure to actually set the volume of an AUDIO_STREAM we're creating
* Indentation fixes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5100 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 13:50:08 +00:00
Dennis Schridde 1fcf5bfe97 Render images as alpha, instead of gouraud. This allows alpha-gradients
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5099 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 12:53:02 +00:00
Giel van Schijndel 5d0e816aa7 * Put textual tokens as found by audp_lexer.l in heap memory rather than a static string buffer
* Make sure that this heap memory __will__ be released regardless of syntax errors during scanning


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5097 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:55:29 +00:00
Giel van Schijndel e8f9fb9ae5 * ONESHOT and LOOP are __not__ value tokens (they're just regular tokens), so don't mark them as such
* Add a new subrule `looping` and use that in rule audio_track instead of duplicating two code paths for audio_track


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:51:46 +00:00
Giel van Schijndel 8529559e7c * Parse quoted text in audp_lexer.l similar to most other parsers/lexers we use (is also less error prone)
* Add single line comments (using '//') to audp_lexer.l


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:42:55 +00:00
Giel van Schijndel d53aa02117 * Use the lexer_input framework instead of a custom YY_INPUT implementation for audp_lexer.l
* Get rid of lexer function parseGetErrorData and use audp_get_lineno() and audp_get_text() instead
 * Add a WZ_DECL_FORMAT declaration to audp_error to enable GCC's printf format checking
 * In audp_error allocate the buffer on the stack using alloca() instead of an auto 1kB text buffer


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5094 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:29:13 +00:00
Giel van Schijndel 640ee1f653 * Get rid of never initialised variables g_bParsingSubFile and g_fpOld (the compiler probably set them to false & NULL respectively everytime, if not then this code should have crashed consistently)
* Remove now useless yywrap() function


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5093 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:09:10 +00:00
Giel van Schijndel 1799f473c0 Rename some audp_(.*) stuff to yy$1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5092 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 20:06:19 +00:00
Giel van Schijndel 7be6f76ba3 Remove our own custom definition of YYLMAX (give Flex the liberty of determining this itself)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5091 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 19:55:55 +00:00
Giel van Schijndel f8e4607093 Fix an error causing us to use the wrong names for yyget_extra(), yyset_extra(), yyget_lineno() and yyget_text()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5089 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 19:40:53 +00:00
Giel van Schijndel 10f021f279 Fix a syntax error introduced in r5086
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5087 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:58:41 +00:00
Giel van Schijndel 59a1c05037 Cleanup:
* Remove our own strcpy implementation: stringCpy
 * Don't use "d = malloc(strlen(s) + 1); strcpy(d, s);" to copy a string into fresh heap memory, use "d = strdup(s);" instead
 * Fix indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5086 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:56:42 +00:00
Giel van Schijndel 942350278b * Put textual tokens as found by strres_lexer.l in heap memory rather than some crazy stack-like static string buffer
* Make sure that this heap memory __will__ be released regardless of syntax errors during scanning
 * Reduce code duplication in strres_parser.y by reducing a single parsing rule with duplicated code up into two rules


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5085 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:47:25 +00:00
Giel van Schijndel dfaf3cea17 * Use yytext instead of strres_text
* Get rid of lexer function strresGetErrorData and use strres_get_lineno() and strres_get_text() instead
 * Don't call abort() in function strres_error as the parser will return an error anyway (causing strresLoad to return false)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:35:36 +00:00
Giel van Schijndel fdc48bfc94 * Use the lexer_input framework instead of a custom YY_INPUT implementation for strres_lexer.l
* Don't bother to check whether we're in a comment when reaching the end of a string resource file


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5083 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:22:05 +00:00
Giel van Schijndel fae3c7da53 Don't duplicate code that appears in both branches of an if-statement
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5082 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:16:30 +00:00
Giel van Schijndel 2f98b6e39a Minor cleanup and add Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5081 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:09:25 +00:00
Giel van Schijndel 251317bd9a Cleanup (behaviour should be unchanged)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5080 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:03:26 +00:00
Giel van Schijndel d73949e336 * Put textual tokens as found by resource_lexer.l in heap memory rather than some crazy stack-like static string buffer
* Make sure that this heap memory __will__ be released regardless of syntax errors during scanning


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5079 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 18:00:09 +00:00
Giel van Schijndel 636bce3996 From resource_parser.y: "No longer static ... lets use this area globally":
* Lets __not__ use very bad practices just because we can!!! Make it static again
 * Give strres_lexer.l such an array of its own (static as well)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5077 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:50:49 +00:00
Per Inge Mathisen 1819c503c6 Make difficulty work when you start the campaign with the --game parameter.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:50:10 +00:00
Giel van Schijndel 7caf01c08f Use yytext instead of res_text
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5075 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:41:00 +00:00
Giel van Schijndel 1aed007c3e Attempt to match an empty string __before__ a non-empty one (otherwise we won't ever match it at all)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5074 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:38:45 +00:00
Giel van Schijndel 6bb4f86529 * Get rid of lexer function resGetErrorData and use res_get_lineno() and res_get_text() instead
* Don't call abort() in function res_error as the parser will return an error anyway (causing resLoad to return false)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:34:56 +00:00
Giel van Schijndel f7419596e2 * Use the lexer_input framework instead of a custom YY_INPUT implementation for resource_lexer.l
* Don't add the function name to the debug message in openLoadFile as debug() does that itself already


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5072 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:23:33 +00:00
Giel van Schijndel 78f93d3055 Reduce code duplication that occurs in both branches of an if-statement
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5071 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:13:11 +00:00
Giel van Schijndel 6bd36ba163 Don't bother to check whether we're in a comment when reaching the end of a WRF file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5070 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 17:04:32 +00:00
Giel van Schijndel 1c4bafaa2b Let the chat_lexer do some more of the work by returning only a single _T_YES token for "yes", "yea", "yeah" and "yep"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5063 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 12:48:31 +00:00
Per Inge Mathisen 07c9062105 Cosmetic update of static globals
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 12:39:16 +00:00
Giel van Schijndel 9640d3b0a6 * Make sure to set psPrev to NULL at the start of the deletion loop
* Also don't dereference it when it's NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5060 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 12:33:38 +00:00
Giel van Schijndel 58176b97bc * Fix GPL headers for some files which where wrongly marked as being Copyright Eidos Interactive in r1014
* Update file-level comment for chat_lexer.l for the change in r899 (i.e. the flex option `-i` doesn't need to be specified anymore)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5059 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 12:16:46 +00:00
Per Inge Mathisen 36e2ff2517 Update changelog in trunk as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5056 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 22:11:28 +00:00
Dennis Schridde c67a3ef1be More comments on previous patch, which was by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5051 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 19:53:27 +00:00
Dennis Schridde 25c53e1c48 commandline argument --join <host> to join into a lobby directly from the commandline ((needs ChangeLog addition!))
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5050 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 19:09:29 +00:00
Roman C fcfae543ba Revert r5043 because of compilation problems on non-MSVC systems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5049 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 15:25:43 +00:00
Per Inge Mathisen 91727f270b objTrace() no longer requires a debug part parameter, and always outputs the ID
of the traced droid.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5047 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 14:58:20 +00:00
Roman C da83c65c9c Output script call stack on ASSERT.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5043 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 11:51:23 +00:00
Roman C 03073c8038 Memory leak fix for event.c. Patch by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:34:48 +00:00
Roman C f7c684f964 Make it possible for AI to recognize some new words and phrases needed for new commands.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5034 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:24:09 +00:00
Roman C b40f5dd5a3 Get rid of some more compiler warnings on MSVC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:17:49 +00:00
Roman C 3d2dc99003 Scripting:
-allow creation of unit templates on the fly
-allow direct access to major weapon stats from within scripts

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5014 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 13:20:23 +00:00
Giel van Schijndel 701f65469c * Provide an abstraction of YY_INPUT so that we have a single definition which we can use in multiple lexers which can read from both in-memory buffers as well as PhysicsFS files
* Utilise this new version of YY_INPUT in script_parser and script_lexer


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5008 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 00:35:24 +00:00
Per Inge Mathisen 13fa22fcbf Revert r4932 and try a different fix instead, checking the number of tabs
actually allocated, and resetting the currently highlighted tab if it is
out of bounds.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 20:32:31 +00:00
Per Inge Mathisen bdb6bf9ef0 Silence compiler complaints about memory leaks in tile drawing code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4992 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 18:13:03 +00:00
Dennis Schridde 9541f843c4 Fix typo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4973 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 10:01:56 +00:00
Dennis Schridde 0e21488f74 Last commit to solve bug #11656, fix by Paul Wise <pabs>.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4954 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-07 10:09:20 +00:00
Dennis Schridde 7655a44069 Fix issue where hosting a game and then exiting before it starts would not stop warzone from listening on its port.
Signed-off-by: Dennis Schridde <devurandom@gna.org>

- Also seems to fix other issues, like weird number of AIs after host-stophost-hostagain.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4953 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-07 10:06:49 +00:00
Freddie Witherden 073a0e5d55 Add some layout support code to the new widget system and clean-up some code in it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4944 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-06 16:34:34 +00:00
Giel van Schijndel b58d508ce6 Doxygenize the parameterlist of frameInitialise
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4943 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-05 23:17:35 +00:00
Giel van Schijndel 01958db9a0 We don't #define HAVE_STRLCPY or HAVE_STRLCAT in the configure script anymore
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4939 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-05 15:12:32 +00:00
Roman C 2c7d52d0c8 Fix MSVC compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4914 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 12:55:05 +00:00
Per Inge Mathisen 221a2cb4ee Remove MSVC support for WZ_DECL_CONST since it didn't work.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4913 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 12:34:20 +00:00
Per Inge Mathisen 6e9732a86a WZ_DECL_CONST now implies WZ_DECL_WARN_UNUSED_RESULT and also works on MSVC.
WZ_DECL_RESTRICT now works on MSVC as well.
WZ_DECL_THREAD added, declares variables thread local, support for it made mandatory.
WZ_ASSERT_STATIC_STRING (gcc only) to assert that a string is static added.
The sstr functions now support pointer-length strings again.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4908 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 11:43:28 +00:00
Giel van Schijndel 31fda8026b Don't call function pointers when they're NULL (fixes a segfault bug that occurs when a resource type without release function couldn't be loaded)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4896 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-03 10:24:36 +00:00
Giel van Schijndel 46805bb32f Fix bug #11480:
* Don't call PHYSFS_close if our PHYSFS_file* pointer is NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4895 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-03 10:17:06 +00:00
Giel van Schijndel 510b633251 * Utilise ARRAY_SIZE to determine the amount of elements in a statically sized array
* Use sizeof(*ptr) instead of sizeof(type) in malloc & memset calls


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4892 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 21:19:15 +00:00
Giel van Schijndel 03bc81c0fb #include "frame.h" in strlfuncs.h; to hopefully fix bug #11609
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4889 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 20:59:35 +00:00
Giel van Schijndel 5154d575da Assert that the pointers to strlcpy & strlcat are not NULL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4878 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 12:38:44 +00:00
Giel van Schijndel b9857f9bf9 Detect whether the OS already supplies strlcpy and strlcat and don't define our own if it does:
* Add m4 macros AC_STRLCPY_CHECK and AC_STRLCAT_CHECK for use in the autoconf script
 * Don't define our implementation when HAVE_STRLCPY or HAVE_STRLCAT is defined

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4876 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 12:04:20 +00:00
Per Inge Mathisen 5034cedfd4 Rename astrlcpy and astrlcat to sstrcpy and sstrcat. Add ssprintf and sstrcmp also.
Renaming due to name conflict with a gnu extension. Added debug versions of all the
above, that assert if a char* pointer is passed in. This means they cannot be used
with strings shorter than the shortest expected length of void*.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4865 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-30 17:26:38 +00:00
Giel van Schijndel 4e60f65e8f Don't #include "script_parser.tab.h" in lib/script/stack.c as we don't depend on the parser's token definitions there
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4856 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-29 15:18:42 +00:00
Roman C c3ace2ec9f Redefine __STDC__ to 1, this fixes MSVC compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4855 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-29 15:05:08 +00:00
Giel van Schijndel b047f2c1ef Work around MSVC not #defining __STDC__ (all ISO C89 compliant compiles _should_ #define that macro)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4854 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-29 14:32:14 +00:00
Giel van Schijndel bfb035d41a Merge r4804 from the 2.1 branch into trunk (except for the removal of the SQLite stuff from the XCode projectfile)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4849 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 21:41:12 +00:00
Giel van Schijndel fbf8efefde Only truncate the programPath if it's followed by an EOL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4847 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 21:16:51 +00:00
Giel van Schijndel 0555874c44 Pass programCommand to dbgDumpInit() so that it can use that to set up debug dump info
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4844 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 20:45:28 +00:00
Giel van Schijndel 30e790a7b8 Add a Doxygen comment to function iV_GetTexture
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4838 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 16:51:03 +00:00
Freddie Witherden 5d8b2c688a Add a new method for adding points together to geom.[ch]; update Doxygen documentation for geom.h; remove bounds from struct _widget, replacing it with an offset; add a method to compute the absolute offset.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4817 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 15:14:42 +00:00
Giel van Schijndel ab2bafd7a4 Merge r4271 from deprecated 2.1 branch into trunk:
* Make log output use LOG_SCRIPT instead of LOG_NEVER and LOG_WARNING
 * Some random cleanups


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4788 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 15:21:23 +00:00
Giel van Schijndel 61c8bbc4b9 * Don't "Guarantee nul-termination" after snprintf as snprintf does that itself already (per the C99 spec)
* Use strlcpy for copying strings instead of snprintf "%s"
 * Don't cast the return value from vsnprintf to (void)
 * When we use va_start make sure to use va_end as well...
 * Fix indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4785 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 14:21:41 +00:00
Freddie Witherden d5e651127e Add a trailing \n to the files in betawidget/ (which got trimmed for some reason)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4780 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 13:22:48 +00:00
Per Inge Mathisen 914cf90fb4 Add macros astrlcpy and astrlcat that work like strlcpy and strlcat
but with automatic length detection for fixed size arrays.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4777 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 12:08:30 +00:00
Freddie Witherden 3914e26f1b Fix a bug in widgetBlurImpl which could cause a segfault.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4774 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 11:23:55 +00:00
Freddie Witherden 471e68f998 Fix a typo/spelling error in widget.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4773 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 10:52:41 +00:00
Freddie Witherden b22e2c8aae Update the betawidget library; add Doxygen docblocks for the methods in widget.h; make the event handler callbacks accept void *userData.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4772 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-25 23:20:16 +00:00
Per Inge Mathisen 9de00487a8 Merge in mostly cosmetic pieces of patch #969: Rewritten minimap code
to minimize the size of the patch.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4767 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-24 20:32:24 +00:00
Freddie Witherden f8eb466d16 Commit an early non-functional prototype of the new widget code. Feel free to modify as you see fit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4761 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-24 18:07:47 +00:00
Per Inge Mathisen cefef3651c Add doxygen markup to projectile code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4759 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-24 17:23:11 +00:00
Per Inge Mathisen 5533cf265a Add more doxygen markup, especially for widget code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4758 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-24 17:06:25 +00:00
Giel van Schijndel 12d2e20f47 Use the correct function prototype
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4739 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-21 23:33:59 +00:00
Per Inge Mathisen e853c606f8 A little bit of indentation cleanup so that the code can be read.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4733 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-21 17:12:56 +00:00
Per Inge Mathisen 650447d833 Fix crash when trying to delete text coming from a clipboard paste.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-21 17:11:48 +00:00
Per Inge Mathisen 81c88dbf38 Purely cosmetic cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4731 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-21 17:02:46 +00:00
Dennis Schridde 4c10f714c5 Use std::endl instead of EOL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4713 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:56:35 +00:00
Dennis Schridde 655fd8e6e3 windows.h is not needed after frame.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4712 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:56:28 +00:00
Giel van Schijndel 7f847d9b08 Fix yet some more "function declaration isn’t a prototype" warnings (for the wiggle extensions)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4709 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:15:01 +00:00
Giel van Schijndel 8d2524be31 Const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4708 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:10:19 +00:00
Giel van Schijndel 4a17aeeec7 * Delete unused and empty function StartTacticalScroll()
* Mark the parameters for several functions as WZ_DECL_UNUSED (for those functions that require the parameter as part of their interface)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 17:17:50 +00:00
Giel van Schijndel 73fcb5eb6a Enable NLS for our parsers when it's enabled for us (using --enable-nls)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4700 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 16:38:27 +00:00
Giel van Schijndel 648a2b933b Update GLee.diff for r4693
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4697 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 16:09:09 +00:00
Giel van Schijndel 1252538097 * Make pIdent for VAR_SYMBOL and FUNC_SYMBOL const so that we're const correct with the function tables in scripttabs.c
* Replace "nstr = malloc(strlen(str) + 1); strcpy(nstr, str);" by using "nstr = strdup(str);" instead
 * Remove a non-sensical self-assignment ("pIdent = pIdent;")
 * In scriptAddVariable:
  * "Overallocate" for the new VAR_SYMBOL so that we can store the identifier in that single chunk of memory
   * This allows deallocating the entire structure with a single free() call (which prevents problems with the constness change to VAR_SYMBOL mentioned above)
  * Don't take ownership of the memory pointed to by psVarIdent->pIdent, just copy its contents instead
  * Make FREE_VARIDENTDECL a function instead: freeVARIDENTDECL
   * In this function also free psDcl->pIdent


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4696 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 15:18:28 +00:00
Giel van Schijndel 10eac267e3 Remove unused global variable psLocalVarsTemp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4694 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 15:04:24 +00:00
Per Inge Mathisen 5d3700bb1c Fix GLee warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4693 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 15:02:54 +00:00
Giel van Schijndel e8ff8255a9 Some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4692 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 15:01:52 +00:00
Giel van Schijndel 457c7005f3 * Remove global variable psLocalVars which was __always__ NULL
* Remove unused function scriptClearLocalVariables() (which was effectively a NOP due to psLocalVars being NULL)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 14:56:49 +00:00
Giel van Schijndel f494f40dde Remove global var psFunctions which is __always__ NULL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4690 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 14:18:06 +00:00
Giel van Schijndel 1fae16dedc * Revert r4688 for GLee.h (use some GCC pragmas to ignore warnings in the GLee header)
* Actually *fix* the "function declaration isn’t a prototype" warnings


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4689 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 13:32:18 +00:00
Giel van Schijndel 055903cca2 Use some GCC pragmas to ignore warnings in the GLee header and source file (so that we can compile cleanly, even with -Werror)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 13:01:10 +00:00
Giel van Schijndel 0859814e16 Replace our custom OpenGL extension checking mechanism by GLee:
* import the code from GLee into our repository (a single source and header file), and replace all use of the check_extension function by use of GLee functions
 * Remove function stencil_one_pass and replace all calls to it with `if (GLEE_EXT_stencil_two_side && GLEE_EXT_stencil_wrap)`

Patch from ticket 8 by Buginator (with some minor additions by me)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 12:52:19 +00:00
Per Inge Mathisen f0226edf93 Add new debug level for messages and new log calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4685 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-19 21:41:18 +00:00
Per Inge Mathisen 28669696a4 Clean up debug log. We now print the function name first automatically - no need to
put that into the debug call. Rename some categories to make them line up correctly in log.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4684 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-19 14:52:35 +00:00
Per Inge Mathisen 69a4b6a380 Fix bug #11520: crash when saving the game in campaign mission alpha 4, reported
by Jan Dittberner. If a tagfile group had only default values, it would consume
the group end tag and the rest of the file would be read corrupt.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4681 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-18 20:43:07 +00:00
Per Inge Mathisen f106d10772 Do not leak VRAM when displaying map previews. Patch by Buginator with changes by me.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4679 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-18 18:04:55 +00:00
Giel van Schijndel 1585b7d55a Add a workaround for the X11 headers #defining Status (i.e. #undef it), to prevent problems
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4672 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 20:55:46 +00:00
Roman C 4c5d34f22b Scripting engine:
Allow global variable declarations to be mixed with trigger and event/function declaration. This allows us to #include script files which variable/event declaration.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4667 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:59:43 +00:00
Roman C 2734594eef Don't abuse interpCheckEquiv() since most type checking is done during compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4659 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 19:14:58 +00:00
Giel van Schijndel 5de54b2936 Lets not depend on the preprocessor's ability to concatenate strings as MSVC doesn't seem to be that good at it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4636 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:52:16 +00:00
Giel van Schijndel 8c9e8193aa #define PACKAGE_DISTRIBUTOR to "UNKNOWN" if it isn't defined at the compiler commandline
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4635 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:45:35 +00:00
Giel van Schijndel 983e48834c Use GetModuleFileNameA instead of GetModuleFileName to make sure we can build properly, even on Unicode builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4633 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:25:20 +00:00
Giel van Schijndel 36766ec8ce Use a more unified system for the "default" info in exception reports (i.e. the same code for the Windows & GDB on GNU/Linux handlers)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4623 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 23:17:51 +00:00
Giel van Schijndel c6a0ad011e restrict is not a keyword to C++, so don't use it when compiling as C++
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4615 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 21:39:14 +00:00
Roman C 89fc6d5edd Allow a script to have more than strings at a time.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4614 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 20:12:27 +00:00
Giel van Schijndel ff663196a3 * Forward declare debug_callback_win32debug when compiling for Windows
* Don't define windowsExceptionHandler when compiling with MinGW (as we don't use it on MinGW)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4587 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:54:58 +00:00
Giel van Schijndel 85d51e6a32 Rather than pretending that our UserMusicPath isn't hardcoded, lets just admit it and make it a `static const char`
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4576 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 21:31:29 +00:00
Roman C daf4a00039 Get rid of some unnecessary MSVC warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4574 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 15:17:47 +00:00
Per Inge Mathisen 9da6c7eb96 Netplay bugfixes from Buginator, with changes by me.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4560 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-11 18:35:53 +00:00
Roman C 78f4b01231 Implemented 'Ready' button for the lobby. The game starts when all players have clicked on it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4555 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-09 20:05:09 +00:00
Per Inge Mathisen f64e3a8033 Fix bug in tagfile where we would not skip boolean values properly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4542 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 20:01:56 +00:00
Per Inge Mathisen b1000ce106 Map preview patch by Buginator in patch #1040
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4541 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 19:07:43 +00:00
Roman C 674db841fa Fix a bug in whosResponsible() which caused execution of AI scripts on a client instead of the host in some cases.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4540 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 17:31:57 +00:00
Roman C ab1629285b Fix MSVC compilation. Patch by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4533 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-06 16:07:36 +00:00
Per Inge Mathisen 0edf5f08e5 Fix erronous handling of skipped group separators in the tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4527 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-06 13:14:12 +00:00
Per Inge Mathisen 8dca456c24 Fix bug in tagfile code. We would not properly skip groups that we did not intend to read.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4526 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-06 12:13:41 +00:00
Ari Johnson 685948940e Fixed cursors16.c to work again
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4525 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-06 03:20:27 +00:00
Giel van Schijndel 624f992e62 In the Dr. MinGW exceptionhandler additionally dump:
* The version as returned by version_getFormattedVersionString()
 * Compiler name and version
 * Pointer size
 * Last two log lines (with `dumpLog`)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4516 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 23:54:12 +00:00
Giel van Schijndel 9c90950e4a Add exceptionhandler to the MSVC project for r4484
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4514 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 23:44:15 +00:00
Giel van Schijndel 678edfead2 Provide an alternative `dumpLog` implementation:
* one that works with the POSIX write() syscall on an integer file descriptor
 * and one that works with WinAPI's WriteFile() function on a HANDLE

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4513 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 23:37:46 +00:00
Freddie Witherden 6459f52cf2 Rename PIELIGHT.argb to PIELIGHT.rgba so that it reflects its actual format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4509 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 22:33:22 +00:00
Giel van Schijndel 5bcc0ed6df Keep track of the previous exceptionhandler and call it when we're finished in our own
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4508 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 22:14:16 +00:00
Giel van Schijndel 85c2a8a3cf Remove whitespace from the end of lines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4506 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 22:06:04 +00:00
Giel van Schijndel 0ae93346f0 Only set up Dr. MinGW as exceptionhandler when compiling with MinGW (the BFD lib is a huge pain to compile with MSVC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4503 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 21:10:36 +00:00
Per Inge Mathisen 566e050cf3 Remove useless and wrong comment.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4498 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 19:30:05 +00:00
Giel van Schijndel 80917fb4a9 Allow compiling without warnings if HAVE_BFD isn't defined
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4493 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:24:45 +00:00
Per Inge Mathisen 3dafc4e62a Fix some warnings generated by -Wextra
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4492 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:22:05 +00:00
Giel van Schijndel 3c516a43f4 the exceptionhandler requires $(SDL_CFLAGS) (because it #includes frame.h which depends on that)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4491 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:18:37 +00:00
Giel van Schijndel fdcadfcc8f Compile & link in Dr. MinGW's exceptionhandler
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4490 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:15:14 +00:00
Giel van Schijndel 53507faee0 Add the exceptionhandler from Dr. MinGW (part of mingw-utils) with my fixes to it (doesn't compile & link in yet)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4489 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:00:58 +00:00
Per Inge Mathisen 274ae7c9a4 Enforce strict function prototypes for autoconf builds, and fix function prototype problems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:34:55 +00:00
Giel van Schijndel 665e57dc12 Move the exceptionhandler to a directory of its own
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:11:43 +00:00
Per Inge Mathisen b41b7358b7 Add safer, proven versions of strlcpy and strlcat from OpenBSD.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4483 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 11:45:29 +00:00
Roman C 0ee1e1b965 Fixed warnings on MSVC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4469 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-02 17:39:42 +00:00
Roman C 4f0e59e488 Remove ENABLE_NLS, since it breaks compilation on MSVC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4467 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-01 20:00:47 +00:00
Dennis Schridde b2d8cd5187 ENABLE_NLS for MSVC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4464 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-01 17:14:17 +00:00
Roman C 49903f9593 Get rid of unnecessary warnings when compiling release build using MSVC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4462 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-01 15:56:39 +00:00
Freddie Witherden 59f951b0bc Update the arrayMin[F] functions so that they now return the min value and set the index. Also add arrayMax[F] versions.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4461 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-01 11:26:53 +00:00
Freddie Witherden 4e0c1dbafd arrayMinIndex: now in float form\!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4460 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 23:16:01 +00:00
Freddie Witherden 0587cf8674 A the helper arrayMinIndex, which will return the lowest item in an array of ints.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 22:58:34 +00:00
Roman C 35233a1f9b Added a sound for beacons (based on ecmtower.ogg). Use f12 to make wz take you to the beacon location.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4450 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 18:25:58 +00:00
Giel van Schijndel e89a224b32 Add in support for coloured mouse cursors:
* Add a new configuration option "ColouredCursor", which if enabled will enable coloured cursors ingame
 * Add a new API for setting cursors with: pie_SetMouse (previously frameSetCursor was used)

Patch #956 by Buginator; pie_.*Mouse API done by me (except for the iV_DrawImage invocation)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4434 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 15:44:50 +00:00
Per Inge Mathisen 3ee8a3ed7f Add beginnings of a game self-test. Start with --selftest command line option.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4433 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 14:36:11 +00:00
Giel van Schijndel 9002fb5953 * Rename frameSetCursorFromRes to frameSetCursor
* Make frameSetCursor take a CURSOR (an enum) parameter instead of SWORD


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4432 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 14:11:33 +00:00
Giel van Schijndel 39b6c60501 * Change and clean up the cursors API
* Get rid of resource.h which duplicated code and as such was a maintenance hell/burden


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 13:23:11 +00:00
Giel van Schijndel c7b40d8566 Revert r4416
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:46:37 +00:00
Giel van Schijndel ad68743327 Temporarily disable -Wmissing-declarations for lib/framework
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4416 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:33:05 +00:00
Per Inge Mathisen be566a7d6d Add -Wcast-align and -Wmissing-declarations to autoconf debug builds, and fix warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:28:44 +00:00
Giel van Schijndel 359efe39ac Const fix
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:09:32 +00:00
Giel van Schijndel db7f049617 Const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4401 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 22:21:37 +00:00
Per Inge Mathisen b58826bce4 Fix assert in widget code by simply increasing maximum major tabs that can be shown.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 18:41:53 +00:00
Dennis Schridde e28cf1ce77 Using the kludge for GNU Flex < 2.5.30 was slightly incorrect. Correct way is present in 2.5.9 already.
Additionaly use the kludge found on http://flex.sourceforge.net/manual/faq_002dmemory_002dleak.html


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4384 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 11:05:19 +00:00
Dennis Schridde f888cc5b69 Revert 4344-4347, 4355, 4357, 4358, 4362: They caused too much slowdown in the scripting engine
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4379 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 18:38:25 +00:00
Dennis Schridde 89d1ea6a3d Old versions of GNU Flex (i.e. 2.5.4) dont provide yylex_destroy
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4376 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 17:09:16 +00:00
Dennis Schridde e6e09ee72a Differ between deep (i.e. incl strings) and non-deep (just the pointer) copies
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4362 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 21:43:39 +00:00
Dennis Schridde ffc7a71601 Make MSVC happy
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4359 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 16:42:16 +00:00
Dennis Schridde 496e781146 Dont allocate the string again during direct copy
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4358 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 15:37:16 +00:00
Dennis Schridde 9bffb40f82 stackPop can utilise stackReduce
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4357 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 15:01:15 +00:00
Dennis Schridde 3eecd4fd7b Move interp*2string to script*2string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4356 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 14:57:35 +00:00
Dennis Schridde 10670360cd Cleaned stackPush and stackShutdown, stackRemoveTop can remove more than 1 item now.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4355 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 13:52:31 +00:00
Dennis Schridde 44d2b96472 Removed unused (commented out) chunk of stack manipulation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4354 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 13:27:19 +00:00
Dennis Schridde 65b9f9b204 r4351: Port memleak fixes from 2.1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4353 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 12:49:51 +00:00
Dennis Schridde ee286efa0f Fix lexer memleaks
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4348 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 11:28:25 +00:00
Dennis Schridde 9019233d1a Properly copy string->string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 10:26:15 +00:00
Dennis Schridde 6fdc8dd8b1 Dont store values and types seperately.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4346 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 02:35:26 +00:00
Dennis Schridde 53e30f187e Remove debugging junk
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4345 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 01:58:40 +00:00
Dennis Schridde cb2e3c3201 New interpreter functions for initialisation, cleanup and copy (incl. conversion, will be used later). Shall replace special string handling.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4344 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 01:54:27 +00:00
Dennis Schridde b9f91361fc Minor cleanup of script parser
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4343 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 01:06:00 +00:00
Dennis Schridde 02ae258b75 Was printing the wrong opcode for binary/unary operators
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4341 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 00:48:41 +00:00
Dennis Schridde 480314fed0 Enhance copeprint capabilities and add more 2string functions for the scripting engine.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4340 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 00:45:03 +00:00
Dennis Schridde ce8e1d1846 - Generic cleanup
- Strings are not equivalent to anything, only convertible (mistake in one of my last commits)
- Clarify names
- Print user types


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4339 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-26 00:27:56 +00:00
Dennis Schridde c7a9f0f166 Give the bool2string function back...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4337 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 23:54:28 +00:00
Per Inge Mathisen eaa506a47f Do not re-enable texturing if it is already enabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4332 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 19:23:26 +00:00
Dennis Schridde dddbb92429 Move bool2string() conversion function from tagfile.c to frame.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4331 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 14:41:04 +00:00
Dennis Schridde 5412840e85 Print another binary operator: concatenation.
You still should not call traceOn() from a script or enable interpTrace in the code...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4328 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 22:53:09 +00:00
Dennis Schridde 13c531f6cb Print float values, too. (script debug)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4326 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 22:22:56 +00:00
Dennis Schridde 679bfea007 Cleanup stackPopParams and make it handle the different INTERP_VAL types correctly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 22:09:31 +00:00
Dennis Schridde e402233597 Add type to string function (i.e. to be used for error messages). Allow bool, int, float to be converted into strings in interpCheckEquiv().
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4323 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 20:57:07 +00:00
Per Inge Mathisen 3dd337b73f Fix variable that might be read unset. Reported by Valgrind.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4318 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 19:24:07 +00:00
Dennis Schridde 927c82aed0 C89 requires NULL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4315 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 17:19:47 +00:00
Dennis Schridde 1c4901ce29 GCC says: "suggest parentheses around assignment used as truth value"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4313 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:58:26 +00:00
Dennis Schridde 10f2ccfd56 TRUE->true, FALSE->false (except in scripts)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4311 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:51:17 +00:00
Dennis Schridde 9b94b011bb Better definition of a NULL pointer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4310 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:44:59 +00:00
Per Inge Mathisen 775637ef95 Fix some -Wextra warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4307 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:02:11 +00:00
Giel van Schijndel ad67fb8533 Revert the disabling of the exceptionhandler in r4304
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4305 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 15:41:34 +00:00
Giel van Schijndel dcc1536f58 Backport r4221 from the 2.1 branch to trunk:
* Fix warning regarding array bounds


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4304 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 15:40:13 +00:00
Giel van Schijndel ed37f5a2d0 Add some header guards to scrap.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4288 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 00:59:05 +00:00
Giel van Schijndel 918be1e737 Get rid of the widget heap initialisation stuff
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4287 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 00:32:00 +00:00
Roman C a1008c093d Reduce amount of junk in the MSVC compilation output by about 70%.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4279 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 22:15:28 +00:00
Dennis Schridde 1e26e33fc4 Make it look *exactly* how it looked before my commit... Maybe that finally fixes MSVC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4274 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 20:16:13 +00:00
Roman C 399e92a1ed Make sure chat messages won't be overlooked during mp games by making chat messages stand out from system messages.
If enemy/foe radar colors are on (SHIFT+TAB) then all ally messages are yellow, enemy messages are red. If enemy/foe mode is off all chat messages are simply brighter than system messages.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4272 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 20:04:37 +00:00
Dennis Schridde 5beaf745bf Fix missing identifier LC_MESSAGES for MSVC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4269 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 19:29:41 +00:00
Dennis Schridde f8b62a6e77 Simplify i18n handling by moving all system dependend stuff into lowlevel functions.
Support changing the language via the menu on Windows.
Don't save the language name to the config file. Use the ISO639 style identifier instead.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4268 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 19:22:09 +00:00
Giel van Schijndel 150f0ed209 #include fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4266 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 19:08:49 +00:00
Giel van Schijndel b19b0bcda6 widgbase.h depends on textdraw.h so #include it...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4263 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 18:33:59 +00:00
Giel van Schijndel ae4faeac64 * Remove an unnecessary #include directive from `clparse.c`
* widgbase.h depends on piedef.h so #include it


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4262 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 18:30:41 +00:00
Giel van Schijndel d4adf8fe42 Use enum `iV_fonts` instead of `int` to represent fonts in the widget code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4261 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 18:12:23 +00:00
Giel van Schijndel 8d15dc2ba1 * Log a warning when we've just decoded an empty OggVorbis track
* On DEBUG builds free() the memory associated with that track and return NULL (which __will__ cause program termination if it occurs)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4254 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 16:14:28 +00:00
Giel van Schijndel 535e12a5ef When failing to load a resource (WRF), generate a debug message about what file failed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4252 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 15:55:36 +00:00
Dennis Schridde 87f3224fa6 The preprocessor checks never really worked...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4249 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 15:16:29 +00:00
Per Inge Mathisen f698bf5fa7 Set LANG environment variable when changing languages. Attempt to fix
the i18n menu option for Windows users.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4246 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 14:18:23 +00:00
Giel van Schijndel 7785437073 return the success/failure status from the NETenum template
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 14:00:30 +00:00
Giel van Schijndel cf6ea01b4a * In NETstring use memcpy to copy the string and guarantee NUL-termination manually
* strlcpy() is unsafe if we cannot trust the source string to be NUL-terminated (as strlcpy does "return strlen(src);")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4242 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:50:54 +00:00
Giel van Schijndel 6cd8e03773 Document NETstring (Doxygen documentation) and use strlcpy instead of memcpy to guarantee NUL-termination
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:48:25 +00:00
Giel van Schijndel fbf0395b7e Also test NETenum in the nettypes unit test
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:35:01 +00:00
Giel van Schijndel f26ccb421d Wrap function-macro NETenum in a do{}while(0) loop
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:33:27 +00:00
Giel van Schijndel 6aa9b6fa35 * Declare static string constants as `static const char string[]` rather than `char* string` (guarantees both constness and that we won't accidentily change the pointer)
* In NETcoder declare string str the same size as original (using sizeof), use sizeof() instead of magic numbers


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:12:58 +00:00
Dennis Schridde 2ba55d14a8 Record the time of compilation, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 00:05:41 +00:00
Dennis Schridde 6e89ffe22b Forgot to include physfs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 19:11:29 +00:00
Per Inge Mathisen 6185741b66 patch #1018: Experimental language selection menu option.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4230 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 18:30:08 +00:00
Roman C 3b1c952de1 Speed up script execution when "--debug script" is not enabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 17:42:07 +00:00
Roman C 8478728699 Get rid of an unnecessary debug() call.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4225 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 17:23:28 +00:00
Giel van Schijndel 57389641e7 Remove the last content of deliverance.h (#define MAX_STR_LENGTH 256) to wzglobal.h and remove it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4219 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 23:02:22 +00:00
Giel van Schijndel 8138e1b0d8 Turn some file-level comments in lib/widgets into Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4209 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:36:39 +00:00
Per Inge Mathisen a622880946 Increase warning level and do cosmetic cleanup and remove dead code in events.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4208 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 16:52:10 +00:00
Dennis Schridde 9ca4445189 We always only have either config.h or config-macosx.h, but not both.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4207 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 16:38:57 +00:00
Giel van Schijndel 8421b9fee4 Turn some file-level comments in lib/widgets into Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4206 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 15:40:23 +00:00
Giel van Schijndel de2b3ba61d Move psRetWidget into the W_SCREEN structure (instead of it being a global variable)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4205 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 15:40:09 +00:00
Dennis Schridde b1b2859ea3 New enum TEXPAGE_TYPE, to better control disabling/enabling of texturing. (Changed pie_SetTexturePage accordingly.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4202 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:34:30 +00:00
Giel van Schijndel 9895df559d Make widgCreateScreen return the screen it created or NULL on failure
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4200 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:42 +00:00
Giel van Schijndel 3ed3acd891 Clean up formCreate and widgAddForm:
* Make formCreate and widgAddForm take their psInit parameters as const
 * Make formCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4199 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:36 +00:00
Giel van Schijndel 86ca2b5f06 Clean up editBoxCreate and widgAddEditBox:
* Make editBoxCreate and widgAddEditBox take their psInit parameters as const
 * Make editBoxCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4198 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:30 +00:00
Giel van Schijndel 6ea7968f46 Clean up labelCreate and widgAddLabel:
* Make labelCreate and widgAddLabel take their psInit parameters as const
 * Make labelCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4197 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:20 +00:00
Giel van Schijndel 7e6e7d8b1f Clean up buttonCreate and widgAddButton:
* Make buttonCreate and widgAddButton take their psInit parameters as const
 * Make buttonCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4196 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:15 +00:00
Giel van Schijndel a4987cfefb Clean up barGraphCreate and widgAddBarGraph:
* Make barGraphCreate and widgAddBarGraph take their psInit parameters as const
 * Make barGraphCreate return the bar it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4195 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:05 +00:00
Giel van Schijndel cd8365fb01 Cleanup of widgRunScreen
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4194 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:21:53 +00:00
Giel van Schijndel 20448076bf Revert part of r4184:
* Don't use abort() as it'll be triggered in non-debug builds as well, so stick with the ASSERT(FALSE, ...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4192 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 13:23:35 +00:00
Giel van Schijndel d5e31eb751 Make sliderCreate return a pointer to its created slider and NULL on failure
Const correctness:
 * make sliderCreate and widgAddSlider take its psInit pointers as const


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4185 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:23 +00:00
Giel van Schijndel dd02289a5e Clean up sliderCreate and widgAddSlider
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4184 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:19 +00:00
Per Inge Mathisen fe2ff84ed3 Fix bug #11216: When a tooltip is shown, the sky vanishes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4164 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 14:59:33 +00:00
Roman C 3e615ea55f Add a missing definition of a flex symbol.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4159 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 01:09:52 +00:00
Roman C cfea441525 Aivolution AI:
-AI became more talkative
-more phrases can be recognized and used as commands
-cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-19 21:02:03 +00:00
Dennis Schridde 0c5ecc0efb Fix bug #11277: Strings containing non-ascii characters missing
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-17 07:23:48 +00:00
Christian Ohm 3dbd10b277 Add newlines to two files to shut up gcc.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4109 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 14:23:44 +00:00
Dennis Schridde 81f54bdbfd We should add those files we #include...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4108 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:56:45 +00:00
Dennis Schridde 2537bfc61c Cleanup #includes a bit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:39:08 +00:00
Per Inge Mathisen 1b9ef4f995 Remove hardcoded map visibility size from the ivis_opengl code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 11:05:08 +00:00
Dennis Schridde a3d8cdbdb2 New include order in frame.h. This should fix msvc problems hopefully.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 03:10:05 +00:00
Dennis Schridde 9e38b3c9f0 Port r4093 and r4094 from 2.1: Cleanup frame.c headers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 02:46:03 +00:00
Giel van Schijndel cc0c897d47 Add i18n.[ch] to the raw makefile system and the Code::Blocks projectfile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 00:20:35 +00:00
Dennis Schridde a80115b63e Port r4075: Fix "array subscribt is above array bounds"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:58:04 +00:00
Dennis Schridde fe1a470ca1 Actually add the i18n.[ch] files...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:53:10 +00:00
Dennis Schridde a5643b359c Move i18n stuff into i18n.[ch] and cleanup headers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4068 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:36:50 +00:00
Dennis Schridde 9f5168e9dd Some generic cleanup-style things
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4066 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:05:15 +00:00
Dennis Schridde 74bb1a185b Revert r4061 (accidential commit)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 15:04:27 +00:00
Dennis Schridde 7e93a664b8 Move packaging -> pkg
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:57:35 +00:00
Dennis Schridde e32e928c38 Remove missing ftol() and add some docs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4055 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 11:40:35 +00:00
Dennis Schridde 0316bee001 Remove original backdrops (ugly) and wzlogo 3, 4 and rename the others to backdropX
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 19:31:42 +00:00
Dennis Schridde cb2f0a30df Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
Per Inge Mathisen a71086a039 Prune dead code, and do not bother to dynamically allocate memory to save 12 bytes per polygon.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4037 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:46:29 +00:00
Per Inge Mathisen d5687a6bce Only set the colour for a model once, not once for every vertex. It does not vary.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:10:57 +00:00
Per Inge Mathisen 7693909947 Kill oddball type TERRAIN_VERTEXF (never used for terrain!) and reduce copying some more.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:03:50 +00:00
Per Inge Mathisen 3bcd4f7d1d Kill PIEPOLY and reduce a lot of silly copying of variables back and forth for each polygon.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:44:57 +00:00
Per Inge Mathisen a8f88483ac Fix bug in OpenGL lighting mode which would mess up GUI. Also do not
recalculate the surface normal for every polygon for every frame! It
is already calculated when we load the PIE model, so let's use it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:09:44 +00:00
Per Inge Mathisen 5f31a354f3 Do not enable and disable GL_LIGHTING for every polygon when lighting mode is enabled.
Reorganize the drawing code a bit to make it more obvious how the calls go.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4031 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:52:09 +00:00
Per Inge Mathisen 4b7f572ba4 Simplify pie_Polygon() since we never draw polygons of less than 3 vertices.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4030 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:32:45 +00:00
Per Inge Mathisen f9d2a9152d Remove PIE_ALPHA. Revert most of r4023, since some parts of the drawing code
did not handle alpha blending too well, and blended solids in some cases.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4025 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:07:26 +00:00
Per Inge Mathisen 169e5bcc42 Drastically reduce the number of (spurious) state changes per frame.
Doubles frames per second drawn here.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4024 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 20:14:25 +00:00
Per Inge Mathisen d4e10b07e9 Do not care what blending state we are in when drawing simple and solid
graphics additions like lines and boxes to cut down on state changes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4023 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:56:34 +00:00
Per Inge Mathisen 4004ce9872 Clean up in rendering modes. Remove unuseful pie_SetColourCombine().
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:41:33 +00:00
Per Inge Mathisen 83ddfb7b99 Small cleanup of the screen flip code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:29:24 +00:00
Dennis Schridde 303895e5fb Mark all BASE_OBJECT "derived" types as WZ_DECL_MAY_ALIAS (they may alias with any type).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4011 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:53:45 +00:00
Giel van Schijndel 08e68d9c54 Don't initalise the 'file' pointer with itself
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4004 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:06:00 +00:00
Giel van Schijndel dd0655b915 Make sure that xFullPathname uses SQLITE_OK as its return value for success (and SQLITE_IOERR for failure)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4003 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:05:38 +00:00
Giel van Schijndel c4a62d5139 Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:00:31 +00:00
Giel van Schijndel fa47b4ff72 Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:57:11 +00:00
Giel van Schijndel 9e7ba7bc22 Oops, r3994 still had some of our changes in it (r3992 to be precise), so this __is__ the clean 3.5.4 version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3997 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:55:01 +00:00
Dennis Schridde 65dd2bce19 Update the diff to r3995 to log the base revision inside the file (svn diff -r3994 sqlite3.c > sqlite3.diff)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3996 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 14:46:46 +00:00
Giel van Schijndel 4e9e8e60d6 Revert r3994 (we now have the original 3.5.4 in SVN history, at r3994)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:52:21 +00:00
Giel van Schijndel 64dd1a52c5 Revert to SQLite before all modifications (i.e. this is the amalgamation of 3.5.4)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3994 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:49:58 +00:00
Dennis Schridde f0ab52dbd3 Fix some missing initialisers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3992 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:42:18 +00:00
Dennis Schridde d7bb157c7b Strip -Werror from WZ_CFLAGS for sqlite3, since there are far more warnings...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3991 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:10:35 +00:00
Giel van Schijndel 33216b2e9d Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:50:58 +00:00
Giel van Schijndel 037471b784 Update sqlite3.diff for r3984
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3987 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:15:45 +00:00
Dennis Schridde d8409c9819 - Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
Dennis Schridde 67247633e5 mutexIsNT() is never used -> warning -> error -> I remove it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3984 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 00:59:29 +00:00
Dennis Schridde 9f44219b1c Move addition of CFLAGS from configure.ac to the places they are actually needed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
Giel van Schijndel 0af1927488 Provide two functions (sqlite3_register_physfs_vfs and sqlite3_unregister_physfs_vfs) for registering and unregistering of the PhysicsFS implementation for SQLite's VFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3982 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:42 +00:00
Giel van Schijndel 5bf53cd315 Relicense the PhysicsFS implementation of SQLite's (3.5+) VFS to the zlib license to be fully compatible with PhysicsFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3981 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:35 +00:00
Giel van Schijndel 93f7fc095a Update the sqlite3.diff for r3971
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3972 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:50:43 +00:00
Dennis Schridde 3f67498774 Prevent problem with the definition of DATADIR (wz' configure defines it to a string, what objidl.h does not like, because it uses that name as an identifier).
This also should cut down compilation a bit...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:42:53 +00:00
Per Inge Mathisen 916435094f Add message to MSVC users about disabled warnings. Patch #995 from Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 10:06:05 +00:00
Giel van Schijndel b467d49a2e Fix the MSVC project file for sqlite3; patch by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3958 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 18:24:20 +00:00
Giel van Schijndel 84b03f9468 Allow compiling of sqlite3.c by disabling -Wmissing-field-initializers when compiling in lib/sqlite3/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3954 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 15:26:48 +00:00
Giel van Schijndel 9b71eb9821 Add a partially completed SQLite VFS (requires SQLite 3.5+) implementation for PhysicsFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3951 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 14:23:07 +00:00
Dennis Schridde 3858daf4a1 Reset MSVC version from 9 to 8, since otherwise MSVC8 will refuse to load the project files. (bug #11219)
Does MS provide some kind of templating system? Like autotools generate Makefiles from Makefile.am.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3950 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 11:28:40 +00:00
Dennis Schridde d3455b699a Properly set include/library directories for MSVC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3949 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 01:45:45 +00:00
Dennis Schridde 056147b16d Oh my beauty...
Please don't clutter the detection code with platform specific fixes... That's what the /* ---- Platform specific setup ---- */ section is for...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3948 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 21:51:53 +00:00
Per Inge Mathisen dfad738d65 Fix most MSVC warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3947 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 19:26:19 +00:00
Dennis Schridde 0c79f4b551 Simplify roundf() guards
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3946 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:45:56 +00:00
Per Inge Mathisen d8787a14e9 Allow for non-GNU C99 compilers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3945 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:37:59 +00:00
Per Inge Mathisen 51ca960ed5 Add -Wmissing-field-initializers, fix missing field initializers, and make source
compile even if GCC is not C99 compatible.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3944 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:27:43 +00:00
Dennis Schridde 1c52c14833 Whitespaces
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3940 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 15:15:27 +00:00
Dennis Schridde a8dc02f672 Generic cleanup, often variable initialisation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3939 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 15:09:03 +00:00
Dennis Schridde da462b4511 More float specialisation and generic cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3937 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 12:42:42 +00:00
Dennis Schridde 8fc819377a Move generic math functions from trig.h to math-help.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3935 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 12:17:11 +00:00
Dennis Schridde a3284e7a7d Port r3921 till r3924:
- Move VISIBLE_XTILES from src/ to lib/ivis_common/, so we don't have to hardcore mapview sizes in piedraw.c...
- Make INTERFACE_DEPTH/MAX_Z int, since that's what they are used as.
- Remove unused defines
- Less fog and more shadows


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3926 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 19:30:29 +00:00
Dennis Schridde 73581e05b3 Apply patch #991
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3918 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 18:05:57 +00:00
Dennis Schridde a854a84ae1 Port r3912: Replace GLC_ with _glc to prevent confusion and use GLC_UTF8_QSO as string type.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3914 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-04 15:03:18 +00:00
Dennis Schridde 4e520d46fc Patch #991 by Buginator: Update MSVC .sln for sqlite3
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3902 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-03 11:35:30 +00:00
Giel van Schijndel b9725d9e48 Add the sqlite3 directory to the MSVC project file (patch #991 by Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3901 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-03 08:54:06 +00:00
Giel van Schijndel 5e5426e88b Fix a small typo in 'oinst_LIBRARIES' -> 'noinst_LIBRARIES'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3898 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:45:44 +00:00
Giel van Schijndel 8425a89dbc * Add SQLite 3.5.4 to the source tree (3.5.6 gives some warnings @ compile time which I don't trust)
* Patch it up so that the compiler doesn't generate 'cast to pointer from integer of different size' warnings (as these are harmless, but annoying if -Werror triggers compiler failure)
 * Add this patch as lib/sqlite3/sqlite3.diff (to be able to keep track of it)
 * Add it to the autotools, raw makefiles and Code::Blocks build systems, XCode and MSVC (and any others I'm forgetting here) still need updating


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3897 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:37:25 +00:00
Dennis Schridde 377adc40d6 Another backdrop named "My Pet Turtle" by Cathuria from the "A paltry 30k polys" thread http://forums.wz2100.net/?topic=1361.0
License: CC BY-SA 3.0, as allways.
The border and logo look quite good ingame, so 07-bdrop.png should get that, too.
Also: Use a highres version of 07-bdrop.png, also by Cathuria
Also: Change COPYING.README style a bit


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3884 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 13:18:44 +00:00
This file is free software, distributed under the terms of the GNU 90f0c23fc9 Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !

Update gettext files to versions found in 0.17

Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded

m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
 This file is free software, distributed under the terms of the GNU
 General Public License.  As a special exception to the GNU General
 Public License, this file may be distributed as part of a program
 that contains a configuration script generated by Autoconf, under
 the same distribution terms as the rest of that program.
to:
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.

This removes any GPL licensed files from m4/

po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 13:04:16 +00:00
Dennis Schridde 43fb8fd0d9 Add fixme for bug #11095.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3877 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 01:24:45 +00:00
Dennis Schridde 9b81337df9 Why did QuesoGLC/fontrendering only work on Mac OS X? Because the texture was set conditionaly for it only.
This applies patch #961 correctly and thus closes it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3867 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-25 21:58:35 +00:00
Dennis Schridde 1c979f5fd9 Make lex/yacc rules terminals, since lexer/parser files cannot be autogenerated.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3847 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-20 12:06:26 +00:00
Giel van Schijndel 3e2af0fc87 Don't assert on unused sound IDs as that's a valid condition sound is disabled; fixes bug #10989
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3809 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 22:22:21 +00:00
Giel van Schijndel 23230caf2a * Revert r3804 (replaces usage of strnlen with strnlen with the unsafe strlen)"
* Finish r3795 where I nicely #included the correct files but forgot to replace strnlen with strnlen1 - 1


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3805 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 17:57:43 +00:00
Ari Johnson 66f662e16a Removed usage of GNU extension strnlen()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3804 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 17:48:13 +00:00
Giel van Schijndel f4d10dd461 Reapply r3643 (or revert r3669): Port NETBroadcastPlayerInfo over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3799 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:53:17 +00:00
Per Inge Mathisen f1a62097bf Netcode: Make NetDir static, and remove some unnecessary function parameters.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3798 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:39:23 +00:00
Per Inge Mathisen ce473ed9fe Add some more doxygen comments.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3796 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 13:05:34 +00:00
Giel van Schijndel 33759c07c4 Don't use `strnlen` in debug.c as it's a GNU extension (and as such isn't always available), instead use `strnlen1 - 1`
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3795 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 11:53:25 +00:00
Per Inge Mathisen c614aabe31 Reorganize the packet definitions to avoid duplication and scatter of data.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3787 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 20:55:38 +00:00
Giel van Schijndel 22844d16a6 Undo the (accidental) exceptionhandler disabling of r3784
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3785 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 19:44:40 +00:00
Giel van Schijndel 2322fe0920 Undo my "fix" in r3782, as it wasn't a fix but a breakage
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3784 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-15 19:43:53 +00:00
Per Inge Mathisen b92c8c5a33 Dumpt the last two log message calls into the exception handler report.
This way we get to see the message given by asserts in the dump file.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3781 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-14 22:07:53 +00:00
Per Inge Mathisen 79d13e4d14 Fix typo in exceptionhandler giving noise (at best) in exception output.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3778 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-14 20:50:39 +00:00
Per Inge Mathisen b02de0a9b4 Fix bad asserts added to debug another assert failure...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3775 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 20:31:38 +00:00
Per Inge Mathisen 0fbcf9399b Fix another NetMsg vs duplicate buffer bug. Also assert corect packet type
when decoding them.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3774 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 20:25:12 +00:00
Per Inge Mathisen afb59e5e99 Clean up declaration of NETsetupTCPIP
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3771 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-13 17:22:43 +00:00
Per Inge Mathisen 683d9deb2e Replace check_extension with one that does not anger valgrind.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3766 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:57:20 +00:00
Giel van Schijndel 21927c7e74 Add a hack to allow receiving and processing of MSG_PLAYER_STATS in the right place
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3765 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:56:58 +00:00
Giel van Schijndel 84a36281a5 When retrieving games from the lobby abort on failure to prevent an infinite loop
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3762 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 21:20:25 +00:00
Giel van Schijndel 81fe501660 Bail out when we fail to receive the game count in the lobby code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3759 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:51:24 +00:00
Per Inge Mathisen ffc6d739a1 Improve some net debug log calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3758 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:26:23 +00:00
Per Inge Mathisen 29153d8fe4 Do not use two separate packet globals. Fixes problems with corrupted network data.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3757 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:22:42 +00:00