Commit Graph

1961 Commits (8151788f142c37254c46904fd1a561b7bbfc2b7a)

Author SHA1 Message Date
Dennis Schridde 8151788f14 Giel wants this to be commented...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2555 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 20:57:55 +00:00
Per Inge Mathisen 750646efe0 Add back linear magnification filtering (enough testing now, we know the issues).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2554 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 20:56:29 +00:00
Dennis Schridde ceb1a432bc Proper fix for ICC warning "argument is incompatible with corresponding format string conversion".
The fix which silenced the warning in r2550 was wrong.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2553 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 20:51:34 +00:00
Dennis Schridde c812691bb8 Move AC_PROG_CC_STDC for cleaner flow / simpler structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2552 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 16:45:01 +00:00
Giel van Schijndel c8052e9d1b * Use autoconf macro AC_PROG_CC_STDC instead of manually appending -std=c99 to our CFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2551 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 13:09:03 +00:00
Dennis Schridde c7b00fadaf More work on the ICC front:
- Less strict warnings in debug-mode (still unusable, because ICC warns about _a lot_)
- Explicit conversions
- Clarify parameter evaluation order


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2550 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 18:09:18 +00:00
Dennis Schridde c361b89dfa There were more "a class=" anchors...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2549 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 16:19:16 +00:00
Dennis Schridde 44a933ad87 Correct anchors to use ids, so that ...#id works.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2548 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 16:16:24 +00:00
Giel van Schijndel d331eff613 * Remove source code mime-types which where text/plain (from EditWorld); since that'll prevent these sources from being shown with source code highlighting in some web interfaces (WebSVN, Trac, etc.)
* Also change wxWidgets resource files' mime-types to text/xml

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2547 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 08:19:52 +00:00
Roman C 74b36742e4 - set LC_NUMERIC in the setlocale() call to accept a period as a radix for floating point numbers instead of a comma
- replaced setlocale(LC_ALL, "") with setlocale(LC_MESSAGES, ""), as suggested by Devurandom

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2546 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-12 14:33:08 +00:00
Giel van Schijndel 1dd3e33c2c * Add DirectX -> OpenGL porting tasks to EditWorld's TODO list as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2545 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 23:04:21 +00:00
Giel van Schijndel ac6069f791 * Make sure the raw Makefiles link against GLC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2543 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 22:55:34 +00:00
Giel van Schijndel 173f093901 * Fix tile_texpage2mipmap_tileset, it now makes imagemagick output zero-padded filenames up to 2 digits (like Warzone expects)
* Bump version numbers of tile_texpage2mipmap_tileset to 1.2

