warzone2100:mainline.git
9 years agotagfile branch: Clean up handling of object sensor information now that this is in... tagfile
Per Inge Mathisen [Sat, 27 Sep 2008 17:42:26 +0000 (17:42 +0000)]
tagfile branch: Clean up handling of object sensor information now that this is in base object.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@6086 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agotagfile branch: Fix virtual group recursion bug, where the wrong end group tag would...
Per Inge Mathisen [Fri, 26 Sep 2008 19:11:09 +0000 (19:11 +0000)]
tagfile branch: Fix virtual group recursion bug, where the wrong end group tag would be gobbled
on exit. Also add test read of armour tag group.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@6083 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agotagfile branch: Merge r6076:6080 from trunk
Per Inge Mathisen [Fri, 26 Sep 2008 17:51:14 +0000 (17:51 +0000)]
tagfile branch: Merge r6076:6080 from trunk

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@6081 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agotagfile branch: Merge in r5134 to r6076 from trunk.
Per Inge Mathisen [Fri, 26 Sep 2008 16:57:30 +0000 (16:57 +0000)]
tagfile branch: Merge in r5134 to r6076 from trunk.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@6077 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agotagfile branch: If there is a tagfile save, load map data from it instead
Per Inge Mathisen [Sun, 18 May 2008 11:45:19 +0000 (11:45 +0000)]
tagfile branch: If there is a tagfile save, load map data from it instead
of from the old format.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@5136 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCreate a branch for conversion to the new tagfile format, based on r5134.
Per Inge Mathisen [Sun, 18 May 2008 11:18:39 +0000 (11:18 +0000)]
Create a branch for conversion to the new tagfile format, based on r5134.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/tagfile@5135 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCommit API only from patch #907: Make texture coordinates into static array.
Per Inge Mathisen [Sat, 17 May 2008 21:48:23 +0000 (21:48 +0000)]
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

