Commit Graph

2936 Commits (730ef63107ff24c548681a78759021b9e565e22c)

Author SHA1 Message Date
Giel van Schijndel 730ef63107 Add functions NETsendGAMESTRUCT and NETrecvGAMESTRUCT to deal with sending & receiving of GAMESTRUCTs in an endian safe way
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3664 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:39:46 +00:00
Giel van Schijndel fb83d6fc8a Rework pickADroid so that it uses a while-loop instead of tail recursion to find a player for which we're responsible to handle droid synching
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3663 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 15:40:36 +00:00
Giel van Schijndel 459254f306 Update netlog.c's packetname list for r3661
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3662 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:42:02 +00:00
Giel van Schijndel 0c7ade394d * Remove message type MSG_PLAYER_DATA as it sends/receives void* data chuncks which is __not__ endian safe (not to mention struct padding)
* Don't maintain player stats in lib/netplay/netplay.c; instead maintain them in src/multistat.c
 * Add a new net message type (NET_PLAYER_STATS) to exchange player stats


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3661 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:39:31 +00:00
Giel van Schijndel 4354be1e75 Put the "System Net Messages" in an enum rather than #defining them with custom numbers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3660 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 14:39:12 +00:00
Giel van Schijndel e7abee3ced Don't use the OggVorbis callback hack when compiling on the Mac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3659 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 13:47:48 +00:00
Freddie Witherden bbb23a8027 Commit patch #958 by Buginator. This fixes single player (campaign) games.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3658 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 18:29:27 +00:00
Dennis Schridde b7e36a5b77 Require devpkg to be in ./devpkg/ for msvc.
This saves the trouble of having to edit the paths for lib/include dirs and enables us to have the FlexBison.rules there, too.
Thus FlexBison.rules is removed and to be found in the msvc devpkg from now on.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3657 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 18:17:58 +00:00
Giel van Schijndel 32863ae12a Remove unused net message types and function declarations which have no implementation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3651 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 15:13:34 +00:00
Giel van Schijndel 92bc594493 Remove networking message NET_VERSION (used by (send|recv)VersionCheck); as the functions that used them didn't actually do anything
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3650 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 15:04:08 +00:00
Giel van Schijndel 56c5b3bdab Move MSG_JOIN over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3649 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:24 +00:00
Giel van Schijndel cff2a7b279 Move MSG_PLAYER_LEFT over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3648 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:20 +00:00
Giel van Schijndel 9ca2e82364 Move sending & receiving of MSG_PLAYER_JOINED and MSG_ACCEPTED to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3647 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:17 +00:00
Giel van Schijndel 26844585f8 Move sending & receiving of MSG_GAME_FLAGS over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3646 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:13 +00:00
Giel van Schijndel b76b958bb7 Move sending & receiving of MSG_PLAYER_DATA over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3645 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:08 +00:00
Giel van Schijndel d9c154c970 Rework resize_global_player_data to work with realloc instead of of a combination of malloc and free
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3644 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 14:45:04 +00:00
Giel van Schijndel 9926852390 Port NETBroadcastPlayerInfo over to the new netcode API
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3643 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 13:04:32 +00:00
Gerard Krol ba8daddd8d Makes sure the camera position and rotation is again saved & loaded. The distance is not, but this would need changing the save game format. The
initial height is again a fixed value, instead of relative to the terrain height.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3633 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 22:15:55 +00:00
Giel van Schijndel aafbc90945 Don't use C99 variable struct members
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3632 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 22:12:25 +00:00
Giel van Schijndel 7c204a47ac Change file-specific comment in Doxygen comment
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3631 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:56:02 +00:00
Giel van Schijndel 6e74be4df9 Use C linkage for frameresource.h and debug.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3629 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:26:37 +00:00
Giel van Schijndel 07359499ab Don't define our own custom implementation when compiling with g++ either
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3628 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:01:23 +00:00
Giel van Schijndel 6ddb4af1d5 Clean up header files of sound library:
* Change file-specific comments into Doxygen comments
 * Remove a whole load of unused and unnecessary macros
 * When compiling as C++ make sure to use C linkage


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3627 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 20:43:11 +00:00
Giel van Schijndel fe397ef7f9 In function _addLoadSave check for ".extension" instead of "extension" to find matching filenames
This fixes bug #10936
Patch #957 by Buginator; changed by me to use sasprintf instead of sprintf on a statically sized buffer (i.e. no potential for buffer overflows)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3619 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 13:56:54 +00:00
Giel van Schijndel 7e270b0010 * Add the shortcut keys (F1, F2, F3, F4 and F5) to the tooltips for the reticule buttons
Patch #950 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3618 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 13:32:33 +00:00
Giel van Schijndel a323c83e7c * Don't use EOF for end-of-string detection; use '\0' instead
* Patch #959 by Michel Dänzer (in Debian bug 458733), modified by Paul Wise <pabs>
 * Don't cast a variable of type char to char...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3617 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 12:59:42 +00:00
