Commit Graph

5913 Commits (b9b1a4bac74d321f9cf0d97b5cd552b6ce6b8362)

Author SHA1 Message Date
Buginator e36988eba2 Using ASSERT_OR_RETURN macro to prevent GIGO (Garbage in, Garbage out).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7479 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:21 +02:00
Buginator 8a87d1985e Fix strlcpy() & strlcat() to use ASSERT_OR_RETURN
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7478 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:21 +02:00
Buginator 9b5225af4d apply a bug fix patch from travisellett which fixed a minimap / radar issue.
Closes ticket:333

Thanks for the patch!

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7477 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:21 +02:00
Buginator 9a3f1046be Fix windows crash dump report, by returning back a c_str() instead of a string.
Fixes ticket:519

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7476 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:21 +02:00
Guangcong Luo 27cddc920f Fix typo in action.c
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7464 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:20 +02:00
Buginator e89dc5e8ec "Do not index an array out of bounds when displaying a chat message from another player with an invalid (unknown) dpid."
Thanks to gerard for the elaboration of the description. ;)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7460 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-18 10:11:27 +02:00
Christian Ohm 1ed583995a Run make -Cpo update-po again to update translations
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7451 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:16 +02:00
Guangcong Luo cf3ea876f9 Commit ticket #423 - Add a tech tree chart generator to the tools.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7449 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:15 +02:00
Guangcong Luo 2d6d0656d5 Stop AI from using player's truck (fixes bug #406). Comment multiTemplateSetup a bit better.
This is a somewhat hacky fix (gives human players ConstructorDroid and computer players ConstructionDroid). The template system has too many eldritch horrors that to fix it properly requires rewriting the entire template code (did you know it loads human player templates from player 5? And so if player 5 is an AI player, it uses a ridiculously complicated workaround?)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7447 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:15 +02:00
Buginator e7071a6acc Commit a 100% done translation of ru.po by Maxim.
closes ticket:347

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7446 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:14 +02:00
Buginator a7e00ca81d When on a mission, and the map size changes (*scroll limits change midgame*), we need to make sure that the radar buffer gets reset to the new size of the map.
Fixes ticket:479 (again) and also ticket:494 (which is basically a duplicate of ticket:479)

NOTE: need a Expand_Limbo mission savegame to more fully test this. See notes in structure.c


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7442 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:14 +02:00
Buginator 583ae5c048 revert r7402, found less hacky way to fix the issue.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7439 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:14 +02:00
Christian Ohm 4d4f007923 Fix pl and pt_BR and update all translations
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7435 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-16 16:07:14 +02:00
Guangcong Luo 9e1c164a8c Better map previews (patch by Florian Schanda, color scheme by Zarel).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7433 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:37 +02:00
Buginator 85169f4dbf *Updated* pl.po file by Makary.
closes ticket:241

NEW Slovenian translation sl.po file by ThomasCarstein.
Closes ticket: 392

Applying pt_BR.po update by Tucalipe
closes ticket:350



git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7431 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:36 +02:00
Buginator c80a0be017 There is *no* reason to use abort() or exit() on failed command line parsing parameters. We just return false instead.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7430 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:36 +02:00
Buginator 3e4374cdf8 Clarify message when the resolution is given in the wrong format on the command line, and remove unneeded abort().
fixes ticket:306


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7429 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:36 +02:00
Buginator 6506d1291f We now return the truncated string, instead of returning NULL if the string is too long.
fixes ticket:493

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7427 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:36 +02:00
Christian Ohm a19b11130e Update translations (make -C po update-po)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7425 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:35 +02:00
Guangcong Luo 6d60bcf19f Rename "Transport" to "Cyborg Transport".
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7418 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:33 +02:00
Buginator d97df846f0 Don't allow the transporter to be controlled in SP games.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7413 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:33 +02:00
Guangcong Luo 5ca15e5adc Revert part of r7409 - I didn't actually mean to commit my extremely buggy working copy of display3d.c.
I'm leaving the loadsave.c change in there since it's pretty innocuous - it lets you save games with Num-Enter as well as Return - should make it easier on international keyboards.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7410 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:32 +02:00
Guangcong Luo 18a64a9387 Move the "Video" component out of the "Mods" section in the Windows installer.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7409 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:32 +02:00
Per Inge Mathisen ca52fcb2c0 Streamline the path-finding interface a bit to prepare for more data being used to evaluate paths.
We now pass the entire PATHJOB struct to the A* function. No actual behavioural changes yet.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7408 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:32 +02:00
Per Inge Mathisen fb980b636c Ease up on the volume of repeat testing done on the audio code.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7407 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:32 +02:00
Buginator 757306faf2 Fixes ticket:479
The radar can expand its size during certain missions, also we only assert if this happens in a skirmish/MP game, since we currently do not allow levels to change in those modes.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7402 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
Christian Ohm a9d6cabb0a Remember player number and tech level for map selection screen
Change the default player number to 4, since the default map is a four player
map. The player number/tech level is only for the current game, not saved in
the config file.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7401 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
Giel van Schijndel e959170609 Don't try referencing "not yet" defined variables
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7399 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
Giel van Schijndel 52c8ba24e4 Revert accidentilly committed revisions r7394, r7395 and r7396 (part of a private branch)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7398 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
Giel van Schijndel 29201b4c53 Lobby server: Display the "Removing aborted game" message when removing a game
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7397 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
Giel van Schijndel af40e39f77 Move construction/allocation code for JSON structures to json_value.[ch]
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7396 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:30 +02:00
Giel van Schijndel ef5a01eeb9 Add a JSON tokenizer (lexer), parser and serializer
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7395 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:30 +02:00
Giel van Schijndel aaa1efe4bb Add a function for UTF-8 encoding
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7394 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:30 +02:00
Giel van Schijndel e5e90e5121 Lobbyserver: Append to the host list instead of trying to its first (possibly non-existing) element
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7391 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:30 +02:00
Buginator 8cc20df76f Artillery prediction fix.
patch by Rhamphoryncus (Adam Olsen)

