Commit Graph

3002 Commits (160afd4e7a10b65284e6036ea27584fa1e1263b9)

Author SHA1 Message Date
Giel van Schijndel 6c886470ad * Rename the MSVC snprintf and vsnprintf replacements to wz_snprintf and wz_vsnprintf respectively to prevent conflicting definitions
* #define snprintf and vsnprintf to wz_snprintf and wz_vsnprintf respectively
Thanks to Buginator for pointing out the issue in patch #937; the solution is different than his though


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3447 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 11:14:15 +00:00
Giel van Schijndel 592155a788 * Check wether WZ_CC_MSVC is defined, not wether WC_CC_MSVC is defined
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3446 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 11:04:49 +00:00
Per Inge Mathisen 4aba4facca Fix bug in commit r3440, see discussion in patch #931. Reported by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3445 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 00:18:49 +00:00
Per Inge Mathisen e5e64113ea Simplify clparse.c by removing unused and/or unusable commands.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3444 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 18:12:22 +00:00
Per Inge Mathisen be80c7b4b2 Cleanup and doxygenize path-finding code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3443 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 18:04:39 +00:00
Per Inge Mathisen 04d0562712 Clean up mapgrid code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3442 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 16:35:50 +00:00
Per Inge Mathisen 1ae6d69a98 Remove outdated TODO file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3441 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 16:18:14 +00:00
Per Inge Mathisen 167dd1742c No longer store player name in STA files, since it is already in the filename.
See patch #931 for discussion. Problem with spaces in player name reported by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3440 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 16:06:37 +00:00
Per Inge Mathisen 437e22e817 Fix savegame path problem introduced in r3431 and patch #928 which made
us save savegames in the music directory(!).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3439 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 16:01:00 +00:00
Per Inge Mathisen 49cc91b0ef Move all skybox page handling to display3d.c to prepare for skybox scriptability.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3438 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 15:10:02 +00:00
Dennis Schridde 13ccc44599 Import another one of Hatsjoe's nice backdrops: Satelite over earth: http://forums.wz2100.net/?topic=1295.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3437 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 12:22:32 +00:00
Freddie Witherden e1b75888e3 Fix the prototype of recvGift so that it is (void) as opposed to ().
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3436 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 11:09:43 +00:00
Freddie Witherden afd095f227 Commit patch #918 by Buginator which ports send/recvTemplate over to the new netcode API.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3435 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 11:07:41 +00:00
Per Inge Mathisen d8bada015f Remove some dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3434 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 23:20:22 +00:00
Per Inge Mathisen 3a62462ea2 Remove unused defines in movement code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3433 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 23:09:01 +00:00
Per Inge Mathisen 5b1ec5cfc1 Add new debug mechanic: objTrace(). It works like debug(), but also takes an object parameter.
Debugging info given with it will only be displayed for the enabled game object. Default key
to enable debugging info for a game object is CTRL+L. Converted LOG_MOVEMENT to use it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3432 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 22:45:04 +00:00
Per Inge Mathisen f246839359 patch #928 ported map send/rev to new netAPI by Buginator with style fixes by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3431 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 21:39:41 +00:00
Freddie Witherden bed018a8b0 Commit patch #925 by buginator along with some style changes by myself.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3430 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-11 20:17:39 +00:00
Per Inge Mathisen 2cd496d9c7 Remove unused defines, prettify animation code a bit, and use same electronic
warfare effect code for all objects - the one which does not modify individual vertices.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3429 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 22:18:20 +00:00
Per Inge Mathisen 7b81b5c76f Fix some ugly shadowing and reuse of variables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3428 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 17:50:40 +00:00
Giel van Schijndel 236ed6d904 * Provide sane defaults for the screen resolution (which is used when the screen resolution isn't fully specified or has zero as it's width or height, during loading)
Inspired by patch #930 by Buginator (his patch only used sane defaults during configfile saving, this changeset instead works during loading)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3427 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 10:33:59 +00:00
Giel van Schijndel 9f70f97cc0 * Rename sendBeaconToPlayerNet to sendBeacon
* Port (recv|send)Beacon over to the new networking API
Patch #924 by Buginator and some modifications by me


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3426 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 23:50:44 +00:00
Giel van Schijndel 69f87c9bed * Port the NET_PLAYERRESPONDING functions over to the new networking API
Patch #932 by Buginator with some stylistic changes by me


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3425 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 23:42:35 +00:00
Giel van Schijndel 7560894e4c * Port the NET_LEAVE messages over to the new networking API
* Provide an implementation for the NET_KICK messages (in the new net API of course)

