Author: muggenhor
Date: Mon May 12 16:09:49 2008
New Revision: 5069
URL: http://svn.gna.org/viewcvs/warzone?rev=5069&view=rev
Log:
Merged revisions r4890, r4938:4943, r4945, r4999:5013, r5016:5017, r5023:5030,
r5040, r5045:5046, r5049, r5056 and r5058:5063 into the 2.1 branch via svnmerge
from trunk
Merged revisions
4901,4903,4905,4910,4912,4920,4923,4925,4929,4934,4936-4937,4947-4949,4958-4959,4963,4974-4990,4993,4995,5018,5036,5038,5041,5044,5052,5057
via svnmerge from
........
r4890 | per | 2008-05-02 23:06:39 +0200 (vr, 02 mei 2008) | 2 lines
Add path-finding test and measurement to selftest.
........
r4938 | muggenhor | 2008-05-05 16:01:41 +0200 (ma, 05 mei 2008) | 2 lines
Make tile[SF][XY] const
........
r4939 | muggenhor | 2008-05-05 17:12:32 +0200 (ma, 05 mei 2008) | 1 line
We don't #define HAVE_STRLCPY or HAVE_STRLCAT in the configure script anymore
........
r4940 | per | 2008-05-05 18:23:48 +0200 (ma, 05 mei 2008) | 2 lines
Cosmetic cleanup of raycast.c
........
r4941 | evilguru | 2008-05-05 18:50:59 +0200 (ma, 05 mei 2008) | 1 line
Remove some dead-code associated with a never-used ray clipping method.
........
r4942 | evilguru | 2008-05-05 20:03:08 +0200 (ma, 05 mei 2008) | 1 line
Cleanup of transporter.c (Dead/commented code removal). There should be no
functionality changes.
........
r4943 | muggenhor | 2008-05-06 01:17:35 +0200 (di, 06 mei 2008) | 2 lines
Doxygenize the parameterlist of frameInitialise
........
r4945 | evilguru | 2008-05-06 20:03:35 +0200 (di, 06 mei 2008) | 1 line
Fix a syntax error in r4942 that gcc did not seem to mind about.
........
r4999 | muggenhor | 2008-05-09 23:08:21 +0200 (vr, 09 mei 2008) | 4 lines
* 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
........
r5000 | muggenhor | 2008-05-09 23:08:32 +0200 (vr, 09 mei 2008) | 2 lines
* 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)
........
r5001 | muggenhor | 2008-05-10 00:24:44 +0200 (za, 10 mei 2008) | 3 lines
* 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
........
r5002 | muggenhor | 2008-05-10 00:30:54 +0200 (za, 10 mei 2008) | 3 lines
* 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)
........
r5003 | muggenhor | 2008-05-10 01:03:57 +0200 (za, 10 mei 2008) | 4 lines
* 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
........
r5004 | muggenhor | 2008-05-10 01:26:40 +0200 (za, 10 mei 2008) | 3 lines
* Produce level_lexer.lex.h for access to the lexer's functions from the
parser
* Remove unused macro lev_getc
........
r5005 | muggenhor | 2008-05-10 01:43:44 +0200 (za, 10 mei 2008) | 2 lines
* Use yyget_extra() & yyset_extra() to pass the input to the level_lexer
........
r5006 | muggenhor | 2008-05-10 01:45:00 +0200 (za, 10 mei 2008) | 1 line
Use yyextra instead of yyget_extra()
........
r5007 | muggenhor | 2008-05-10 02:02:48 +0200 (za, 10 mei 2008) | 2 lines
Slight clean up of Bison & Flex options
........
r5008 | muggenhor | 2008-05-10 02:35:24 +0200 (za, 10 mei 2008) | 3 lines
* 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
........
r5009 | muggenhor | 2008-05-10 02:38:26 +0200 (za, 10 mei 2008) | 1 line
Make scriptvals_lexer reentrant
........
r5010 | muggenhor | 2008-05-10 02:44:22 +0200 (za, 10 mei 2008) | 2 lines
Store the return value in a temporary rather than duplicating code paths
inside & outside of an if-branch
........
r5011 | muggenhor | 2008-05-10 02:49:29 +0200 (za, 10 mei 2008) | 2 lines
Make the scriptvals_parser reentrant as well (the lexer was made reentrant
already in r5009)
........
r5012 | troman | 2008-05-10 13:05:08 +0200 (za, 10 mei 2008) | 2 lines
Balance:
-make all Missile upgrade values increase in step of 30% instead of 10%, to
make sure Missiles (Scourge etc) not handicapped
........
r5013 | troman | 2008-05-10 13:12:15 +0200 (za, 10 mei 2008) | 1 line
Revert r5012, this change was a bit hasty.
........
r5016 | muggenhor | 2008-05-10 16:43:23 +0200 (za, 10 mei 2008) | 3 lines
* 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)
........
r5017 | muggenhor | 2008-05-10 17:08:32 +0200 (za, 10 mei 2008) | 1 line
* Use lexer_input.[ch] instead of our own custom YY_INPUT implementation for
level_lexer
........
r5023 | muggenhor | 2008-05-10 20:31:17 +0200 (za, 10 mei 2008) | 1 line
Don't use %option header-file in level_lexer.l as Flex 2.5.4 (used on
Windows) doesn't support this option
........
r5024 | muggenhor | 2008-05-10 20:42:59 +0200 (za, 10 mei 2008) | 1 line
Make scriptvals_lexer.l non-reentrant as Flex 2.5.4 (used on Windows) doesn't
support %option reentrant
........
r5025 | muggenhor | 2008-05-10 20:43:49 +0200 (za, 10 mei 2008) | 1 line
Update scriptvals.h for r5024
........
r5026 | muggenhor | 2008-05-10 20:52:07 +0200 (za, 10 mei 2008) | 1 line
Don't use %option header-file in scriptvals_lexer.l as Flex 2.5.4 (used on
Windows) doesn't support this option
........
r5027 | muggenhor | 2008-05-10 21:35:44 +0200 (za, 10 mei 2008) | 1 line
Don't use %option bison-brigde in scriptvals_lexer.l as Flex 2.5.4 (used on
Windows) doesn't support this option
........
r5028 | muggenhor | 2008-05-10 23:13:14 +0200 (za, 10 mei 2008) | 1 line
Add BUILT_SOURCES and CLEANFILES to the raw Makefile system as well (similar
to the vars with the same name in automake)
........
r5029 | muggenhor | 2008-05-10 23:28:06 +0200 (za, 10 mei 2008) | 1 line
make *.lex.h depend on the FLEX rule as well for the raw Makefile system
........
r5030 | muggenhor | 2008-05-11 00:12:51 +0200 (zo, 11 mei 2008) | 1 line
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
........
r5040 | devurandom | 2008-05-11 12:54:58 +0200 (zo, 11 mei 2008) | 2 lines
Add a gitignore file
........
r5045 | per | 2008-05-11 14:42:42 +0200 (zo, 11 mei 2008) | 2 lines
Cosmetic cleanup to order.c
........
r5046 | per | 2008-05-11 15:45:37 +0200 (zo, 11 mei 2008) | 2 lines
Remove some dead code, and cosmetic cleanup.
........
r5049 | troman | 2008-05-11 17:25:43 +0200 (zo, 11 mei 2008) | 1 line
Revert r5043 because of compilation problems on non-MSVC systems.
........
r5056 | per | 2008-05-12 00:11:28 +0200 (ma, 12 mei 2008) | 2 lines
Update changelog in trunk as well
........
r5058 | per | 2008-05-12 00:32:21 +0200 (ma, 12 mei 2008) | 2 lines
Remove debug log call that shouldn't be there
........
r5059 | muggenhor | 2008-05-12 14:16:46 +0200 (ma, 12 mei 2008) | 3 lines
* 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)
........
r5060 | muggenhor | 2008-05-12 14:33:38 +0200 (ma, 12 mei 2008) | 3 lines
* Make sure to set psPrev to NULL at the start of the deletion loop
* Also don't dereference it when it's NULL
........
r5061 | per | 2008-05-12 14:39:16 +0200 (ma, 12 mei 2008) | 2 lines
Cosmetic update of static globals
........
r5062 | muggenhor | 2008-05-12 14:41:54 +0200 (ma, 12 mei 2008) | 1 line
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)
........
r5063 | muggenhor | 2008-05-12 14:48:31 +0200 (ma, 12 mei 2008) | 1 line
Let the chat_lexer do some more of the work by returning only a single _T_YES
token for "yes", "yea", "yeah" and "yep"
........
Added:
branches/2.1/.gitignore
- copied unchanged from r5040, trunk/.gitignore
branches/2.1/lib/framework/lexer_input.c
- copied unchanged from r5013, trunk/lib/framework/lexer_input.c
branches/2.1/lib/framework/lexer_input.h
- copied unchanged from r5013, trunk/lib/framework/lexer_input.h
branches/2.1/src/parsetest.c
- copied unchanged from r5063, trunk/src/parsetest.c
branches/2.1/src/parsetest.h
- copied unchanged from r5063, trunk/src/parsetest.h
Modified:
branches/2.1/ (props changed)
branches/2.1/lib/framework/Makefile.am
branches/2.1/lib/framework/Makefile.raw
branches/2.1/lib/framework/debug.c
branches/2.1/lib/framework/frame.h
branches/2.1/lib/framework/framework.vcproj
branches/2.1/lib/framework/strlfuncs.h
branches/2.1/lib/script/chat_lexer.l
branches/2.1/lib/script/chat_parser.y
branches/2.1/lib/script/chat_processing.h
branches/2.1/lib/script/event.c
branches/2.1/makerules/common.mk
branches/2.1/makerules/exe.mk
branches/2.1/makerules/lib.mk
branches/2.1/src/ (props changed)
branches/2.1/src/Makefile.am
branches/2.1/src/Makefile.raw
branches/2.1/src/astar.c
branches/2.1/src/level_lexer.l
branches/2.1/src/level_parser.y
branches/2.1/src/levelint.h
branches/2.1/src/levels.c
branches/2.1/src/main.c
branches/2.1/src/map.c
branches/2.1/src/map.h
branches/2.1/src/order.c
branches/2.1/src/raycast.c
branches/2.1/src/scriptvals.h
branches/2.1/src/scriptvals_lexer.l
branches/2.1/src/scriptvals_parser.y
branches/2.1/src/transporter.c
branches/2.1/warzone2100.cbp
branches/2.1/win32/Warzone2100.vcproj
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