9 years agoDownload quesoglc/tags/v0.7.1 for Mac, instead of a nonexistant path.
Dennis Schridde [Sat, 17 May 2008 18:24:42 +0000 (18:24 +0000)]
Download quesoglc/tags/v0.7.1 for Mac, instead of a nonexistant path.
Reported an fixed by Verminus on the forums: http://forums.wz2100.net/?topic=1747.msg16528#msg16528

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5133 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd more error checking in A* code.
Per Inge Mathisen [Sat, 17 May 2008 17:48:32 +0000 (17:48 +0000)]
Add more error checking in A* code.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5132 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoWork around Flex 2.5.33 implicitly defining yyget_extra() (rather than forward declar...
Giel van Schijndel [Sat, 17 May 2008 10:49:33 +0000 (10:49 +0000)]
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

9 years agoDisable optimisations (-O0) for --enable-debug=relaxed as well
Giel van Schijndel [Sat, 17 May 2008 10:48:26 +0000 (10:48 +0000)]
Disable optimisations (-O0) for --enable-debug=relaxed as well

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5129 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoSet proper svn eol-style on a bunch of files that did not have it.
Per Inge Mathisen [Fri, 16 May 2008 17:31:51 +0000 (17:31 +0000)]
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

9 years agoFix bug #11693. Fix submited by verminus@gna.org
Dennis Schridde [Fri, 16 May 2008 14:45:51 +0000 (14:45 +0000)]
Fix bug #11693. Fix submited by verminus@gna.org

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5124 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoDump OpenGL implementation information to console
Dennis Schridde [Thu, 15 May 2008 17:32:39 +0000 (17:32 +0000)]
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

9 years agoSimplification and slight speedup for trigSin/trigCos. Make trigIntSqrt wrap sqrtf...
Dennis Schridde [Thu, 15 May 2008 00:19:47 +0000 (00:19 +0000)]
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

9 years agoCalculate muzzle locations as float-vector, for convenience (and because IMDs store...
Dennis Schridde [Thu, 15 May 2008 00:19:40 +0000 (00:19 +0000)]
Calculate muzzle locations as float-vector, for convenience (and because IMDs store info as float anyway).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5121 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoRemove unneccessary modulo
Dennis Schridde [Wed, 14 May 2008 22:59:00 +0000 (22:59 +0000)]
Remove unneccessary modulo

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5120 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agor5113 was buggy
Dennis Schridde [Wed, 14 May 2008 21:16:05 +0000 (21:16 +0000)]
r5113 was buggy

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5119 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd float variant to pie_RotateTranslate
Dennis Schridde [Wed, 14 May 2008 21:15:59 +0000 (21:15 +0000)]
Add float variant to pie_RotateTranslate

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5118 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoLink to explanation of yaw/pitch/roll
Dennis Schridde [Wed, 14 May 2008 21:15:50 +0000 (21:15 +0000)]
Link to explanation of yaw/pitch/roll

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5117 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFix up what I think are wrong comments. The axes should be different.
Dennis Schridde [Wed, 14 May 2008 20:08:56 +0000 (20:08 +0000)]
Fix up what I think are wrong comments. The axes should be different.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5116 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMistake... I removed CHECK_PROJ_ABOVE_GROUND but forgot one user.
Dennis Schridde [Wed, 14 May 2008 19:04:42 +0000 (19:04 +0000)]
Mistake... I removed CHECK_PROJ_ABOVE_GROUND but forgot one user.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5115 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoWe already have doubles, skip casting
Dennis Schridde [Wed, 14 May 2008 19:04:34 +0000 (19:04 +0000)]
We already have doubles, skip casting

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5114 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMove asserts to front
Dennis Schridde [Wed, 14 May 2008 18:31:30 +0000 (18:31 +0000)]
Move asserts to front

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5113 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMSVC was crying
Dennis Schridde [Wed, 14 May 2008 18:23:20 +0000 (18:23 +0000)]
MSVC was crying

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5112 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoPrefer local variables over ones behind pointers
Dennis Schridde [Wed, 14 May 2008 17:24:59 +0000 (17:24 +0000)]
Prefer local variables over ones behind pointers

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5111 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMove penetration code fragments from SendProjectile to Inflight*Func
Dennis Schridde [Wed, 14 May 2008 17:24:51 +0000 (17:24 +0000)]
Move penetration code fragments from SendProjectile to Inflight*Func

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5110 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoLuxury++: Vector based worldOnMap() variants
Dennis Schridde [Wed, 14 May 2008 17:24:35 +0000 (17:24 +0000)]
Luxury++: Vector based worldOnMap() variants

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5109 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoThis patch adds a --host option (to compliment the --join option) to
Dennis Schridde [Wed, 14 May 2008 11:03:33 +0000 (11:03 +0000)]
This patch adds a --host option (to compliment the --join option) to
the game, so you can launch the game via a external client.

Usage:
--host
  (takes you directly to the host screen)
--join ip/hostname
  (takes you directly to the join screen, you should see the game of the
  ip/hostname that you specified.)  The join patch was already comitted.

Author: Buginator
Date: Tue, 13 May 2008 01:23:54 -0400
Signed-off-by: Dennis Schridde <devurandom@gna.org>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5108 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoSimplify proj_InFlightDirectFunc() and make it more readable.
Dennis Schridde [Tue, 13 May 2008 23:32:23 +0000 (23:32 +0000)]
Simplify proj_InFlightDirectFunc() and make it more readable.

Note: Special hit-handling for homing weapons was removed, since that should already be done by the normal hit-handling.
  (If our target was not among our neighbours, how can we ever be in range to hit it?)

Note: Since this is nearly a rewrite, code-reviews should concentrate on the logic, not on before-after comparison.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5107 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoStep one towards vector based projectiles
Dennis Schridde [Tue, 13 May 2008 23:32:07 +0000 (23:32 +0000)]
Step one towards vector based projectiles

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5106 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMinor documentation fixes:
Dennis Schridde [Tue, 13 May 2008 23:19:20 +0000 (23:19 +0000)]
Minor documentation fixes:

- Comment on WSC_COUNTER
- Indention

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5105 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoclip() function for integers (Like CLIP macro) and some slightly altered comments...
Dennis Schridde [Tue, 13 May 2008 23:19:10 +0000 (23:19 +0000)]
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

9 years agoMore vector functions:
Dennis Schridde [Tue, 13 May 2008 23:18:53 +0000 (23:18 +0000)]
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

9 years ago * Add functions for changing the volume of an already created AUDIO_STREAM: sound_Ge...
Giel van Schijndel [Tue, 13 May 2008 14:01:25 +0000 (14:01 +0000)]
 * 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

9 years ago * Make sure to actually set the volume of an AUDIO_STREAM we're creating
Giel van Schijndel [Tue, 13 May 2008 13:50:08 +0000 (13:50 +0000)]
 * 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

9 years agoRender images as alpha, instead of gouraud. This allows alpha-gradients
Dennis Schridde [Tue, 13 May 2008 12:53:02 +0000 (12:53 +0000)]
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

9 years ago * Put textual tokens as found by audp_lexer.l in heap memory rather than a static...
Giel van Schijndel [Mon, 12 May 2008 20:55:29 +0000 (20:55 +0000)]
 * 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

9 years ago * ONESHOT and LOOP are __not__ value tokens (they're just regular tokens), so don...
Giel van Schijndel [Mon, 12 May 2008 20:51:46 +0000 (20:51 +0000)]
 * 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

9 years ago * Parse quoted text in audp_lexer.l similar to most other parsers/lexers we use...
Giel van Schijndel [Mon, 12 May 2008 20:42:55 +0000 (20:42 +0000)]
 * 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

9 years ago * Use the lexer_input framework instead of a custom YY_INPUT implementation for...
Giel van Schijndel [Mon, 12 May 2008 20:29:13 +0000 (20:29 +0000)]
 * 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

9 years ago * Get rid of never initialised variables g_bParsingSubFile and g_fpOld (the compiler...
Giel van Schijndel [Mon, 12 May 2008 20:09:10 +0000 (20:09 +0000)]
 * 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

9 years agoRename some audp_(.*) stuff to yy$1
Giel van Schijndel [Mon, 12 May 2008 20:06:19 +0000 (20:06 +0000)]
Rename some audp_(.*) stuff to yy$1

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5092 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoRemove our own custom definition of YYLMAX (give Flex the liberty of determining...
Giel van Schijndel [Mon, 12 May 2008 19:55:55 +0000 (19:55 +0000)]
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

9 years agoFix LDADD in tests/Makefile.am so that crosscompiling (or rather crosslinking) with...
Giel van Schijndel [Mon, 12 May 2008 19:52:35 +0000 (19:52 +0000)]
Fix LDADD in tests/Makefile.am so that crosscompiling (or rather crosslinking) with mingw32 is possible

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5090 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFix an error causing us to use the wrong names for yyget_extra(), yyset_extra(),...
Giel van Schijndel [Mon, 12 May 2008 19:40:53 +0000 (19:40 +0000)]
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

9 years agoCall fflush(stdout) after fprintf(stdout, ... in parsetest.c
Giel van Schijndel [Mon, 12 May 2008 19:09:19 +0000 (19:09 +0000)]
Call fflush(stdout) after fprintf(stdout, ... in parsetest.c

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5088 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFix a syntax error introduced in r5086
Giel van Schijndel [Mon, 12 May 2008 18:58:41 +0000 (18:58 +0000)]
Fix a syntax error introduced in r5086

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5087 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCleanup:
Giel van Schijndel [Mon, 12 May 2008 18:56:42 +0000 (18:56 +0000)]
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

9 years ago * Put textual tokens as found by strres_lexer.l in heap memory rather than some...
Giel van Schijndel [Mon, 12 May 2008 18:47:25 +0000 (18:47 +0000)]
 * 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

9 years ago * Use yytext instead of strres_text
Giel van Schijndel [Mon, 12 May 2008 18:35:36 +0000 (18:35 +0000)]
 * 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

9 years ago * Use the lexer_input framework instead of a custom YY_INPUT implementation for...
Giel van Schijndel [Mon, 12 May 2008 18:22:05 +0000 (18:22 +0000)]
 * 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

9 years agoDon't duplicate code that appears in both branches of an if-statement
Giel van Schijndel [Mon, 12 May 2008 18:16:30 +0000 (18:16 +0000)]
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

9 years agoMinor cleanup and add Doxygen comments
Giel van Schijndel [Mon, 12 May 2008 18:09:25 +0000 (18:09 +0000)]
Minor cleanup and add Doxygen comments

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5081 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCleanup (behaviour should be unchanged)
Giel van Schijndel [Mon, 12 May 2008 18:03:26 +0000 (18:03 +0000)]
Cleanup (behaviour should be unchanged)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5080 4a71c877-e1ca-e34f-864e-861f7616d084

9 years ago * Put textual tokens as found by resource_lexer.l in heap memory rather than some...
Giel van Schijndel [Mon, 12 May 2008 18:00:09 +0000 (18:00 +0000)]
 * 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

9 years agoFrom resource_parser.y: "No longer static ... lets use this area globally":
Giel van Schijndel [Mon, 12 May 2008 17:50:49 +0000 (17:50 +0000)]
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

9 years agoMake difficulty work when you start the campaign with the --game parameter.
Per Inge Mathisen [Mon, 12 May 2008 17:50:10 +0000 (17:50 +0000)]
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

9 years agoUse yytext instead of res_text
Giel van Schijndel [Mon, 12 May 2008 17:41:00 +0000 (17:41 +0000)]
Use yytext instead of res_text

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5075 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAttempt to match an empty string __before__ a non-empty one (otherwise we won't ever...
Giel van Schijndel [Mon, 12 May 2008 17:38:45 +0000 (17:38 +0000)]
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

9 years ago * Get rid of lexer function resGetErrorData and use res_get_lineno() and res_get_tex...
Giel van Schijndel [Mon, 12 May 2008 17:34:56 +0000 (17:34 +0000)]
 * 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

9 years ago * Use the lexer_input framework instead of a custom YY_INPUT implementation for...
Giel van Schijndel [Mon, 12 May 2008 17:23:33 +0000 (17:23 +0000)]
 * 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

9 years agoReduce code duplication that occurs in both branches of an if-statement
Giel van Schijndel [Mon, 12 May 2008 17:13:11 +0000 (17:13 +0000)]
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

9 years agoDon't bother to check whether we're in a comment when reaching the end of a WRF file
Giel van Schijndel [Mon, 12 May 2008 17:04:32 +0000 (17:04 +0000)]
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

9 years agoMake sure network mode is turned off before entering campaign mode.
Per Inge Mathisen [Mon, 12 May 2008 13:10:26 +0000 (13:10 +0000)]
Make sure network mode is turned off before entering campaign mode.
Fixes difficulty settings.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5067 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoLet the chat_lexer do some more of the work by returning only a single _T_YES token...
Giel van Schijndel [Mon, 12 May 2008 12:48:31 +0000 (12:48 +0000)]
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

9 years agoUpdate MSVC project file for addition of parsetest code to --selftest in r5060 (I...
Giel van Schijndel [Mon, 12 May 2008 12:41:54 +0000 (12:41 +0000)]
Update MSVC project file for addition of parsetest code to --selftest in r5060 (I accidentily committed that together with the fix to lib/event/event.c)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5062 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCosmetic update of static globals
Per Inge Mathisen [Mon, 12 May 2008 12:39:16 +0000 (12:39 +0000)]
Cosmetic update of static globals

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5061 4a71c877-e1ca-e34f-864e-861f7616d084

9 years ago * Make sure to set psPrev to NULL at the start of the deletion loop
Giel van Schijndel [Mon, 12 May 2008 12:33:38 +0000 (12:33 +0000)]
 * 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

9 years ago * Fix GPL headers for some files which where wrongly marked as being Copyright Eidos...
Giel van Schijndel [Mon, 12 May 2008 12:16:46 +0000 (12:16 +0000)]
 * 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

9 years agoRemove debug log call that shouldn't be there
Per Inge Mathisen [Sun, 11 May 2008 22:32:21 +0000 (22:32 +0000)]
Remove debug log call that shouldn't be there

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5058 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoUpdate changelog in trunk as well
Per Inge Mathisen [Sun, 11 May 2008 22:11:28 +0000 (22:11 +0000)]
Update changelog in trunk as well

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5056 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoForward port various minimal-impact stuff from tagfile load patch to reduce patch...
Per Inge Mathisen [Sun, 11 May 2008 20:51:41 +0000 (20:51 +0000)]
Forward port various minimal-impact stuff from tagfile load patch to reduce patch size.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5053 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMore comments on previous patch, which was by Buginator.
Dennis Schridde [Sun, 11 May 2008 19:53:27 +0000 (19:53 +0000)]
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

9 years agocommandline argument --join <host> to join into a lobby directly from the commandline...
Dennis Schridde [Sun, 11 May 2008 19:09:29 +0000 (19:09 +0000)]
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

9 years agoRevert r5043 because of compilation problems on non-MSVC systems.
Roman C [Sun, 11 May 2008 15:25:43 +0000 (15:25 +0000)]
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

9 years agoAllow VTOL to uncover fog of war and land-move to unseen areas in distance fog mode.
Per Inge Mathisen [Sun, 11 May 2008 15:20:34 +0000 (15:20 +0000)]
Allow VTOL to uncover fog of war and land-move to unseen areas in distance fog mode.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5048 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoobjTrace() no longer requires a debug part parameter, and always outputs the ID
Per Inge Mathisen [Sun, 11 May 2008 14:58:20 +0000 (14:58 +0000)]
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

9 years agoRemove some dead code, and cosmetic cleanup.
Per Inge Mathisen [Sun, 11 May 2008 13:45:37 +0000 (13:45 +0000)]
Remove some dead code, and cosmetic cleanup.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5046 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoCosmetic cleanup to order.c
Per Inge Mathisen [Sun, 11 May 2008 12:42:42 +0000 (12:42 +0000)]
Cosmetic cleanup to order.c

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5045 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoOutput script call stack on ASSERT.
Roman C [Sun, 11 May 2008 11:51:23 +0000 (11:51 +0000)]
Output script call stack on ASSERT.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5043 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd more informative assert to solve bug #11659: crash on first level of
Per Inge Mathisen [Sun, 11 May 2008 11:04:38 +0000 (11:04 +0000)]
Add more informative assert to solve bug #11659: crash on first level of
campaign reported by Paul Wise.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5042 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd a gitignore file
Dennis Schridde [Sun, 11 May 2008 10:54:58 +0000 (10:54 +0000)]
Add a gitignore file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5040 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd more logging, used to find previous bugfix.
Per Inge Mathisen [Sun, 11 May 2008 10:50:15 +0000 (10:50 +0000)]
Add more logging, used to find previous bugfix.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5039 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFix bug #11641: Bad textures after third load of saved game, by making sure
Per Inge Mathisen [Sun, 11 May 2008 10:46:38 +0000 (10:46 +0000)]
Fix bug #11641: Bad textures after third load of saved game, by making sure
we unload all level data when loading savegames.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5037 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMemory leak fix for event.c. Patch by Buginator.
Roman C [Sun, 11 May 2008 10:34:48 +0000 (10:34 +0000)]
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

9 years agoMake it possible for AI to recognize some new words and phrases needed for new commands.
Roman C [Sun, 11 May 2008 10:24:09 +0000 (10:24 +0000)]
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

9 years agoAdd an assert to a scripting function.
Roman C [Sun, 11 May 2008 10:19:04 +0000 (10:19 +0000)]
Add an assert to a scripting function.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5033 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoGet rid of some more compiler warnings on MSVC.
Roman C [Sun, 11 May 2008 10:17:49 +0000 (10:17 +0000)]
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

9 years agoImprove logging
Per Inge Mathisen [Sun, 11 May 2008 09:21:47 +0000 (09:21 +0000)]
Improve logging

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5031 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFlex 2.5.4 (used on Windows) doesn't provide yyget_extra(), yyset_extra(), yyget_text...
Giel van Schijndel [Sat, 10 May 2008 22:12:51 +0000 (22:12 +0000)]
Flex 2.5.4 (used on Windows) doesn't provide yyget_extra(), yyset_extra(), yyget_text() and yyget_lineno(), so work around this with a conditionally compiled section

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5030 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agomake *.lex.h depend on the FLEX rule as well for the raw Makefile system
Giel van Schijndel [Sat, 10 May 2008 21:28:06 +0000 (21:28 +0000)]
make *.lex.h depend on the FLEX rule as well for the raw Makefile system

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5029 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAdd BUILT_SOURCES and CLEANFILES to the raw Makefile system as well (similar to the...
Giel van Schijndel [Sat, 10 May 2008 21:13:14 +0000 (21:13 +0000)]
Add BUILT_SOURCES and CLEANFILES to the raw Makefile system as well (similar to the vars with the same name in automake)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5028 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoDon't use %option bison-brigde in scriptvals_lexer.l as Flex 2.5.4 (used on Windows...
Giel van Schijndel [Sat, 10 May 2008 19:35:44 +0000 (19:35 +0000)]
Don't use %option bison-brigde in scriptvals_lexer.l as Flex 2.5.4 (used on Windows) doesn't support this option

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5027 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoDon't use %option header-file in scriptvals_lexer.l as Flex 2.5.4 (used on Windows...
Giel van Schijndel [Sat, 10 May 2008 18:52:07 +0000 (18:52 +0000)]
Don't use %option header-file in scriptvals_lexer.l as Flex 2.5.4 (used on Windows) doesn't support this option

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5026 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoUpdate scriptvals.h for r5024
Giel van Schijndel [Sat, 10 May 2008 18:43:49 +0000 (18:43 +0000)]
Update scriptvals.h for r5024

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5025 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoMake scriptvals_lexer.l non-reentrant as Flex 2.5.4 (used on Windows) doesn't support...
Giel van Schijndel [Sat, 10 May 2008 18:42:59 +0000 (18:42 +0000)]
Make scriptvals_lexer.l non-reentrant as Flex 2.5.4 (used on Windows) doesn't support %option reentrant

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5024 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoDon't use %option header-file in level_lexer.l as Flex 2.5.4 (used on Windows) doesn...
Giel van Schijndel [Sat, 10 May 2008 18:31:17 +0000 (18:31 +0000)]
Don't use %option header-file in level_lexer.l as Flex 2.5.4 (used on Windows) doesn't support this option

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5023 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoAivolution:
Roman C [Sat, 10 May 2008 17:18:29 +0000 (17:18 +0000)]
Aivolution:
-use super cannon cyborgs
-use thermite flamers cyborgs
-research more flamer upgrades

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5022 4a71c877-e1ca-e34f-864e-861f7616d084

9 years agoFix bug #11669: "[widgGetNumTabMajor] couldn't find tabbed form from id" after comple...
Per Inge Mathisen [Sat, 10 May 2008 16:54:38 +0000 (16:54 +0000)]
Fix bug #11669: "[widgGetNumTabMajor] couldn't find tabbed form from id" after completing any research

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5021 4a71c877-e1ca-e34f-864e-861f7616d084