Patch by Kevin Gillette <kage>: http://forums.wz2100.net/index.php?topic=1010.msg9137#msg9137

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2542 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 22:47:13 +00:00
Dennis Schridde 7792f1b211 - Be more explicit about what is missing during configure and only ask the user to install something if it is not obvious what is missing.
- Check for pkg-config earlier, pkg-config 0.9 should be sufficient according to configure.
- Add pkg-config m4 file to be able to check for pkg-config where it is not installed.
- Fix typo in ChangeLog, add recent buildsystem changes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2541 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-09 11:10:47 +00:00
Dennis Schridde 5b476bb629 Note about (not yet complete) ICC support.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2540 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-09 10:31:32 +00:00
Dennis Schridde b3b4baa9a8 Add extra escaped quotes to DATADIR define so we end up with -DDATADIR="\"...\"" -> one quote for the shell, another one for C.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2539 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-09 10:19:55 +00:00
Dennis Schridde b893291848 update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2538 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 20:38:16 +00:00
Dennis Schridde 122f5bf724 AC_DEFINE cannot be used for defining to-be-expanded vars and AC_DEFINE_UNQUOTED shall not (according to the autoconf manual). Additionaly AC_DEFINE_UNQUOTED does not fully expand the var, so it is useless here...
Therefore switching back to setting CFLAGS. Don't ask me why I changed it in the first place...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2537 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 20:36:08 +00:00
Roman C d042bb5203 Fixed c99-style variable declaration in script_lexer.l
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2536 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 14:21:09 +00:00
Roman C e0dc89e031 Updated Aivolution AI to be compatible with the recent changes to the scripting functions (parameter numbers of some functions were changed).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2535 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 12:55:07 +00:00
Dennis Schridde 78c568d5c5 Make sure pkg-config is installed. (0.15 may be sufficient...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2534 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-06 20:42:59 +00:00
Giel van Schijndel ad3f3442f6 * Fix a segfault introduced in r2532 which was triggered when loading *.slo scripts with #define directives in them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2533 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-06 14:22:49 +00:00
Giel van Schijndel f7e793cf31 * Load SCRIPT files (*.slo) directly from their files rather than an intermediate memory buffer
* In function dataScriptLoad, make "printHack" a "static const" instead of a local non-const variable (emphasizes that it really is a compile-time constant; also towards the compiler btw, GCC treats a static const var as a preprocessor macro with static type checking)
 * Move global variables pScrInputFiles (formerly pScrInputBuffer), scr_include_stack_ptr, scr_num_macros, scr_macro_stack_ptr, pScrMacroBuffer and scrInclLine from script_parser.y to script_lexer.l and mark them static to disallow external linkage (to make it a little bit better encapsulated and localised)
 * Make function scriptCompile return a SCRIPT_CODE* pointer instead of a BOOL and writing the same pointer into an output pointer (instead upon failure it now returns NULL)
 * Move some of the functionality of scriptCompile to new function scriptSetInputFile instead (which is based upon scriptSetInputBuffer)
 * Modify script_lexer.l to read include files directly from the files rather than an intermediate memory buffer (by means of a modified YY_INPUT macro)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2532 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-05 22:44:18 +00:00
Giel van Schijndel 7f24fb3bfb * Load SCRIPTVAL files (*.vlo) directly from their files rather than an intermediate memory buffer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2531 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-05 18:16:02 +00:00
Giel van Schijndel 3ebad628ca * Allow QuesoGLC to fall back to a random font when we failed to load any fonts
* This should fix _the_symptoms_ of bug #10117

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2530 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-05 17:06:20 +00:00
Giel van Schijndel 9d9370e13c * Make anti-aliassing of text optional (for slower systems); it's turned on by default though (option "textantialiassing")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2529 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 21:29:16 +00:00
Giel van Schijndel 7835b437e7 * Wait until *after* font-selection (selection occurs after loading) with dumping the font-face list (otherwise an empty font-face list is always shown)
* Dump the font-face list on LOG_NEVER instead of LOG_ERROR
 * Write an error to LOG_ERROR when the required font couldn't be loaded (currently hardcoded as "DejaVu Sans Mono")

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2528 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 19:43:38 +00:00
Giel van Schijndel 529faa799d * Replace a lot of manual string editing (by accessing/modifying the individual characters of a C string) by snprintf usage
* Replace some instances of (UBYTE)0 with '\0'
 * Refactor while loop in function intDisplayNumber with a for loop instead (which it basically was already; except for the keyword that is)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2527 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 17:25:26 +00:00
Giel van Schijndel 95e750f467 * Use snprintf instead of manually calculating character codes
* Replace "\x07" with unicode character U+221E encoded as UTF-8; also use strncpy instead of manual assignment to the character array (aka C string)
 * this should fix the problem where a non-sense character is printed when production looping is set to infinite

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2526 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 16:25:10 +00:00
Giel van Schijndel 5b1a617631 * Add note about needing to install QuesoGLC to the configure script's GLC header detection
* Add URL to QuesoGLC to the configure script's error messages about GLC

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2525 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 10:14:10 +00:00
Dennis Schridde 87d55b978b Basic buildfile support for ICC and silence one warning.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2524 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-02 21:43:43 +00:00
Roman C 0f37cc5854 Fixed calculation of percentage damage dealt to structures and thus leveling up of units when damaging structures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2523 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-02 13:37:30 +00:00
Giel van Schijndel 77e4d5fda8 * Update ChangeLog for r2521 (addition of font rendering and UTF-8 handling code, based on QuesoGLC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2522 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 23:07:03 +00:00
Giel van Schijndel d075832459 * Add font rendering and UTF-8 support through usage of QuesoGLC (an OpenGLC implementation);
* This _will_ require you to install http://quesoglc.sourceforge.net/ on your system to be able to compile (windows binaries are provided on the sourceforge download page as well; just dump them in wz's devpackage directory for now)
 * Currently the font render code is hard-coded to select two fonts: DejaVu Sans Mono regular style (aka "Book") or bold style; if you're package manager doesn't provide these fonts (Debian and derivatives have "ttf-dejavu"), you can get them from http://dejavu.sourceforge.net/

This closes #1 (https://trac.mortis.eu/warzone/ticket/1 I dumped/maintained my patch there)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2521 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 19:45:49 +00:00
Dennis Schridde 623ac960ae - Revised first Paragraph by Fred et al.
- Setting mime-type to application/ was a bad idea since that enforces binary diffs


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2520 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 18:04:12 +00:00
Dennis Schridde 59a57b85fe Set correct svn:mime-type props.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2519 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 15:54:44 +00:00
Dennis Schridde f3c1cf2fb4 - Make scriptingmanual valid XHTML 1.1 + CSS 2
- Move it to doc/
- Move style definitions to external stylesheet


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2518 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 15:51:26 +00:00
Dennis Schridde 90cce5df9a Proper mime-type for XHTML is application/xhtml+xml
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2517 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 15:28:48 +00:00
Roman C 3c4f0e0528 Updated scripting manual.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2516 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 13:17:27 +00:00
Dennis Schridde 9c2ab4c04b - English text Readme was mistakenly announcing Alt+Tab as fullscreen toggle on Linux
- Use spaces for indention of tables in textfiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2513 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-30 16:18:12 +00:00
Dennis Schridde 976b7dd0fb Move readmes into doc/ subdir and add previously forgotten stylesheets.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2511 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-30 10:52:09 +00:00
Dennis Schridde b607700865 Document kick feature. Thanks to Fred who pointed out that the netcode supports this.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2510 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-30 10:34:03 +00:00
Per Inge Mathisen d224588975 Finalize fixes for allowing non-power-of-two texture pages.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2509 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-30 10:14:05 +00:00
Dennis Schridde 24d093186f Port of r2507: Add new Readmes by Kreuvf. Old README replaced with empty file to please Automake.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2508 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 20:58:36 +00:00
Per Inge Mathisen b564a02dc5 Try another fix. Reversing my earlier reversal, I now instead use bitshifts
for division and multiplication in map_coord and world_coord to get correct
rounding, where "correct" means similar to what it was in the original code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2506 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 19:42:29 +00:00
Per Inge Mathisen 1a61c2947c Remove commented out VISIBLE_SCROLL code, which, if enabled, would prevent
scrolling to areas outside visible (non-FoW) areas. This feature sucked.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2505 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 19:31:04 +00:00
Per Inge Mathisen a895e1abe0 Revert tiny part of r2488 which causes strange offset problems on the map due
to rounding differences between division and bit shifting on negative values.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2504 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 19:29:28 +00:00
Per Inge Mathisen 91833ef2ec Silence debug warning accidentially made too loud
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2503 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 18:48:58 +00:00
Per Inge Mathisen ba3534485b Change calculation of texture coordinate steps from requiring that the number
of tiles adds up exactly to size of texture in display code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2501 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 16:22:55 +00:00
Per Inge Mathisen ba8f8ba34d Change texture size and texture coordinate calculations so that they no longer
assume that textures match exactly into texture page.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2500 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 16:00:31 +00:00