Commit Graph

4229 Commits (b16387ada85a7511eb7e60b07547a89435b8802d)

Author SHA1 Message Date
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 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
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
Per Inge Mathisen 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Roman C 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
Per Inge Mathisen 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
Dennis Schridde 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
Dennis Schridde 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
Giel van Schijndel 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
Giel van Schijndel 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
Roman C 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
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
Roman C 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
Roman C 80bfd342dd Balance:
-make all Missile upgrade values increase in step of 30% instead of 10%, to make sure Missiles (Scourge etc) not handicapped

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5012 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 11:05:08 +00:00
Giel van Schijndel 2bce339a72 Make the scriptvals_parser reentrant as well (the lexer was made reentrant already in r5009)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5011 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 00:49:29 +00:00
Giel van Schijndel 9cd6c0cef3 Store the return value in a temporary rather than duplicating code paths inside & outside of an if-branch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5010 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 00:44:22 +00:00
Giel van Schijndel 970d167c4f Make scriptvals_lexer reentrant
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5009 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 00:38:26 +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
Giel van Schijndel 2bc35a5714 Slight clean up of Bison & Flex options
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5007 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 00:02:48 +00:00
Giel van Schijndel ab6b574aaa Use yyextra instead of yyget_extra()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5006 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 23:45:00 +00:00
Giel van Schijndel baa6d4bcfe * Use yyget_extra() & yyset_extra() to pass the input to the level_lexer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5005 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 23:43:44 +00:00
Giel van Schijndel 3ad1b3ad91 * Produce level_lexer.lex.h for access to the lexer's functions from the parser
* Remove unused macro lev_getc


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5004 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 23:26:40 +00:00
Giel van Schijndel c737a75ce3 * Produce scriptvals_lexer.lex.h for access to the lexer's function from the parser
* Use scrv_get_lineno() and scrv_get_text() to retrieve the lexer's data on an error rather than custom function scrvGetErrorData
 * Move scrv_parse() out of the scriptvals.h header file as that function is only called from the file it's defined in


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5003 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 23:03:57 +00:00
Giel van Schijndel 1badf86412 * Use WZ_DECL_FORMAT to tell the compiler that scrv_error takes its parameters in printf syntax
* Fix a truckload of warnings caused due to useing the wrong format specifier when invoking scrv_error/yyerror (%s was used for UDWORD's)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5002 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 22:30:54 +00:00
Giel van Schijndel a4078601ea * Use the yyerror macro as provided by Bison instead of scrv_error (yyerror maps to the latter)
* Perform dynamic stack allocation instead of allocating 1kB in scrv_error


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5001 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 22:24:44 +00:00
Giel van Schijndel b51af0be98 * Use yyextra to pass in the input file for scriptvals_lexer instead of a custom global variable (will make it easier to turn it into a reentrant parser)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5000 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 21:08:32 +00:00
Giel van Schijndel f1846ea88a * Remove unused function PHYSFS_getc() from the scripvals lexer
* Use yytext instead of scrv_text as Flex will take care of the naming
 * Use yyget_lineno() instead of global var scrv_lineno


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 21:08:21 +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
Roman C d052513c74 Balance:
-all emplacements are now marked as "HARD" instead of "MEDIUM"
-hitpoints of all emplacements increased from 400 to 600

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4997 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 20:20:40 +00:00
Giel van Schijndel c5d9664316 * Move the actual clearing of the pathfinding node-table to new function fpathHardTableReset()
* Call this function from fpathTableReset() and new function fpathShutdown()
 * Add a function fpathShutdown() and call it from systemShutdown() in init.c to free up the pathfinding's memory on exit


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4996 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 19:57:51 +00:00
Per Inge Mathisen a98c3f9621 Render super-cyborgs using the bucket list, to avoid jittering HP bars.
Patch by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4994 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 18:24:20 +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 c5187c9406 Import translations from branches/2.1@4990
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4991 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-09 15:40:29 +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
Per Inge Mathisen fba8eca7a0 Remove unused declaration of fpathSetBlockingTile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4972 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 21:00:20 +00:00
Per Inge Mathisen 50886c9389 Ooops. Committed a debug call too many.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 20:25:18 +00:00
Per Inge Mathisen 7e999b7ead Make sure we release paths when we exit a map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4970 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 20:10:31 +00:00
Per Inge Mathisen a65115e162 Add debug calls to try to debug crazy paths when blocked.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4969 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 18:55:06 +00:00
Per Inge Mathisen 4f543a66c8 Revert r2570 and adapt it to current trunk. This provides us with a
thread-safe function to check whether a tile has a tall structure.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4968 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 18:13:27 +00:00
Per Inge Mathisen 4294b5f6c4 Remove non-working path recycling code. Better rewrite this functionality from scratch later.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 17:44:02 +00:00
Per Inge Mathisen 3ac3130e3c Add some debug calls, remove unused code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4966 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-08 17:39:27 +00:00
Per Inge Mathisen 8a00071e05 Fix potential crash bug in path-finding code introduced in r4964.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4965 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-07 21:14:37 +00:00