Commit Graph

3022 Commits (6de67c3fc77ef78f0a3c2c9a55599e0817aea27c)

Author SHA1 Message Date
Giel van Schijndel 6de67c3fc7 Allow joining of the same amount of players a map is intended for (rather than one less); patch #976 by Buginator, slightly trimmed by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3764 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:14:18 +00:00
Per Inge Mathisen 4c3a85762b Cosmetic cleanup of power code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3763 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 17:56:43 +00:00
Giel van Schijndel 84a36281a5 When retrieving games from the lobby abort on failure to prevent an infinite loop
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3762 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 21:20:25 +00:00
Per Inge Mathisen 49f2292bf8 Clean up the place beacon code a little.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3761 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 21:01:47 +00:00
Per Inge Mathisen 54dc6ee955 Clean up message code. Remove dead code, improve style, and improve error messages and asserts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3760 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 20:47:56 +00:00
Giel van Schijndel 81fe501660 Bail out when we fail to receive the game count in the lobby code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3759 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:51:24 +00:00
Per Inge Mathisen ffc6d739a1 Improve some net debug log calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3758 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:26:23 +00:00
Per Inge Mathisen 29153d8fe4 Do not use two separate packet globals. Fixes problems with corrupted network data.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3757 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 19:22:42 +00:00
Giel van Schijndel 7493e9ea3f Replace some magic numbers with HOST_DPID; patch by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3756 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 18:25:35 +00:00
Per Inge Mathisen d484e2bc98 Fix infinite loop when joining a game. An encode was supposed to be a decode.
Also remove some excess logging calls.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3755 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 17:19:12 +00:00
Per Inge Mathisen eead0d470a Clean out some old unused stuff from multiplay.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3754 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 16:36:18 +00:00
Per Inge Mathisen 917187ca7d Clean out some excess global defines.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3753 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 16:23:20 +00:00
Per Inge Mathisen 907f684f8a Remove remains of old external launcher program lobby.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3752 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 16:00:17 +00:00
Per Inge Mathisen 538765c59e Cleanup beacon code. Remove unused code, move variables into smallest scope,
and fix crash if you place a beacon in the radar outside the map view.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3751 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 13:59:10 +00:00
Per Inge Mathisen 4cff4f49fe Dump some dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3750 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 11:47:07 +00:00
Per Inge Mathisen eda4c3a0f8 Try to fix bug #10956 by making sure the tab fields are initialized, and
add several new asserts to help track down the bug if this does not help.
Please post a new backtrace if this bug happens again.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3749 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 11:28:45 +00:00
Per Inge Mathisen 6cfdddb136 Permit move angle to be exactly 360 degrees without asserting failure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3748 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-11 11:02:17 +00:00
Roman C fd1bd9c1bc Balance changes:
Increased ridiculously low reload rate of some cyborg weapons while keeping damage/sec constant (mp only).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3747 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 22:23:44 +00:00
Per Inge Mathisen b8ecac8f77 Remove the final remains of the old ugly network code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3746 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 21:03:00 +00:00
Per Inge Mathisen 8a38943349 Remove the code to send and receive whole droids if they are missing. Since we
are now using TCP, we should not be missing any droids. See patch #927 for
discussion.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3745 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 21:01:57 +00:00
Per Inge Mathisen 160afd4e7a Remove some unused code from netplay.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3744 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 20:08:39 +00:00
Giel van Schijndel d5e7f01ef6 Change magic number to HOST_DPID and document HOST_DPID; file #3791 from patch #975 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3743 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 19:57:47 +00:00
Per Inge Mathisen 92309cc78f Hack to avoid crash when placing features with the CTRL+O cheat menu.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3742 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 18:21:02 +00:00
Per Inge Mathisen 52a2f9a041 wzmviewer: Fix dimension calculation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3741 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:38:28 +00:00
Per Inge Mathisen 749ad7ded1 pie2wzm: Add newlines.
wzmviewer: Hack perspective depending on model size.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3740 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:24:11 +00:00
Giel van Schijndel 722303eb84 Turn a lot of already-available function documentation comments into Doxygen documentation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3739 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:44:53 +00:00
Giel van Schijndel 72003cf9bf Provide Doxygen documentation for iV_DrawFormattedText() and change its return type to int
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3738 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:25:20 +00:00
Giel van Schijndel 24ba730bdb * in iV_DrawTextRotated() select the model view matrix and don't depend on that one being selected already
* Also push and pop the model view matrix


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3737 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:06:23 +00:00
Giel van Schijndel 637edb1f0d * in pie_SetTexturePage() _always_ disable texturing when invoked with a negative parameter
* In iV_DrawTextRotated() use -1 instead of -2 as texturepage (not that it matters anymore what negative number we use, due to the above change)
 * Add some Doxygen documentation to pie_SetTexturePage()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3736 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:03:58 +00:00
