Commit Graph

2194 Commits (78a9247254211948414805676f385a83e35e2600)

Author SHA1 Message Date
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
Giel van Schijndel 329c6637d8 * Check malloc's return value
* Don't perform assertions on the content of uninitialized memory, it's useless and annoying when they fail


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2615 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 17:20:29 +00:00
Giel van Schijndel e6827605e2 * Fix a rather large memory leak as reported in bug #10190
* In this bug-report calling free() twice (once on psRes->aID then on psRes) was proposed
   * Instead just ''over allocate'' the memory for psRes so that a single free() call on psRes will suffice

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2614 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 16:54:53 +00:00
Giel van Schijndel 870a536646 * Initialize PhysicsFS before using it
NOTE: PieToaster ''should'' compile, link and run on GNU/Linux systems right now (it does for me)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2613 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:26:26 +00:00
Giel van Schijndel 498959f9bb * #include <stdint.h> where we need it
* Use proper constness in main() to shut up gcc warning about wrong constness


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2612 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:23:59 +00:00
Giel van Schijndel 5a91f73056 * Replace usage of SDL types Uint* and Sint* for usage of standard C types uint*_t and int*_t respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2611 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:17:37 +00:00
Giel van Schijndel 62f1be11f1 * Use "rm -f" to shut up the darn warning messages if several of the to-delete files don't exist while cleaning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2610 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:14:18 +00:00
Giel van Schijndel 579e952cb8 * Lets use the built-in bool-type instead of a dirty macro!
* replace [Bb][Oo][Oo][Ll] with bool
   * replace TRUE with true
   * replace FALSE with false

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2609 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:04:25 +00:00
Giel van Schijndel 8cd7f8fd5b * Replace all instances of ''_snprintf'' with ''snprintf''
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2608 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:43:01 +00:00
Giel van Schijndel 3344b5b01c * Fix #include directives so compiling becomes yet a bit closer to possible
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2607 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:34:44 +00:00
Giel van Schijndel 0bb24b12c2 * Add a ''very'' simple Makefile for compiling PieToaster
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2606 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:29:35 +00:00
Giel van Schijndel b2a7dd1347 * set svn:keywords
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2605 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:16:52 +00:00
Giel van Schijndel c6392febca * Link PieToaster's sources to the repository history
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2604 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:12:10 +00:00
Giel van Schijndel 26a1f19cfe * Add initial version of PieToaster
* Developed by Carl Hee <Watermelon>
   * Licensed under the conditions of the GPLv3


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2603 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 12:29:36 +00:00
Per Inge Mathisen dd4898fe2f Beginnings of a new savegame format. Each time you save, a new file with the
extension .wzs is added to your savegame directory. This is the new world.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2602 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 20:52:51 +00:00
Giel van Schijndel 6f0ebde13e * Add lib/framework/tagfile.[ch] to MSVC project file ( this addresses part of bug #10190 )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2601 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 20:48:15 +00:00
Per Inge Mathisen 45988bd322 Also add definition used in unit test for tagfile bools.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2600 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 20:22:00 +00:00
Per Inge Mathisen 6cf0e01f0b Add write and read methods for bools to tagfile framework. Remove enum write macro.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2599 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 20:21:18 +00:00
Per Inge Mathisen 76031cd173 Dump dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2598 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 18:41:02 +00:00