Ari Johnson 846fb926dd Update to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3616 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 02:38:02 +00:00
Freddie Witherden 71cc50ccf1 Set the default lobby server port to 9997. This prevents 2.0.x gamers joining 2.1/SVN games by mistake and vice-versa.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3615 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-31 22:55:46 +00:00
Dennis Schridde 97d217b0b4 Add Don Edwards, who created the earth textures Hatsjoe used in his backdrops. (As requested by Don Edwards.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3614 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-31 00:29:16 +00:00
Giel van Schijndel f558eb0d61 Revert unintentional part of r3612
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:39:31 +00:00
Giel van Schijndel 4f93b03142 Make function-pointer array pLoadFunction a local (but still static) array instead of global
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:38:05 +00:00
Giel van Schijndel 8c06eaaad7 * Cast enums to target enums before assigning them
* Cast enum pointers to target type rather than just assigning them


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3611 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:35:13 +00:00
Giel van Schijndel ecd9c26df9 Rename boolean variable 'new' to 'isNew'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3610 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 22:52:00 +00:00
Giel van Schijndel 01028698a9 Remove redundant 'struct' from g_imd's declaration
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3609 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 22:50:08 +00:00
Giel van Schijndel 1583591262 * Don't use tabs for lining things out in columns (use spaces instead, tabs are for indentation only)
* Make every comment describing a structure field or enum-item a Doxygen comment


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3608 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 22:03:59 +00:00
Giel van Schijndel ef3d1f5c92 Fix compiling on MSVC; patch #955 by Buginator, slightly modified by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3607 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:44:12 +00:00
Giel van Schijndel 6c654afea3 * #include basedef.h and statsdef.h where we use it
* Don't use tabs for lining things out in columns (use spaces instead, tabs are for indentation only)
 * Make every comment describing a structure field or enum-item a Doxygen comment
 * Add some additional strings to CHECK_OBJECT to be displayed upon assert-failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3606 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:38:32 +00:00
Dennis Schridde 8d34975fd3 Add license on FlexBison.rules.
Moving it to devpkg would be prefered if possible. If someone can test whether that is possible...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3605 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:34:55 +00:00
Giel van Schijndel 0185827de0 * #include droiddef.h in cmddroiddef.h as we use some of its contents there
* Don't use tabs for lining things out in columns (use spaces instead, tabs are for indentation only)
 * Make every comment describing a structure field or enum-item a Doxygen comment


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3604 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:09:55 +00:00
Dennis Schridde 8e7e72ef36 Correct the license for pepperpot backdrop, and add cathuria's full name.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3603 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 20:44:07 +00:00
Giel van Schijndel f3bf740ecd * #include basedef.h in projectiledef.h as we use some of its contents there
* Don't use tabs for lining things out in columns (use spaces instead, tabs are for indentation only)
 * Make every comment describing a structure field a Doxygen comment


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3602 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 20:43:15 +00:00
Giel van Schijndel f22d4e100b Define BASE_OBJECT in terms of SIMPLE_OBJECT (i.e. reflect the fact that BASE_OBJECT "derives" from SIMPLE_OBJECT in BASE_OBJECT's definition)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3601 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 16:27:11 +00:00
Giel van Schijndel ad5e3cf920 * Remove unused macro-constant TURRET_ROTATION_RATE
* #Include lib/ivis_common/pievector.h in basedef.h as its contents are being used there


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3600 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 16:17:32 +00:00
Giel van Schijndel da53f3b608 Remove unused PREVOBJ macro
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3599 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 15:37:39 +00:00
Giel van Schijndel ccfcd0c7fb * Add a Doxygen \file directive to the definition header files, defining objects "derived" from BASE_OBJECT
* Make header guards of these files more consistent:
  * Make them match with the file's name where they didn't match before
  * Place the header guard's name in a comment at the #endif part of the header guard
  * Use a __INCLUDED_filename__ style for them
 * Replace some mixed indentation styles (spaces + tabs) with tabs only for indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3598 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 15:19:02 +00:00
Giel van Schijndel 7c1614ab40 * Add the copyright owner of 07-bdrop.png to COPYING.README
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3597 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 14:48:32 +00:00
Giel van Schijndel 2b59e6840d Add a Doxygen parameter description to sound_PlayStreamWithBuf for fileHandle, volume, onFinished and user_data
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3596 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-29 13:05:38 +00:00
Dennis Schridde 4395c5972d The result from the non-wrapping, multiline source-refs commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3595 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 23:02:13 +00:00
Dennis Schridde d6ad58138c Make xgettext and msgmerge output strings as one, but sourcecode references on a seperate line each.
(a: easier to read, b: possibly less noise on line number changes)
I introduced MSGMERGE_OPTIONS to Makefile.in.in and set it to --no-wrap --width=1 to enforce that.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3594 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 23:01:21 +00:00
Dennis Schridde 1d364f9f23 update-po and again run de.po through poedit (I have to find out which options that uses to generate the file...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3593 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 22:34:11 +00:00