Patch #922 by Buginator with some modifications by me


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3424 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 23:30:42 +00:00
Giel van Schijndel 73d329fde8 * Fix a magic number (28) supposedly representing enum value NET_LEAVING (which is 18)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3423 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 23:07:36 +00:00
Giel van Schijndel 387b65ba65 * Apply what's left of patch #904 by Buginator (add a comment it contains)
* And modify a variable to an unsigned int (instead of a UBYTE) as we don't need no size guarantee there


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 22:55:42 +00:00
Giel van Schijndel ee131441e6 * Port structure.c over to the new netcode API
Patch #902 by Buginator with some minor changes by me


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3421 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 22:42:14 +00:00
Dennis Schridde bbbd4942fe Move the deps of our deps to the right of our deps...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3419 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:51:48 +00:00
Dennis Schridde e7ed93d5f9 - Move libraries to satisfy our dep's deps out of the PLATFORM choice, since they would be the same for windows and mingw32.
- Link against GLC instead of glc32 for windows, since that is what the devpkg contains.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3418 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:26:29 +00:00
Dennis Schridde f6a9f7c864 - Link against all required libs for PLATFORM=windows (How shall mingw32 be treated? Does make's syntax allow an OR? Then we could unify them again...)
- Remove -L. for mingw32, since libdbghelp.a is now included in the devpkg.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:23:23 +00:00
Giel van Schijndel 26699ed15d * Change the bugtraq:* properties on the entire trunk directory tree to use http://trac.wz2100.net as its bugtracker
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3416 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 16:45:25 +00:00
Giel van Schijndel 30b9c1d6b1 Fix two Doxygen errors:
* parameters `weaponClass` and `impactSide` of featureDamage() didn't have a description
 * parameter `subType` was wrongly referrered to as `type` of function sendMultiPlayerFeature

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3415 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 12:18:36 +00:00
Dennis Schridde ca607873eb Correct include paths for Makefile.raw:
- Include include/ after any other dir
- Add include/libpng12 to the paths


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 23:01:54 +00:00
Dennis Schridde 85a241f5f7 In Makefile.raw use $(RMF) and _not_ $(RM) to delete stuff.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3413 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 22:32:24 +00:00
Per Inge Mathisen f7fbf845c0 Small cleanup to animation code, and fix copy&paste typo in 3ds2pie.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 21:58:05 +00:00
Giel van Schijndel 691f3640aa * Change the bugtraq:* properties on EditWorld's directory tree to use http://trac.wz2100.net as its bugtracker
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3411 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 18:03:51 +00:00
Giel van Schijndel 28f40cd637 * Initialise CBrushProp's member variables in the constructor's initialisation list instead of its code-body
* Rename some private member variables: s/m_\([^\s]\+\)/_\1/g

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3410 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 18:01:03 +00:00
Gerard Krol 0c5fff97b5 Patch by Kelly Anderson: Subtile changes to allow for building outside the source tree.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3406 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 13:24:25 +00:00
Giel van Schijndel c044483685 * Add doc/code to the ignore list since that's the directory where Doxygen puts its documentation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3405 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-07 21:42:14 +00:00
Per Inge Mathisen 505e451f31 Patch #916 by Buginator to save number of games played, with style changes by me.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3404 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-07 20:49:01 +00:00
Per Inge Mathisen 5657b38ef0 Hopefully fix bug that would lock fps setting to defaults.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-07 20:48:29 +00:00
Giel van Schijndel e811ab6c89 * Fix a compile error (needed to use OR '|', not a comma ',')
* Fix a warning due to the strange WinAPI (needs a char* but uses it as a char**)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 23:46:44 +00:00
Giel van Schijndel 0245c21866 * When PhysicsFS fails to retrieve the home/user directory fall back to using the current working directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3401 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 23:40:24 +00:00
Freddie Witherden 9099584718 Fix a bug introduced in r3339, thanks to Buggy for the heads up.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3400 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 22:44:42 +00:00
Giel van Schijndel dfc4e101ad * When cheating ourselvs new features & droids (in the CTRL+O debug menu) make sure to notify other hosts & players of this
Patch #920 with some modifications by me to make it compile and slightly simpler


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3399 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 21:55:23 +00:00
Giel van Schijndel 53abc0a73b * Correctly fix "clever" use of malloc __without__ introducing a memory leak in the process (r3305 introduced one)
* Make sure we use the same signdness in IMAGEDEF as we did before r3302
 * Use a correct format specifier ("%u") for printing an unsigned integer
 * Turn a bunch of UDWORDs which don't necessarily need to be UDWORD into unsigned ints as one of those __does__ need to be an unsigned int (i does, for the printf format specifier)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3398 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 21:21:31 +00:00
Giel van Schijndel 12ea06d1b6 * Remove the IMG -> XML convertor script as the IMG format has been changed to CSV in r3302
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:53:45 +00:00
Per Inge Mathisen eeb1c6832c Add a number of options to the 3DS to PIE converter. It can now successfully import
3DS models made in 3DS Max to Warzone.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3396 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:26:15 +00:00
Giel van Schijndel efda8508f6 * Replace pointer psFormation (which was used as a bool) from SAVE_MOVE_CONTROL and replace it with BOOL isInFormation
* This should make the saving & loading of mdroid.bjo, droid.bjo, munit.bjo, unit.bjo & limbo.bjo portable accross 32bit & 64bit platforms
  * This __will__ break current savegames though
 * Add functions SaveDroidMoveControl and LoadDroidMoveControl for saving&loading the SAVE_MOVE_CONTROL data

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3395 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:23:01 +00:00
Giel van Schijndel f9d4dc0a6d * Remove unused (and empty) droid.bjo file for map Rush
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3394 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:18:34 +00:00