Per Inge Mathisen 03b9f0a63e Make pEnvironData static
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3735 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 11:51:16 +00:00
Per Inge Mathisen 9c699e0d24 Clean up environ.c by removing lots of unused stuff.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3734 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 11:49:40 +00:00
Per Inge Mathisen 12bcb52e3d Truncate strings and binary data sent over the network if larger than expected.
Patch by Buginator in patch #974 with changes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3733 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 11:43:08 +00:00
Ari Johnson adfeb3ab98 Updated Mac OS X port to use QuesoGLC 0.7.0 with a work-around for a
text display bug


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 21:55:02 +00:00
Per Inge Mathisen 84c61fed77 Fix crash in wzmviewer due to a not properly initialized frame variable.
Thanks to Buginator for reporting the problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3731 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 19:45:49 +00:00
Per Inge Mathisen b174ddd773 Make PIE/WZM tools more easily compile on Windows.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3730 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 18:56:31 +00:00
Giel van Schijndel 65a3ff6a8b perform endian swapping for MSG_PLAYER_INFO messages;
NOTE: reverting r3669 (or re-applying r3643) would be better, though unfortunately it doesn't work...

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3729 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 18:29:58 +00:00
Per Inge Mathisen e11b841e68 Clean up scrSetScrollParams and remove assert that scroll limits must be within
visible limits (drawn map). Make droidOnMap ignore droids from mission lists with
deliberately invalid coordinates.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3728 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 16:10:10 +00:00
Per Inge Mathisen 938d210390 Fix silly typo in previous commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3727 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 14:30:33 +00:00
Per Inge Mathisen 8dc285468b Add a hack to display the vlid options available for the --game command line
parameter when an invalid option is specified.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3726 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 14:29:44 +00:00
Per Inge Mathisen 2f80c51cc8 Set died field correctly to NOT_CURRENT_LIST for mission droids to avoid
assertion failures when loading campaign maps directly. Also remove more
unused code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3725 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 13:56:05 +00:00
Per Inge Mathisen 5cd4bc634c Remove some unused code. Add readability. Sprinkle some LOG_SAVEGAME calls.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3724 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 13:45:14 +00:00
Per Inge Mathisen ac65ebfdfc Improve mission code readability.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3723 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 11:17:34 +00:00
Per Inge Mathisen 67d38b5298 Remove the overzealous asserts responsible for bug #970. In any case - if we are to
check that droid direction is less than 360, change CHECK_DROID() instead.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3722 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 10:27:54 +00:00
Per Inge Mathisen 679e877302 It is not a problem that we cannot find an assembly point for a destroyed factory,
it could just be that we use a commander instead. So don't assert it. Also make
sure we clear out the commander info before the assembly reference, or it will crash.
This fixes bug #11000 reported by Silvence <skellr>.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3721 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 22:45:55 +00:00
Per Inge Mathisen 6c179bb935 pie2wzm: Fix division by zero error introduced in the previous commit to it when
a mesh has no animation.
wzmviewer: Press '+' to cycle through animations or team colours. F1/F2 to 
enable/disable polygon culling. F3/F4 to enable/disable wireframe mode.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3720 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 18:43:21 +00:00
Per Inge Mathisen 54bcf0cde5 Remove completely mistaken comment from the original code. Textures use
0 to 256 range of texture coordinates, and the width of the texture should
therefore not be used to deduce wrap around point for texture animation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3719 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:58:37 +00:00
Per Inge Mathisen 05a6223814 pie2wzm: Remove output parameter - generate output filename automatically.
Add cmdline option to not guess team colour and force animation instead.
Add support for texture animation that wraps around the edge of the texture.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3718 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:55:15 +00:00
Dennis Schridde 057ee3e55e Properly disable drive mode when going into an intelligence-report.
Also some initial effort/stub for manual targeting. (Not yet enabled.)
Driving (drive.h) should go out of src/seqdisp.c if somehow possible...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3717 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 11:05:31 +00:00
Per Inge Mathisen baed19b3b0 wzmviewer: Fix bug when reading in multi-mesh files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3716 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:54:57 +00:00
Per Inge Mathisen 49e97ae793 Add a very simple model viewer application for the WZM format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3715 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:38:49 +00:00