fixes ticket:374
Thanks to per for the conversion

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7384 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:13 +02:00
Buginator 1855990fa8 Change non-fatal debug messages in the sound code from LOG_ERROR to LOG_WARNING instead.
fixes ticket:427

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7382 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:13 +02:00
Buginator b60b1ad10b Fix prototype to match function's definition.
(was missing a const)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7381 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:13 +02:00
Buginator 395f677099 Properly fix intfac.img & infac.h
After a short (*cough*) delay, finally add Zarel's new icons from ticket:247.  (fixes ticket:247) 

Move leave / disconnect icon to top(ish) right of screen.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7380 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:13 +02:00
Buginator 43ed454b7a NTW Mod 1.8.6b for 2.2 by Delphino
---
gates removed
little balance changes
Mysteryem's factory textures,
Black Project's camo textures (changed) and new truck sounds removed. 
Plus many other changes.  See enclosed doc file for more information.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7379 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:12 +02:00
Giel van Schijndel 3e5254af26 Only (attempt to) disable IPV6_V6ONLY on systems where it's #defined
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7378 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:11 +02:00
Giel van Schijndel e4a9273e53 Add the ticket number for the SDL-net -> BSD changelog entry.
Addresses #435

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7377 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:11 +02:00
Giel van Schijndel 4a0e33abc4 Update the ChangeLog for the addition of IPv6 support.
Addresses #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7375 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:11 +02:00
Giel van Schijndel 7afaa55bc5 Properly handle the fact that Game.hosts is now a variably-sized list
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7372 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:11 +02:00
René Jürgens 50c2974fa4 delete new vehicle con sfx's... they are not so good for warzone as i thought.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7366 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-10 19:18:11 +02:00
Giel van Schijndel a385545043 * Don't handle protocol specific encoding in wzmasterserver.py, instead deal with it in the Protocol classes in protocol.py
* Don't set Game's `hosts` value to a list of ''exactly'' 3
  - Instead use empty strings for non-existing hostnames below 3 (when encoding only)
  - This allows for a bit more extensibility in the future.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7365 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:55 +02:00
Giel van Schijndel 3dfb215c8b Add IPv6 support to the lobby protocol
* Add a new field: secondaryHosts, an array of two fallback hosts
  - Canibalize the entire "misc" field and part of the "extra" field for this
  - When connecting, first try the primary "host" field, then fall back to the hosts in secondaryHosts (in order)
 * Add a new field: gameId, used on the lobby server to link multiple lobby connections to a single game entry
  - First (attempt to) connect to the lobby with all available address families (currently IPv4 and IPv6)
  - Then ask for a gameId from the lobby server using the first established lobby connection
  - Set the gameId field in the GAMESTRUCT to the one retrieved
  - Transmit the GAMESTRUCT using a "addg" command to the lobby over each lobby connection
  - The lobby then compares all incoming ID numbers with ID numbers already present
  - If there's a match it will use the GAMESTRUCT already present and only add a new hostname to the list

This is the last change, part of, and closes #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7364 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:55 +02:00
Giel van Schijndel 3b80e3a63c Add client side IPv6 support
* Properly format IPv6 addresses (so that parsing later on will work again)
 * Resolve names to all address families, not just IPv4

Addresses #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7363 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:54 +02:00
Giel van Schijndel 4a90601536 Add partial server side IPv6 support
Implement a "dual stack", i.e. listen on both IPv4 and IPv6 addresses.
This change doesn't affect the socket API itself.

Addresses #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7362 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:54 +02:00
Guangcong Luo ad647da647 "Player disconnected" and "Player left" icons.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7360 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:54 +02:00
Buginator 638c63261b Workaround for a bug in the script files that abuses the DORDER_BUILD order for demolition.
The problem is with the player*.slo file(s), but putting off a proper fix until the LUA translation is completed.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7358 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-09 23:29:54 +02:00