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
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
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
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
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
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
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
489bdb4dd2
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
2008-05-12 13:10:26 +00:00
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
f0e80e53c4
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
2008-05-12 12:41:54 +00:00
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
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
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
6b0d121d83
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
2008-05-11 22:32:21 +00:00
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
92ceea0131
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
2008-05-11 20:51:41 +00:00
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
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
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
22d10c80aa
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
2008-05-11 15:20:34 +00:00
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
ce1ebb31cb
Remove some dead code, and cosmetic cleanup.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 13:45:37 +00:00
1fc9453cf5
Cosmetic cleanup to order.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5045 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 12:42:42 +00:00
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
85848067f4
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
2008-05-11 11:04:38 +00:00
98993e96a1
Add a gitignore file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5040 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:54:58 +00:00
7d0aae2e0e
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
2008-05-11 10:50:15 +00:00
21fa30ec47
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
2008-05-11 10:46:38 +00:00
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
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
14152fd19c
Add an assert to a scripting function.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:19:04 +00:00
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
8e1ad51337
Improve logging
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5031 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 09:21:47 +00:00
6f507abe43
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
2008-05-10 22:12:51 +00:00
55d0221158
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
2008-05-10 21:28:06 +00:00
73be5e4b4d
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
2008-05-10 21:13:14 +00:00
e360135367
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
2008-05-10 19:35:44 +00:00
53f1a78b21
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
2008-05-10 18:52:07 +00:00
0c07334905
Update scriptvals.h for r5024
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5025 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 18:43:49 +00:00
3fae4ebae3
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
2008-05-10 18:42:59 +00:00
8049b92179
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
2008-05-10 18:31:17 +00:00
3fdc1dc341
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
2008-05-10 17:18:29 +00:00
a5628c83d9
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
2008-05-10 16:54:38 +00:00
6085531f3b
Translations from branches/2.1@5018:
...
- Several new translations from Launchpad + updates to existing ones
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5020 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 15:51:26 +00:00
c6aaecaffb
--- Merging r4974 through r4976 into '.':
...
U data/messages/strings/names.txt
U data/messages/strings/resstrings.txt
U data/messages/strings/cam2strings.txt
U data/messages/strings/cam3strings.txt
U data/mp/messages/strings/names.txt
U data/mp/messages/strings/resstrings.txt
- Remove duplicate names for "Mortar Pit" (there also was " Mortar Pit" before...)
- Duplicate string: "TRANSPORT MISSION: Rescue civilians from Containment Camp" and "TRANSPORT MISSION: Rescue Civilians from Containment Camp "
- Remove more extranous spaces
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5019 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 15:49:26 +00:00
f35270ab17
* Use lexer_input.[ch] instead of our own custom YY_INPUT implementation for level_lexer
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5017 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 15:08:32 +00:00
4b1ecee02b
* Remove the check whether we're in a comment at the end of file from level_lexer and scriptvals_lexer
...
* Don't use yywrap (%option noyywrap)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5016 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 14:43:23 +00:00
77317b4508
Aivolution:
...
-remove unused research
-calculate the most effective AT weapon on the fly
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5015 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 13:24:42 +00:00
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
f5cac3bfc5
Revert r5012, this change was a bit hasty.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5013 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 11:12:15 +00:00
Per Inge Mathisen
Giel van Schijndel
Dennis Schridde
Roman C