491b968833
* Make cdAudio_PlayTrack work with an enum instead of "magic numbers"
...
* Use this enum's values throughout the src/* code
* Replace scripting function playCDAudio(int) by playIngameCDAudio() which is equivalent to cdAudio_PlayTrack(playlist_ingame)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:46:55 +00:00
8fe5f93991
Add a workaround/hack to prevent starting of new songs when we switch playlists
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3686 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:35:34 +00:00
1513ac41e2
Because g_apTrack's size is determined on compile time don't allocate it dynamically but statically
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3678 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 12:25:18 +00:00
cdb9b7bacc
Properly wrap the dummy reference. This issue does not only exist on the Mac and was fixed wrongly in r3659.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 21:38:43 +00:00
8a03980819
Bump version number of Debian package so that it gets priority over the package in unstable
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3670 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 20:23:32 +00:00
6d27eabf88
Revert r3643; this fixes #7
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3669 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 20:19:52 +00:00
70d7e095f0
When bailing out of packet decoding make sure to call NETend()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3668 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 17:46:03 +00:00
208a399d73
Turn an ASSERTion into a debug(LOG_NET, as is not safe to simply assume that a player ID is correct (and as such we cannot just ASSERT on it)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3667 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:58:48 +00:00
748adec208
Use network byte order for struct unpacking on the lobby server (rather than native byte ordering)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3666 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:51:56 +00:00
4a77f3d8b0
Use NETsendGAMESTRUCT and NETrecvGAMESTRUCT to send & receive GAMESTRUCTs endian safe
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3665 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:39:49 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dennis Schridde
Freddie Witherden
Gerard Krol
Ari Johnson