Commit Graph

2262 Commits (13d1607349058649539de64511258c915a50eff6)

Author SHA1 Message Date
Per Inge Mathisen b99feff92f Merge PIEVERTEX and SVMESH into TERRAIN_VERTEX and use struct assignment instead of memcpy on it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2668 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:41:38 +00:00
Per Inge Mathisen 43196aaf94 Add testdata to list of directories to install. Bug reported by Buginator on IRC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2667 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 20:14:03 +00:00
Per Inge Mathisen bf878427c6 Fix use of pointer to byte in a format requiring a pointer to int.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2666 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 20:06:01 +00:00
Per Inge Mathisen f553173e7e Silence type punning warning in display.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2665 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:58:27 +00:00
Per Inge Mathisen fe27053bf7 Fix bug in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2664 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:51:02 +00:00
Per Inge Mathisen ec0836efdc Fix type punning warning where we cast an array as a struct pointer in netplay.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2663 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:49:39 +00:00
Per Inge Mathisen a788510e27 Fix type punning of pointers in missionGetTransporterExit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2662 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:44:36 +00:00
Per Inge Mathisen 81ccff31f7 Convert hash table to use 64 bit keys instead of 32 bit keys, since they are used
to store pointers.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2661 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:28:02 +00:00
Per Inge Mathisen c086e3c529 Clean up hash table code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2660 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:16:16 +00:00
Per Inge Mathisen 70718282a4 Fix shadows looking bad from opposite view direction of shadows, and fix
memory leak in shadow code reported in bug #10190.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2659 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 18:52:43 +00:00
Giel van Schijndel dcbef6f398 * Don't use variable array, structure members in RES_DATA
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2658 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:53:37 +00:00
Giel van Schijndel 78eb42b226 * Make sure that non-debug builds are still able to compile with the changes of r2655, by adding #ifdef DEBUG sections
* Use ASSERT(!"descriptive string",.. instead of ASSERT(FALSE,..


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2657 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:28:25 +00:00
Giel van Schijndel 7191ed7e92 * Set LANG=C in AutoRevision before executing "svn info" rather than the non-portable LANG=en_US
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2656 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 15:40:34 +00:00
Per Inge Mathisen ad9885b14b Add some ugly debug code to help track down dangling object references.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2655 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 21:47:52 +00:00
Per Inge Mathisen d668738714 Vector normalization should not be carried out if vector length is zero, as this
would divide a vector by zero, which is bad. This closes bug #9739.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2654 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 16:20:55 +00:00
Per Inge Mathisen c94ba3829f Sprinkle a few asserts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2653 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 23:49:41 +00:00
Per Inge Mathisen a189581a0c Fix crash where rearming VTOL would try to set a dead target.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2651 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 23:45:13 +00:00
Giel van Schijndel 08c2635bee * Remove the lines that would put "config.sub" and "config.guess" in place from the "clean" rule (autogen.sh already does this when necessary)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2650 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 22:15:52 +00:00
Giel van Schijndel 3510671340 * Rename test.bak to test.lnd
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2649 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 21:55:40 +00:00
Giel van Schijndel 4ef110a2f1 * Use ngettext at several places to allow for proper translation of sentences with plurals in them
* Replace some invalid usages of %d with %u (for unsigned values of course)
 * make -C po update-po
 * Slightly update the Dutch translation (with some plurals)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2648 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 21:35:51 +00:00
Giel van Schijndel 0374c67a12 * Add a doxygen comment to source:trunk/lib/framework/strlfuncs.h describing macro STR_L_FUNC_TRUNCATION_DETECT
* Replace (the last) strncpy() call in nettyps.c with a strlcpy() call


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2647 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 20:20:35 +00:00
Per Inge Mathisen 49df8ea371 Use GLC_TEXTURE for font rendering. Patch by Bertrand Coconnier in bug #10188.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2646 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:20:25 +00:00
Per Inge Mathisen e808d83f0c Add comment about quesoglc workaround being fixed upstream as of today.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2645 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:00:55 +00:00
Per Inge Mathisen 1d2caebccd Cleanup fugly code, and add nasty hack around weird bug. See bug #9843 for more info on bug.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2644 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:16:15 +00:00
Per Inge Mathisen b5e7d1149d Fix crash upon entering cam2 mission1. This fixes bug #9545.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2643 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:13:50 +00:00
Per Inge Mathisen 9609cb0005 Use full path to frame.h. Patch in bug #10208 by unknown.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2642 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 17:30:49 +00:00
Per Inge Mathisen 2553ccfaaf Fix bug in new savegame format. Forgot one separator tag write.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2641 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 17:16:06 +00:00
Giel van Schijndel f5602b4778 * Replace a large amount of strncpy() calls with the safer strlcpy()
* Fix an error in src/game.c where we would use the wrong size as parameter to strlcpy()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2640 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:18:52 +00:00
Giel van Schijndel 613a38364e * Make resSetBaseDir const correct (char* -> const char*)
* Document the "fileName" parameter of makeLocaleFile in the Doxygen comment


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2639 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:12:00 +00:00
Per Inge Mathisen 1811aa0cdb Use secure version of snprintf on Windows (_snprintf_s).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2638 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:50:45 +00:00
Giel van Schijndel bd37e62cb2 * Replace a lot of strncat(dst, src, sizeof(dst) - strlen(dst) - 1) calls with the less bloated strlcat(dst, src, sizeof(dst)) form
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2637 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:47:17 +00:00
Giel van Schijndel 86328025d2 * Fix a bug introduced in r2635 where we would only be able to enter one character as chat message
* This was the result from the fact that snprintf apparently deals differently than sprintf with output buffers that appear as part of the input as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2636 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 14:58:09 +00:00
Giel van Schijndel 6b4cba1700 * Rename pLevelName to aLevelName (hungarian notation is a pain. Especially when it's wrong!)
* Get rid of several magic numbers
 * Some const correctness
 * Replace a huge amount of strcpy(), strcat(), strncpy() and strncat() calls with a strlcpy() and strlcat() calls respectively


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2635 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 14:35:35 +00:00
Per Inge Mathisen 94421b5b56 Clean up LOG_3D
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2634 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:58:01 +00:00
Per Inge Mathisen 9d5f31cbdd Clean up RPL reader, removing static memory buffer once RPL file is closed. Closes bug #10206.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2633 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:30:23 +00:00
Per Inge Mathisen 35bd80b426 Add missing braces after conditionals. Please follow proper coding style :-)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2632 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:29:45 +00:00
Per Inge Mathisen 8885cb207c Try to work around QuesoGLC bug that makes Warzone hang on chat output. Fixes bug #10202.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2631 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:25:32 +00:00
Per Inge Mathisen 27fe14629b Fix use of uninitialized variables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2629 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 22:33:55 +00:00
Per Inge Mathisen 3ebaa02dea Fix bad printf parameter. Do not cast to short when telling printf you are using int!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2628 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 22:33:18 +00:00
Giel van Schijndel 673812b2a4 * Add file strlfuncs.h; this file contains an inline implementation of strlcpy and strlcat (safer variants of strncpy and strncat respectively)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2627 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 17:05:29 +00:00
Dennis Schridde 20bc25c107 Windows MiniDumper: resultMessage is always null-terminated and MessageBox is always shown. => Move out of ifs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2626 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 23:32:20 +00:00
Dennis Schridde a923b6a000 Dump used compiler and version, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2625 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 23:23:21 +00:00
Giel van Schijndel ac60bfc81f * Modify function QuerySvn such that we take advantage of std::string's interface rather than using low-level (i.e. character-level) string manipulations (e.g. remove a whole chunk at the end of a string rather than a separate character every time)
* Allow the #definition of SVN_AUTOREVISION_STATIC before #include AutoRevision's output file
   * When #defined to "static" it will mark all variables created in AutoRevision as static
 * Additionally detect the "base-uri" of a working copy (e.g. "trunk", "branches/2.0", etc.) and dump it in the output header file


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2624 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 20:42:03 +00:00
Dennis Schridde e8f6c5a90f - Use AC_SUBST to define pkg-config style xxx_LIBS variables
- Don't define LIBS anymore, use LDADD instead to add the required xxx_LIBS (useful for tools which don't depend on all the libs WZ needs)
- Cleanup (safer variable expansion, mostly)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2623 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 18:13:30 +00:00
Giel van Schijndel 5707e8ed99 * Enable NLS (Native Language Support) when compiling with Code::Blocks
* Link against libintl
   * #define ENABLE_NLS

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2622 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 17:41:44 +00:00
Giel van Schijndel b26a610760 * Add AutoRevision to Code::Blocks project file
* Utilize AutoRevision to create src/autorevision.h when building (pre-build step)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2621 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 17:39:30 +00:00
Per Inge Mathisen 820d572696 Change user config directory to ~/.warzone2100-2.1 on linux and "Warzone 2100 2.1" on Mac/Windows.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2619 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 21:37:32 +00:00
Per Inge Mathisen 40170a90ce Clean up component.c and remove two unused key mappings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2618 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 21:15:54 +00:00
Giel van Schijndel e06c186bd6 * Replace a _lot_ of strcpy(), strcat() and sprintf() calls with the safer strncpy(), strncat() and snprintf() respectively
* Refactor NETlogEntry() to use the array of strings (packetname[]) instead of a large switch-statement with a lot of copy & pasted code


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2617 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 21:11:29 +00:00
Giel van Schijndel 3446fb2b87 * Remove __FILE__ prefix in debug() call as debug() apparently adds __FILE__ already (noted by Per)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2616 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 19:40:39 +00:00