Commit Graph

1941 Commits (78c568d5c5bde112f4bdd9f3a69a39e01fdfe6c1)

Author SHA1 Message Date
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
Roman C 46b2ee2b52 - removed a scripting function that is no longer used
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2499 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 15:18:05 +00:00
Roman C 5a5d16a8a4 - fixed a bug that would prevent AIs from building certain types of cyborgs, since some of their components were not available
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2497 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 15:14:11 +00:00
Roman C 8d7c7810ec Scripting engine update:
- some functions dealing with structure quantity at some location now additionally take a boolean which indicates whether half-built structures should be ignored (stock AI is updated accordingly)
- added sqrt() and exp() functions
- added friendlyWeapObjCostInRange() function to calculate cost of friendly units within a certain range
- CALL_RESEARCHCOMPLETED now additionally returns structure that has completed research and its owner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2495 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 15:04:25 +00:00
Per Inge Mathisen c89853b636 Make map_coord() and world_coord() take and return signed values. This
fixes a problem that occurs when texture pages are larger than default.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2494 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 14:42:52 +00:00
Roman C e5f977e0f1 Scripting engine:
-increased possible length of a macro name

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2493 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 14:41:46 +00:00
Dennis Schridde 009d388338 Fix wrong replacement of "Warzone 2100" with "${PACKAGE_NAME}".
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2492 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 14:10:43 +00:00
Giel van Schijndel 75f820d1b1 * Replace the last of "<< TILE_SHIFT" and ">> TILE_SHIFT" usage with world_coord and map_coord respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2490 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 19:25:21 +00:00
Giel van Schijndel d5d3175f86 git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2489 4a71c877-e1ca-e34f-864e-861f7616d084 2007-09-28 17:39:33 +00:00
Giel van Schijndel b0500a1a99 * Replace a large mount of "<< TILE_SHIFT" and ">> TILE_SHIFT" usage with world_coord and map_coord respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2488 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 16:51:15 +00:00
Giel van Schijndel beb24f3d10 * Replace macro function CLIP_WORLD_OFFMAP with static inline function clip_world_offmap
* Add a Doxygen header to this function

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2487 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 15:11:58 +00:00
Dennis Schridde 930396af83 Remove no longer needed m4 macros. Depends on r2485!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2486 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:46:46 +00:00
Dennis Schridde 4c2954bdd4 - Require Ogg/Vorbis. If you rely on Warzone having no sound support please report back!
- Use pkgconfig where possible (sdl, png, ogg/vorbis). Removes m4 file dependencies, tests are faster. If this is a problem for you: Tell me!
- Check against SDL_net using AC_CHECK_* instead of custom m4 macro. Before not much more was tested anyway.
- Enormously simplify OpenGL/OpenAL checks. Functionality should be the same. More diverse error messages. pkgconfig-style LIBS definition.
- Define DATADIR/LOCALEDIR via config.h instead of via CFLAGS. Should move them into dependency checks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2485 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:34:23 +00:00
Dennis Schridde 087c433997 Bump pofiles.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2484 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:22:21 +00:00
Roman C fa7866beba Fixed actionCalcPullBackPoint() that was generating off-map coords. Used to be one of the reasons for the "fpathRoute: target coords off map" assert in fpathRoute().
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2483 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-27 13:00:38 +00:00
Roman C 6daca4513a Fixed a C99-style for loop.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2482 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-27 12:23:23 +00:00
Giel van Schijndel 97192c00cb * Fix wrong indentation style used in r2480
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2481 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:57:06 +00:00
Giel van Schijndel a8bfacf6ed * Rename iV_DrawText to iV_DrawTextRotated and create a static inline function iV_DrawText which calls iV_DrawTextRotated with rotation=0.f
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2480 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:40:56 +00:00
Giel van Schijndel 1d877d50cd * Mark some strings for translation by GNU Gettext
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2479 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:21:18 +00:00
Giel van Schijndel f2ed173848 * Get rid of some duplication in string declaration (difference between DEBUG and Non-DEBUG builds); use preprocessor string concatenation instead
* Don't use a magic number (-1), but a named value instead: PIE_TEXT_WHITE

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2478 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:19:55 +00:00
Giel van Schijndel 470ea85417 * Remove lib/framework/utf8.c[ch] as we don't need it just right now (we can always revert this commit later on if necessary)
* This commit removes utf8.[ch] from all build systems (manual text-editing for the most of them)
 * For the removal from the XCode project I just reverted r2288

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2477 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 19:46:10 +00:00