Commit Graph

1360 Commits (199adccc0a03027a6076a5da3994ac2ba70bf566)

Author SHA1 Message Date
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
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
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 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
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 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 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 411545852f Cleanup
- theSun becomes static (+setter/getter)
- normalsOnTile() doesn't use global vars anymore
- pie_SurfaceNormal3fv() now works more like the pievector.h functions
- pie_SurfaceNormal3fv() was cleaned up and became inline function in piematrix.h
- Use more pievector.h functions
- Remove unnecessary multiplications/divisions from calcTimeIllum()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 01:29:20 +00:00
Dennis Schridde 06a3b11a62 Revert r3588. I already did that in r3586.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:51:21 +00:00
Dennis Schridde 7f3c67175c Comment FP12
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:43:26 +00:00
Giel van Schijndel 7cf72b6fea #include <math.h> and "lib/framework/math-help.h" where required
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:29:19 +00:00
Dennis Schridde 751d0809c5 Use new VectorX_Compare instead of old VectorX_compare which I'll remove shortly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3587 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:27:21 +00:00
Dennis Schridde 9f9c417240 Include lots of forgotten math.h and roundf() is included in C99.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3586 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:22:02 +00:00
Dennis Schridde 76fddad000 Generic cleanup. Mostly remove struct keyword where unnecessary.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:02:28 +00:00
Giel van Schijndel b3a3cecaed Rename fractions.h to math-help.h and remove most junk from it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3584 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:01:37 +00:00
Giel van Schijndel e5885934b7 Utilise sound_PlayStreamWithBuf in cdAudio_OpenTrack to specify a larger buffer count
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3583 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 23:34:25 +00:00
Giel van Schijndel 024c8c1c10 Add function sound_PlayStreamWithBuf to allow specifying custom buffer counts and sizes to use for a stream
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3582 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 23:32:55 +00:00
Giel van Schijndel 6d99a49ef4 Use the sound_.*Stream functions to implement the cdAudio aka playlist code instead of custom crafted code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3580 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 22:31:16 +00:00
Dennis Schridde c399050b62 Enhance Vector class with some more normalisation, comparison, etc.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3579 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 22:21:15 +00:00
Giel van Schijndel f880720628 Implement sound_StopStream, sound_PauseStream and sound_ResumeStream for stopping, pausing and resuming of playing streams initially created with sound_PlayStream
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3578 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:33:10 +00:00
Giel van Schijndel 6de5602631 * Make sound_PlayStream and audio_PlayStream return a AUDIO_STREAM* pointer instead of a bool
This pointer can later on be used to stop, pause & resume playing of the given stream


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3577 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:28:35 +00:00
Per Inge Mathisen e0b92752db Constify some piematrix functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3576 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 21:05:30 +00:00
Per Inge Mathisen 895ba1c8cd Make less of piematrix.c globally exported.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3575 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 20:57:26 +00:00
Per Inge Mathisen 75c77a4af4 Make drawing code less convoluted and store less state in tileScreenInfo.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3573 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 18:47:08 +00:00
Giel van Schijndel 301c7f64f5 Assume G++ has a proper vsnprintf and snprintf implementation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 16:34:39 +00:00
Per Inge Mathisen 15a22f8724 Remove unused netplay macros
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3558 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 13:45:03 +00:00
Per Inge Mathisen 3a6bfab317 Fix more problems with tabs in the GUI, patch #949 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3543 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 20:11:10 +00:00
Dennis Schridde 2d29dc2191 Replace runtime code_part_names size checking by counting with a STATIC_ASSERT on its size.
Additionaly:
- Introduce ARRAY_SIZE macro
- Use code_part instead of int where applicable


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 16:03:58 +00:00
Dennis Schridde cbccd3336c Revert r3537, as it may not be safe on all compilers...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3538 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 15:47:20 +00:00
Dennis Schridde d2370600d8 Replace code_part_names() with code_part2string(), which gets us rid of having to check that the array size matches the enum on runtime.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3537 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 15:41:21 +00:00
Dennis Schridde 2ff72516fd idx -> index
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3534 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 23:08:17 +00:00
Dennis Schridde 86be7e0389 PRINT_B macro -> bool2string function
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3533 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 23:03:04 +00:00
Dennis Schridde 664507be0d Minor beautification of error messages.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3532 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:44:24 +00:00
Dennis Schridde 463aaf53d1 Make TF_ERROR into a readable function.
- tagGetErrorString is not provided anymore, all output goes directly to LOG_ERROR.
- The trace contains some more information.
- ASSERT()s in the unit test were removed. The output is already done by TF_ERROR where needed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3531 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:33:41 +00:00
Dennis Schridde f3296ee96b struct define -> struct _define and define_t
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3530 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 22:19:15 +00:00
Per Inge Mathisen fec3b1ca08 Indexed colour usage has been eliminated, so remove its support code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3529 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 17:06:31 +00:00
Per Inge Mathisen 921ab82191 Clean up GUI frame drawing and port it to PIELIGHT.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3528 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 16:57:00 +00:00
Dennis Schridde 17b7ffa3f9 Remove dbghelp.h. And update version (wine-0.9.53) is now included in the mingw32 devpkg.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3527 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 00:23:14 +00:00
Ari Johnson d075817fce Fixed a typo in the #warning for GLC_TRIANGLE
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3525 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 23:48:00 +00:00
Per Inge Mathisen b9bcbad34c Port scores code to use PIELIGHT.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3524 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 23:01:13 +00:00
Per Inge Mathisen df19674baf Save gateways and zones in tagfile format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3513 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 16:52:51 +00:00
Freddie Witherden 4b072b28f7 Commit patch #942 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3506 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-19 18:23:14 +00:00
Per Inge Mathisen 579e2e428e String code cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3498 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 19:07:15 +00:00
Per Inge Mathisen 08c2a06822 GUI cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3497 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 18:54:16 +00:00
Dennis Schridde b422209c9a Rename range() to wrap() and warn about unused results.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:15:13 +00:00
Dennis Schridde ff34e1fb68 Introduce new functions range() and rangef() to clip a value into a certain range.
Use that to cleanup some code.
Because of the lack of a local "math.h", it went into trig.h.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3483 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:02:54 +00:00
Dennis Schridde 31a863a90b Setup eol-style CRLF for vcproj files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 20:49:48 +00:00
Dennis Schridde 1c44cf8568 path #938 by Bugginator: MSVC projectfile updates. You need the static libraries from http://download.gna.org/warzone/development/devpkg/2.1/msvc80/ now.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3472 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:57:50 +00:00
Dennis Schridde d7bbab46af Set eol-style and mime-type for vcproj files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3471 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:55:59 +00:00
Giel van Schijndel d938ed3946 * Check wether we're compiling as C99
* if not #error about requiring a C99-compliant snprintf & vsnprintf implementation

NOTE: This doesn't affect MSVC as I've already provided a C99-compliant implementation for it


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3449 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 13:53:00 +00:00
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
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 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
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
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
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
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
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 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
Per Inge Mathisen 441f4038e4 Replace a ton of custom texture clipping code with a single call to OpenGL scissor test.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3380 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 14:05:13 +00:00
Per Inge Mathisen bfb542e69e Remove unused animation defines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3377 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 12:12:26 +00:00
Giel van Schijndel a2fe74852b * Fix some errors in the Doxygen documentation
* Parameter descriptions for non-existing parameters removed
  * Wrong parameter names renamed/fixed
  * Syntax errors in passing the a parameter to a Doxygen command at the wrong location
  * Prevent HTML interpretation of some comments

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3373 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 23:42:54 +00:00
Dennis Schridde b03ab065f9 Fix breakage from r3367: Soundfilenames were forgotten to be changed inside the sourcecode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3370 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 22:09:56 +00:00
Per Inge Mathisen ae19f5bd54 Move PHYSFS_APPEND and PHYSFS_PREPEND macros to lib/framework/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3354 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 14:50:16 +00:00
Per Inge Mathisen eddebc7f81 Move some initialization code from src/ into lib/framework
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3353 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 13:50:34 +00:00
Ari Johnson 55ecef381b Fixed error message
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3350 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 00:22:23 +00:00
Ari Johnson e424aed624 Added /* */ around a comment to permit Warzone to compile again
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3349 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 00:06:40 +00:00
Giel van Schijndel d249ac2188 * By default perform truncation detection in strlcat and strlcpy (i.e. return the length that would be the resulting length if no truncation occurred)
* Add a Doxygen comment for strlcpy & strlcat

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3348 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 23:16:29 +00:00
Giel van Schijndel 65961cbb45 * Use a variable to store the tagfile unittest definition files' names in (rather than copy-pasting those in the tagOpenRead & tagOpenWrite calls)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 20:01:54 +00:00
Giel van Schijndel 34d26a6719 * Don't do "if (ptr != NULL) { ... } if (ptr == NULL) { ... }" instead use an if-else construction: "if (ptr != NULL) { ... } else { ... }"
* Use slcatprintf instead of snprintf into a local buffer (on the stack) followed by concatenating to our target string

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3345 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 19:11:16 +00:00
Giel van Schijndel 87a55581f0 * Move the tag definition files over to data/tagdefinitions and move the savegame definitions into data/tagdefinitions/savegame
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3343 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 16:10:51 +00:00
Giel van Schijndel e722d7ec39 Add some more comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3340 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 15:12:01 +00:00
Giel van Schijndel f3499cc232 Replace asserts on invalid tags with CHECK_TAG_INVALID
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3339 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 14:59:19 +00:00
Freddie Witherden 9a312a7991 Commit the second part of patch #913 which removes (the defunct) AUDIOMSG system.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3335 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 13:38:19 +00:00
Giel van Schijndel 1d83be8064 * s/tagWriteSeparator/tagWriteNext/g for consistency's sake (to match the tagReadNext function, which is the reading equivalent)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3334 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 13:37:42 +00:00
Freddie Witherden daad83d316 Make NETend(); return TRUE when we are finished decoding.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3331 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 10:32:59 +00:00
Giel van Schijndel 48f32faccf * Add function resGetNamefromData which complements resGetNamefromData and allows you to retrieve the resource ID (usually filename) for a resource (IMD, IMG, TEXPAGE, WAV, etc.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3324 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:35:57 +00:00
Giel van Schijndel b60b1b121c * Use const-correct functions for the tagWrite.* stuff
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3322 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:30:17 +00:00
Giel van Schijndel 785eb69c8b * Add a forward declaration for tagReads32v into tagfile.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-03 00:29:10 +00:00
Per Inge Mathisen 2ca1351c13 Add another field to the IMG csv files that describe what it does.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3314 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-02 19:15:45 +00:00
Per Inge Mathisen dc7a84da62 Log droid death and packet source. Beware: This will make net games incompatible
between before and after this commit.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3311 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-02 17:08:29 +00:00
Per Inge Mathisen bb660a0a02 Fix "clever" use of malloc that made MSVC (correctly) complain about assumed size of void.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3305 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 22:13:27 +00:00
Per Inge Mathisen 168a66b89c Add another backdrop by cathuria.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3303 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 21:40:04 +00:00
Per Inge Mathisen 52cca82fb2 Change the binary IMG files into CSV text files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3302 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 21:33:47 +00:00
Dennis Schridde 3f6b52bef1 src/game.c: Minor beautification.
configure.ac: YY_NO_INPUT prevents Flex from defining input(), which we do not need, since we use our own YY_INPUT instead. Maybe we should use Flex's function instead?
lib/script/script_parser.y: scriptStoreVarTypes() was defined but never used.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3300 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 15:18:25 +00:00
Giel van Schijndel 30d837ec90 * Allow compilation on MSVC again
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3285 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 21:55:02 +00:00
Per Inge Mathisen eecbccbfb4 Encapsulate time adjustment of value increments in the code and try to
document the time code better.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3282 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 18:37:20 +00:00
Per Inge Mathisen 37260b7c2e tagfile: Allow the specification of an undefined length string in a definition file by
making the defined length zero.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3281 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 17:38:04 +00:00
Giel van Schijndel 3d245df0f9 * Provide an implementation of sound_PlayStream
* Modify audio_PlayStream's prototype to match sound_PlayStream's implementation & prototype
 * In cdspan_PlayInGameAudio use sasprintf instead of a statically sized array and snprintf
 * Add some Doxygen comments

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3276 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:16:59 +00:00
Giel van Schijndel 06649908ff * abort() when out of memory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3275 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:02:29 +00:00
Per Inge Mathisen a4972d3d38 Reduce verbosity of LOG_3D
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3273 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 14:04:21 +00:00
Giel van Schijndel de264ad804 * Remove yet some other useless sounds: ID_SOUND_HELP, ID_SOUND_BARB_SCREAM2, ID_SOUND_BARB_SCREAM3
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3270 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 12:02:18 +00:00
Giel van Schijndel f2118ec871 * Remove cheat "no faults"
* Remove sound scream4.ogg (ID_SOUND_NOFAULTS) which it triggered (that's the onlything that cheat did: playing that audiofile)
  * All that audiofile contained was a spoken message: "There are no faults, in the renderer, at the moment."


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3266 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 00:28:31 +00:00
Dennis Schridde 9d82dae196 Reduce doubleclick interval from 500 to 250.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3261 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 23:42:44 +00:00
Per Inge Mathisen b4ef4d4349 Add new function attribute WZ_DECL_WARN_UNUSED_RETURN and use it on IdToDroid,
whose return must be checked, and fix one bug already detected by it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 21:44:14 +00:00
Per Inge Mathisen 72281bab96 Document and clean up game timer code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3246 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 18:06:40 +00:00
Dennis Schridde 6134810a78 My most dumb commit ever: Dummy reference vorbisfile.h symbols to prevent warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3233 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 23:24:33 +00:00
Dennis Schridde 5143e3e165 Add MKID macro for dummy symbols.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3232 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 23:21:20 +00:00
Per Inge Mathisen 877ac6456c Add lots of doxygenized comments.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3230 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 22:34:41 +00:00
Per Inge Mathisen 5cca5e2893 Make droid experience a floating point in tagfile format, and add better
error reporting for user errors when they forget to update definition file.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3229 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 19:53:14 +00:00
Per Inge Mathisen 52aa90d200 Fix a few spelling errors, and add a new debug category 'multisync'.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3227 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 17:55:20 +00:00
Ari Johnson 47816967a7 Updated Xcode project and some endian fixes; also changed endian_*() calls
to expand to ((void) (x)) on little-endian systems, so that the compiler
will catch little-endian developers who forget to update the endian_*()
calls when they change the names of structure fields.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:55:34 +00:00
Freddie Witherden 6a338c71ce Use the endian swapping functions provided by SDL.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3201 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 19:29:53 +00:00
Per Inge Mathisen 0c10287938 Add some doxygen documentation for tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3196 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:37:15 +00:00
Per Inge Mathisen f7e7e44329 Add new tagfile method tagRead8vDup which reads an unsigned byte array of unknown
length, allocates a memory buffer for it, and returns it. Not recommended for
general usage.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3193 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:57:22 +00:00
Per Inge Mathisen fae5745233 Remove unused function pie_DrawImageFileID. Rename pie_SetColourKeyedBlack to
pie_SetAlphaTest, and do not enable it while drawing the ordinary terrain.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3189 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:05:37 +00:00
Per Inge Mathisen 2390ed5d63 Remove wrongly set (ie was unused) water xyz for tiles, and fix wrong comments.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3176 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 20:37:33 +00:00
Giel van Schijndel bc66705498 * In Vector3uw explicitly use uint16_t instead of UWORD
* Add a function NETVector3uw to use for passing Vector3uw objects more conveniently over the network

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3173 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 23:36:02 +00:00
Dennis Schridde 248a8cb510 Minor indent
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3170 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:05:15 +00:00
Giel van Schijndel 06dab81c11 * Update Code::Blocks and MSVC project files to complement the cleanup of sequence code in r3162
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3163 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 16:31:51 +00:00
Gerard Krol 58b82f44ad Remove all RPL cruft from the sequence code. The new sequence code can be added to sequence.c easily. Projects will need to be updated.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3162 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:57:29 +00:00
Giel van Schijndel fbf03af195 * Remove macros:
* ROUND: replace by a static inline function (math_round) instead
  * FRACTCONST: this macro just cast both of its arguments to float and then divide the first by the second
  * MAKEFRACT_D: this macro would cast to FRACT_D (which was typedef'd as float but should have been typedef'd as double); so cast to double instead (where required)
  * FRACTmul_D: would cast both of its arguments to FRACT_D and multiply them
  * FRACTdiv_D: would cast both of its arguments to FRACT_D and divide the first by the second
  * MAKEINT & MAKEINT_D (where #defined the same); this macro would just cast to SDWORD (aka "int" or "signed int")

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3152 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 13:57:19 +00:00
Dennis Schridde 09a8e33f61 Rename PACKAGE_MAINTAINER to PACKAGE_DISTRIBUTOR to clarify.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 21:14:02 +00:00
Giel van Schijndel 798d10c6d8 * Guarantee that PATH_MAX is large enough to use as the size for Windows API calls (since with MinGW it is 159 bytes while it should be 160)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3136 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 16:44:36 +00:00
Giel van Schijndel 9fe5736f41 * Remove macro FRACTdiv and all places where it was used (all it did was casting both of its parameters to (float) and dividing the first by the second)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3133 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:37:30 +00:00
Giel van Schijndel ae90bd9c0c * Remove macro FRACTmul and all places where it was used (all it did was casting both of its parameters to (float) and multiply them)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3132 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:29:25 +00:00
Giel van Schijndel aeecc95088 * Remove macro MAKEFRACT and all places where it was used (all it did was casting to (float))
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3131 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 23:13:05 +00:00
Giel van Schijndel 14f2fe750a * Make sure not to use if (incorrect-condition) { ASSERT(FALSE, ...); }; instead use ASSERT(correct-condition, ...);
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3128 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 21:10:51 +00:00
Per Inge Mathisen 08d665fe1c Remove unused palette defines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3121 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 16:55:39 +00:00
Per Inge Mathisen 53aa930d6e Turn IMD min and max dimensions into vectors.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3111 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 17:34:23 +00:00
Per Inge Mathisen 35277a4b82 Temporary fix for bug introduced with commit 3065 that made direct weapons unable to hit. Patch #886 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3108 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:18:37 +00:00
Giel van Schijndel db3d933791 * Add a new cheat/debug-command "showsamples"
* This command will cause the amount of samples in the sound library's queues & lists to be constantly displayed (until turned off) on screen

Patch #887 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3107 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:17:54 +00:00
Giel van Schijndel 29139cc6da * Fix crashes due to failing to call the callback when sounds are removed from the queue/list
Part of patch #887 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3105 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 23:25:32 +00:00
Giel van Schijndel 5c4384623e * Use WZ_DECL_FORMAT for some functions which take printf-like strings
* This enables GCC to check the formatting strings and the types and number of the variable list of arguments passed


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3087 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 19:37:40 +00:00
Ari Johnson 31fc86ee9f Moved a space to match formatting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3085 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 17:22:07 +00:00
Freddie Witherden e9ae19df7b Fix warning about redefinition of MIN/MAX on OS X (as arpa/inet.h also contains MIN MAX macros)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3081 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:32:38 +00:00
Giel van Schijndel f1f1a19be4 * Fix a bug in iV_DrawTextRotatedFv where I used sprintf instead of vsprintf
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3076 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:02:54 +00:00
Giel van Schijndel 88bf925cb8 * Add functions iV_DrawTextRotatedFv, iV_DrawTextRotatedF, iV_DrawTextFv and iV_DrawTextF to draw text with a printf-like syntax to the screen
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3075 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:47:55 +00:00
Ari Johnson 0a9bcf08a3 Xcode project can almost build trunk again. This commit allows the project
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode.  The actual game currently
will not build due to other issues, but this is phase 1.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
Giel van Schijndel eba3731a93 * Put some duplicated code for destroying sound samples in function sound_DestroyIteratedSample
* If in sound_Update() we encounter an error simply destroy the current sample we're working on


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3066 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 20:49:02 +00:00
Gerard Krol 65c56b73e3 Fix an invalid pointer reference in the widget code by making sure that the pointer to the widget currently under the mouse is cleared when the
widget is freed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3064 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 14:33:56 +00:00
Per Inge Mathisen e0c450b415 Remove excess display related code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 12:18:56 +00:00
Per Inge Mathisen 5417afae46 Read tile colour information directly from mapTiles, instead of going through tileScreenInfo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 11:08:23 +00:00
Per Inge Mathisen 0484f5e383 We no longer need .wlight to separately store water colour.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3054 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:21:12 +00:00
Giel van Schijndel 8fcd2410be * Apply the last bit of patch #884 by Buginator (openal_track.c)
* Make sure that sound_GetError and sound_GetDeviceError are useable in WZ_NOSOUND builds as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3053 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 15:11:59 +00:00
Giel van Schijndel d179c09f17 * Fix some errors in openal_track.c; part of patch #884 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3052 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:13:23 +00:00
Giel van Schijndel 456208fcc3 * Update MSVC project files (part of patch #884 by Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3051 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:12:36 +00:00
Giel van Schijndel 22f762a3c3 * Prevent a linker error when compiling with -DWZ_NOUSOUND (sound_RemoveActiveSample was used but not defined)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3050 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 11:43:15 +00:00
Giel van Schijndel 992ee8583a * Fix yet another bug introduced in r3047 (the game would hang in an infinite loop because of failing to increase the iterators)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3049 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:54:28 +00:00
Giel van Schijndel ff44e8c84c * Fix a bug introduced in r3047 (segfault due to failing to check for a NULL pointer)
* Apply patch #879 by Buginator (refactored by me to use less handcrafted code, and more functions instead)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3048 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:47:46 +00:00
Giel van Schijndel 99c55dbf74 * Try to encapsulate knowledge about AUDIO_SAMPLE's internal representation in openal_track.c (i.e. don't use it in client code!)
* Look at sound_StopSample specifically
 * Use a function to manipulate the linked list of audio samples (i.e. get rid of duplicated code)
 * Allow printing of OpenAL vendor, version, renderer and extensions data on multiple debug "channels" to reduce code duplication
 * Add openal_error.[ch] for error detection (and producing debug messages for them!)
 * Add TOSTRING and AT_MACRO macros to macros.h
 * Get rid of some super-nested if-branches where one of them would return (so we don't actually need an else-branch because the function is left anyway)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3047 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:16:03 +00:00
Giel van Schijndel 5f1977c7f6 * Remove #undef WZ_NOMP3 and #define VERSION from config-macosx.h as they're both not needed anymore...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3041 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 21:19:29 +00:00
Dennis Schridde 20050d2a3e Add some more output do debug dumps: The maintainer who created the package.
PACKAGE_MAINTAINER and PACKAGE_VERSION should probably also make their way into the logfile...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3040 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 18:34:30 +00:00
Giel van Schijndel c51bd8ae10 * Get rid of a large quantity of unused parameters
* Turn some signed integers ("int" or "SDWORD") into unsigned integers where it made more sence (and signed integers caused warnings about comparing signed with unsigned integers)
 * At some places cast to an unsigned integer (where the type of the expression is a signed integer but the result of it logically _always_ is an absolute value)
 * Remove unused struct-type EVENT_INIT
 * Convert use of malloc->memcpy->free to one single realloc call (and now make sure to actually check realloc's return value, which wasn't done with the malloc call)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 23:15:46 +00:00
Per Inge Mathisen 6118371c0e Add methods to read/write byte arrays to tagfile format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3036 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:48:27 +00:00
Freddie Witherden 2506b69e1f Add a CLIP macro for culling a value between a min and max value.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3029 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 18:36:07 +00:00
Giel van Schijndel 51c32760b4 * Fix a bug where would free the wrong pointer (thanks to Buginator for spotting it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:35:56 +00:00
Giel van Schijndel cc12f08b1a * Apply patch #879 by Buginator with some heavy modifications by me
* Upon removing BASE_OBJECTs loop through the lists of outstanding AUDIO_SAMPLEs to delete all of those that refer to this BASE_OBJECT


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 22:36:06 +00:00
Per Inge Mathisen 6c4c61fbb7 PIELIGHT fix for map hightlight. Remove use of colours to communicate a boolean value.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3022 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:50:47 +00:00
Per Inge Mathisen da7b96315c Final PIELIGHT changes to the widget code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3021 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:40:26 +00:00
Dennis Schridde c64b565f14 Patch #872 by Buginator. Untested by me since in Bugs we trust. ;)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3020 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 19:10:34 +00:00
Per Inge Mathisen 53f11c391f Add a new vector field to the PIELIGHT union, and send colours to OpenGL
as arrays rather than as individual bytes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3019 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:41:00 +00:00
Per Inge Mathisen 4ee90ba9e3 Adapt radar view to PIELIGHT scheme. The radar colours have been changed a lot, and
we probably need to massage these colours a bit before release. Radar tile colours 
in all but objects only mode are a complicated blend of tile height and colour. Closes
patch #858.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3018 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:23:34 +00:00
Per Inge Mathisen 4ddd4c28af Large PIELIGHT cleanup. Please report bad colours.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3017 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 16:09:23 +00:00
Per Inge Mathisen 63211571b0 New utility function pal_Colour() creates PIELIGHT from RGB values.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3011 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 13:11:09 +00:00
Per Inge Mathisen 76840b01d2 Large PIELIGHT cleanup. Also cleans up tile drawing logic somewhat.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3006 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 00:33:03 +00:00
Dennis Schridde fde3e48eb1 Remove rules which could not ever be matched. The behaviour shouldn't change. If some Lex guru finds a mistake, please tell me. :)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3001 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-08 00:32:51 +00:00
Giel van Schijndel ec392ef7d4 * Improve the quality of the QuesoGLC error messages produced when fonts cannot be loaded/selected
* When we're unable to select a font face give a warning (LOG_WARNING) instead of an error (LOG_ERROR)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2992 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-07 19:31:19 +00:00
Freddie Witherden 299d7bfcfb Commit patch #871
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2983 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 21:56:12 +00:00
Per Inge Mathisen 8d48c5fdd1 Partial conversion from 0.0->1.0 texture coordinate range. For now only terrain
textures are converted. Once they are done, the texture matrix hack is restored.
Thanks to devurandom and cybersphinx for help and previous efforts in this area.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 18:54:17 +00:00
Per Inge Mathisen 4519230af1 Split out CLIP_VERTEX from TERRAIN_VERTEX, since the former usages are not really
related to terrain, and do not need all terrain fields and future changes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 20:25:25 +00:00
Per Inge Mathisen cd91da0caa Add right and left scroll bars to build menu tabs. By Buginator in patch #870 with
some cosmetic fixes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2974 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:47:05 +00:00
Per Inge Mathisen f86858109a Fix texture size warning. It will correctly nag about missing support for 2048x2048 textures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2973 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:29:34 +00:00
Per Inge Mathisen 6da463546f More PIELIGHT fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 16:38:21 +00:00
Giel van Schijndel 9a0eecb753 * Revert accidental commit of exceptionhandler in r2952
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2953 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:03:52 +00:00
Giel van Schijndel 55526401be * Copy over the cross compile scripts from the 2.0 branch to trunk (with necessary modifications)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2952 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:02:45 +00:00
Giel van Schijndel ae79833367 * In vasprintf when we have to produce a zero-length string:
* Assign the resulting pointer to the char** strp pointer
  * Return zero (instead of the pointer)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2948 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:44:29 +00:00
Per Inge Mathisen 4bbf490aca Change the rendering of the normal terrain to use vertex arrays. We still
recalculate everything each turn. See patch #865.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2939 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 17:07:03 +00:00
Per Inge Mathisen afa23e157a Beauty fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2937 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:55:23 +00:00
Dennis Schridde d75b63cdb3 Cleanup water-moving:
- Remove now unnecessary offset parameter from pie_DrawTerrainTriangle
- Move GL code from display3d.c to piematrix.c


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2935 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:43:28 +00:00
Per Inge Mathisen 3dfc90107e Simplify handling and drawing of areas outside the map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2934 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:35:49 +00:00
Freddie Witherden b73b28f191 Revert dodgy removal of trig functions. More testing required
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2904 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-29 23:10:54 +00:00
Freddie Witherden dbcb55414d Remove the pre-computed trig tables system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2903 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-29 22:50:25 +00:00
Giel van Schijndel 263f92f24f * Always clear the colour buffer in pie_ScreenFlip; this should prevent "screen smearing"; hinted by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2901 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-28 21:53:59 +00:00
Per Inge Mathisen 134e31b558 More PIELIGHT fixes. Retire iV_BoxFill. Fix "mission achieved" dialog colours.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2895 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:59:21 +00:00
Per Inge Mathisen 4dd2dfc63d More PIELIGHT conversions. Fix colour issue in load/save dialog.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2894 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:10:31 +00:00
Per Inge Mathisen 13d1607349 Introduce new palette system WZCOL_* for setting the essential game palette.
Change over pie_BoxFill() to PIELIGHT. Fix colour bug when building structures.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2893 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 21:48:36 +00:00
Giel van Schijndel 6c8702a915 * Replace a lot of array indexing code of this form *(array + index) with this form array[index]
* This should be a syntactical change only!
  * I.e. even the generated assembly should be the same, but behaviour should __definitly__ be the same!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2892 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 21:04:42 +00:00
Giel van Schijndel da2f84009b * In addition to the changes of r2853, make passing a NULL pointer safe as well
* In the error messages being output, distinguish between a NULL pointer and an empty string

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2890 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 15:57:56 +00:00
Giel van Schijndel a44aa48f00 * Don't use a C99 variably sized struct member to store the filename of a track (instead a plain pointer will be used)
* Make sure to check for a NULL pointer __before__ passing it to strlen
 * Allow the loading of a track (in sound_LoadTrackFromFile), even if GetLastResourceFilename() returns a NULL pointer


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2889 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 15:16:51 +00:00
Per Inge Mathisen af40ffa1cb Convert fog code to PIELIGHT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2888 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 23:06:24 +00:00
Per Inge Mathisen fcf0fc8d21 More colour cleanup.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2886 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 22:38:22 +00:00
Per Inge Mathisen 1fd3e84133 Remove unused ALPHA_MODE
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2885 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 22:02:35 +00:00
Per Inge Mathisen 0265339de6 Remove unused TEX_CAP and TEX_MODE.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2884 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:55:40 +00:00
Per Inge Mathisen 7713623a64 Remove unused bilinear mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2883 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:47:57 +00:00
Giel van Schijndel 6172bdd498 * Refactor space trailing code in textdraw.c such that it is easier to read (also has some comments now which might help...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2882 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:43:16 +00:00
Per Inge Mathisen 4e25b2d0fe Make more use of PIELIGHT.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2880 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:15:08 +00:00
Freddie Witherden 05fdb3af34 Updated the network primitives functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2870 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 12:12:03 +00:00
Per Inge Mathisen 0d7d6dee26 Extend tagfile saves to cover droid movement information. Improve tagfile error reporting somewhat.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2868 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 22:23:40 +00:00
Per Inge Mathisen bacb7975b1 Add new tagfile method to read and write 32bit signed arrays. Fix error that
would interpret floating point arrays as 16bit.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2867 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 21:05:19 +00:00
Per Inge Mathisen b5fa689b41 Include SDL_opengl.h instead of GL/gl.h for better portability. This is vital
for Mac compilation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2864 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 16:41:00 +00:00
Dennis Schridde 9cc0a628c1 Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006:
- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 11:49:51 +00:00
Per Inge Mathisen 36c3cb1b6c Remove unused PIEVERTLIGHT. Retire iColour type in favour of PIELIGHT. Fix circular headers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2861 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-23 21:51:48 +00:00
Per Inge Mathisen 8475171be0 Remove iV colour defines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2860 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 21:29:28 +00:00
Per Inge Mathisen dadf2ffc00 Vastly improve edit box cursor. Fix improves on patch in bug #10270 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2857 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 20:13:50 +00:00
Per Inge Mathisen 8ad6ff9dc1 Remove double click for keyboard and mouse wheel. Patch by buginator in patch #851.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2854 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 18:51:54 +00:00
Per Inge Mathisen eeefdc0af0 Do not crash if filename to sound is not set. Modified version of patch #855 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2853 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 18:35:03 +00:00
Per Inge Mathisen a980ac2ffe Clean up gamelib, removing nearly empty maxpidef.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2850 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-21 23:06:31 +00:00
Giel van Schijndel 6083c030bf * revert (unnecessary r2843)
* make sure to #define _GNU_SOURCE when compiling on Unix systems with Code::Blocks


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2845 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 21:36:36 +00:00
Giel van Schijndel 027b9218a9 * Fix a potential compile error when using asprintf on non-Windows systems
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2843 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 21:18:33 +00:00
Per Inge Mathisen 904bfe5f3d Make some stuff static
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2842 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 20:41:13 +00:00
Per Inge Mathisen 345d335790 Reduce max radar zoom to 1, because a value of 2 is buggy. Replace
hard-coded radar size values with a slightly better define.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2841 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 21:32:35 +00:00
Per Inge Mathisen d8c8ee9ee1 Remove unused _iVPRIM_DIVTABLE table.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2838 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 20:09:01 +00:00
Per Inge Mathisen 647ae8810c Improve comments and documentation of tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2835 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 19:16:21 +00:00
Giel van Schijndel 1f2d5cbddf * Add a new debugging level LOG_SAVEGAME or "savegame"
* Add a large quantity of debug() calls to game.c
 * Correct some spelling errors in comments

Part of patch #853 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2826 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-15 18:32:07 +00:00
Per Inge Mathisen fb9d667895 Clean up screen.c - make globals static and remove unused vars.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2822 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 22:29:19 +00:00
Per Inge Mathisen f577a8f269 Remove unused screenGetSurface
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2821 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 21:05:45 +00:00
Per Inge Mathisen 50e99ae933 Remove unused pietexture.c|h files and references.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2820 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 19:51:04 +00:00
Giel van Schijndel 73307a762e * Lets use valid syntax shall we... (introduced in r2817)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2818 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:23:04 +00:00
Giel van Schijndel 714d117c71 * Add a concatenating variant of snprintf and vsnprintf, slcatprintf and vslcatprintf respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2817 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:14:27 +00:00
Per Inge Mathisen 66cee9b2d5 Add more sanity checking and error description to tagfile format at the
cost of even less sanity for whichever poor soul who reads this code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2816 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 18:47:48 +00:00
Giel van Schijndel b285cdea7d * Use vsnprintf instead of snprintf!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2809 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 19:03:30 +00:00
Giel van Schijndel 1bd1483944 * Use snprintf (in vasprintf) to determine the size of the string we're about to construct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2807 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:09:20 +00:00
Giel van Schijndel be25c4901b * Modify sasprintf to take this signature instead: "void sasprintf(char**, const char* fmt, ...)" (take in mind though that it is a macro!)
* Add some comments to sasprintf
 * Utilize sasprintf and asprintf in src/version.c to drastically cut back in code size and duplication


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2806 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:01:05 +00:00
Freddie Witherden 1b9b69048c Add a stack allocating version of sprintf
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2805 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:29:56 +00:00
Giel van Schijndel 6486b5270b * Add implementations of vasprintf and asprintf for Windows (GNU extensions to the C library that malloc the memory they need)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2804 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:12:13 +00:00
Giel van Schijndel 7711572f0a * Add a new module (printf_ext.c) to contain some printf extensions (C99 printf variants for MSVC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2803 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:58:10 +00:00
Giel van Schijndel a08e6f07f8 * Provide alloca() on GCC, MinGW and MSVC (and all other WZ_OS_UNIX compilers that provide <alloca.h>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2801 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:04:50 +00:00
Giel van Schijndel aef7af381e * Make function NETsetupTCPIP const correct
* Don't #include <unistd.h> in source:trunk/src/clparse.c as we don't need it
 * Rename a debug message to use the correct function name as prefix (bitimage.c)
 * Utilize snprintf instead of sprintf, at two locations


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2796 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:08:41 +00:00
Per Inge Mathisen ff13be0b96 Do not disable lighting if it was never enabled in the first place, to avoid
doing unnecessary OpenGL state changes. Also make sure we turn off normalization.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2778 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:56:14 +00:00
Dennis Schridde 1dd2b54431 wzglobal.h never belonged to Eidos. Instead large parts of the code are copied from Qt and thus belong to Trolltech.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2776 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:25:02 +00:00
Dennis Schridde 5ccaa17971 Correct WZ_CC_TINYC check. (Note the namechange!)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2775 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 12:10:54 +00:00
Dennis Schridde 3a56a479b3 - Extend compiler detection with TinyCC
- Add window system detection
- Remove MSDOS from supported OSes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2771 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 00:31:43 +00:00
Dennis Schridde 223bc803e8 Use OLD_TEXTURE_SIZE_FIX instead of 256.0f to scale texcoords, to make clear that this is a fix for the old ...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2759 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 17:43:50 +00:00
Dennis Schridde cc7840e866 change_int64_t_to_intptr_t.patch from patch #837 by <cybersphinx> Christian Ohm.
(Make WZ compile with the Tiny-C-Compiler by using the correct type for storing pointers as ints)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2757 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-08 23:11:59 +00:00
Giel van Schijndel 96d5054729 * Make sure to #include <stdio.h> when compiling on MSVC so that those inline replacements for snprintf and vsnprintf will actually compile....
* Lets terminate statements with a semi-colon!!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2745 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:36:37 +00:00
Giel van Schijndel 7b2530306c * On MSVC make sure to #define inline __before__ using it!!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2744 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:30:19 +00:00
Giel van Schijndel 92e013e406 * Add static inline functions vsnprintf and snprintf when compiling with MSVC
* These functions comply to the C99 specification and return the amount of characters they would have written if no truncation occurred
Slightly modified form of patch file #3146 attached to bug #10269 by Buginator; applied the changes of this patch to wzglobal.h instead of version.c


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2742 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 14:07:50 +00:00
Giel van Schijndel 93c387f1fb * Change "failed to open file" error message, when attempting to load a playlist, from LOG_ERROR to LOG_NEVER as it isn't a real error condition
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2717 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 18:45:57 +00:00
Giel van Schijndel 6268b6fff2 * Don't allocate memory in PlayList_Init() while we don't need it yet
* Make sure to set '''global''' pointers to NULL when free()ing them
 * Also set the "size" variables belonging to these pointers to zero
* Use a swap(a, b) style function for variable swapping (in PlayList_Shuffle()) rather than obfuscating code
* Make sure that PlayList_CurrentSong() and PlayList_NextSong() return "const char*" rather than "char*" to make sure no one touches memory he/she shouldn't
* Some general changes to conform with coding style (most notably: braces on a line of their own)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2712 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:14:24 +00:00
Giel van Schijndel aa4bb6c529 * Prevent a segfault occuring when quitting from warzone if a non-power of two number of tracks has been loaded into a playlist (due to uninitialized pointers)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2711 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:05:11 +00:00
Giel van Schijndel 7a01000da9 * Clean up some of the playlist code:
* Make PlayList_Read return a bool instead of char (using 'char' there was a perfect example of premature optimisation; to save memory most likely)
   * Remove macro CURRENT_TRACK which expanded to playlist[current_track] (it did _not_ increase readability)
   * Make sure to free resources from __all__ return paths from PlayList_Read
   * Check realloc's return value
   * Don't bitshift but multiply!
   * Make sure to follow coding style (in PlayList_Read)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2709 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:24:37 +00:00
Giel van Schijndel 5efc500f88 * Fix a bug where (in some cases) file names in the music.wpl playlist would be truncated
Bug reported by Jessicatz (on IRC)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2708 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:16:56 +00:00
Per Inge Mathisen e624663f40 Now that we draw water in a separate pass, we can reduce the number of state changes a lot.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2704 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:26:04 +00:00
Per Inge Mathisen 01e24bf6ed Clean up pieblitfunc. Dump dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:48:46 +00:00
Dennis Schridde 94136efe24 Revert to the non-global static_assert, since MSVC is not ready for the global one, yet.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2697 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 21:42:55 +00:00
Giel van Schijndel c76b591954 * In audio_StopAll() __always__ set psSample->psObj to NULL; this should fix bug #9233 (and bug #9927, which most likely is a duplicate, as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2684 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 02:07:25 +00:00
Giel van Schijndel e3b3379a83 * Replace malloc() calls immediately followed by memset(0) calls by calloc() calls instead
* Refactor a linked list iteration to for-loop
 * In audio_StopAll() check whether psSample->psObj is marked for deletion (i.e. audio_ObjectDead(psSample->psObj) returns true); if it is, set the pointer to NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2683 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 01:55:11 +00:00
Giel van Schijndel f69387aa93 * Ignore 4204 warning on MSVC (non-constant aggregrate initializer; aka non-constant struct initializer)
Patch by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2682 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 23:33:34 +00:00
Giel van Schijndel 533e7e92bf * Use spaces for line-out purposes (rather than tabs)
* Tune down the volume of the oil-pumps, power-spikes and power hums a bit, to make them less dominant (and annoying) (from patch #822 by Buginator)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2681 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:37:20 +00:00
Giel van Schijndel a316f10a0e * Don't save the volume with user volume preferences applied (instead save the track-volume so recomputing will be possible)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2680 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:19:06 +00:00
Giel van Schijndel 2f3e74a107 * Add include guards to source:trunk/lib/ivis_common/pievector.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2679 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:43:56 +00:00
Giel van Schijndel e19e8814b6 * Add a GPL (v2 or later) header to source:trunk/lib/ivis_common/pievector.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2678 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:41:04 +00:00
Per Inge Mathisen ec232d7e0f Actually use audio.cfg configuration of sound volume. Patch by Buginator in patch #822
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2677 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 18:47:22 +00:00
Per Inge Mathisen ccd725073e Add extra sanity checking to tagfile code to make it fail earlier rather than later.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2673 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 18:51:44 +00:00
Per Inge Mathisen 5567ae6e4b Add debug log call for tagfile errors.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2672 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 16:58:35 +00:00
Per Inge Mathisen 6e19e51118 Replace int x,y,z in TERRAIN_VERTEX with a Vector2i, and fix two cases of
type punned pointer casts.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2670 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 22:00:55 +00:00
Dennis Schridde 06a469ed5b Simplify Vector2f_Normalise and update docs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2669 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:43:55 +00:00
Per Inge Mathisen b99feff92f Merge PIEVERTEX and SVMESH into TERRAIN_VERTEX and use struct assignment instead of memcpy on it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2668 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:41:38 +00:00
Per Inge Mathisen fe27053bf7 Fix bug in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2664 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:51:02 +00:00
Per Inge Mathisen ec0836efdc Fix type punning warning where we cast an array as a struct pointer in netplay.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2663 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:49:39 +00:00
Per Inge Mathisen 81ccff31f7 Convert hash table to use 64 bit keys instead of 32 bit keys, since they are used
to store pointers.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2661 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:28:02 +00:00
Per Inge Mathisen c086e3c529 Clean up hash table code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2660 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:16:16 +00:00
Per Inge Mathisen 70718282a4 Fix shadows looking bad from opposite view direction of shadows, and fix
memory leak in shadow code reported in bug #10190.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2659 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 18:52:43 +00:00
Giel van Schijndel dcbef6f398 * Don't use variable array, structure members in RES_DATA
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2658 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:53:37 +00:00
Per Inge Mathisen d668738714 Vector normalization should not be carried out if vector length is zero, as this
would divide a vector by zero, which is bad. This closes bug #9739.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2654 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 16:20:55 +00:00
Giel van Schijndel 0374c67a12 * Add a doxygen comment to source:trunk/lib/framework/strlfuncs.h describing macro STR_L_FUNC_TRUNCATION_DETECT
* Replace (the last) strncpy() call in nettyps.c with a strlcpy() call


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2647 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 20:20:35 +00:00
Per Inge Mathisen 49df8ea371 Use GLC_TEXTURE for font rendering. Patch by Bertrand Coconnier in bug #10188.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2646 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:20:25 +00:00
Per Inge Mathisen e808d83f0c Add comment about quesoglc workaround being fixed upstream as of today.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2645 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:00:55 +00:00
Per Inge Mathisen 1d2caebccd Cleanup fugly code, and add nasty hack around weird bug. See bug #9843 for more info on bug.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2644 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:16:15 +00:00
Per Inge Mathisen 9609cb0005 Use full path to frame.h. Patch in bug #10208 by unknown.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2642 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 17:30:49 +00:00
Giel van Schijndel f5602b4778 * Replace a large amount of strncpy() calls with the safer strlcpy()
* Fix an error in src/game.c where we would use the wrong size as parameter to strlcpy()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2640 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:18:52 +00:00
Giel van Schijndel 613a38364e * Make resSetBaseDir const correct (char* -> const char*)
* Document the "fileName" parameter of makeLocaleFile in the Doxygen comment


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2639 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:12:00 +00:00
Per Inge Mathisen 1811aa0cdb Use secure version of snprintf on Windows (_snprintf_s).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2638 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:50:45 +00:00
Giel van Schijndel bd37e62cb2 * Replace a lot of strncat(dst, src, sizeof(dst) - strlen(dst) - 1) calls with the less bloated strlcat(dst, src, sizeof(dst)) form
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2637 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:47:17 +00:00
Giel van Schijndel 6b4cba1700 * Rename pLevelName to aLevelName (hungarian notation is a pain. Especially when it's wrong!)
* Get rid of several magic numbers
 * Some const correctness
 * Replace a huge amount of strcpy(), strcat(), strncpy() and strncat() calls with a strlcpy() and strlcat() calls respectively


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2635 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 14:35:35 +00:00
Per Inge Mathisen 94421b5b56 Clean up LOG_3D
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2634 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:58:01 +00:00
Per Inge Mathisen 9d5f31cbdd Clean up RPL reader, removing static memory buffer once RPL file is closed. Closes bug #10206.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2633 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 13:30:23 +00:00
Per Inge Mathisen 35bd80b426 Add missing braces after conditionals. Please follow proper coding style :-)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2632 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:29:45 +00:00
Per Inge Mathisen 8885cb207c Try to work around QuesoGLC bug that makes Warzone hang on chat output. Fixes bug #10202.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2631 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 23:25:32 +00:00
Giel van Schijndel 673812b2a4 * Add file strlfuncs.h; this file contains an inline implementation of strlcpy and strlcat (safer variants of strncpy and strncat respectively)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2627 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-26 17:05:29 +00:00
Dennis Schridde 20bc25c107 Windows MiniDumper: resultMessage is always null-terminated and MessageBox is always shown. => Move out of ifs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2626 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 23:32:20 +00:00
Dennis Schridde a923b6a000 Dump used compiler and version, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2625 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 23:23:21 +00:00
Giel van Schijndel e06c186bd6 * Replace a _lot_ of strcpy(), strcat() and sprintf() calls with the safer strncpy(), strncat() and snprintf() respectively
* Refactor NETlogEntry() to use the array of strings (packetname[]) instead of a large switch-statement with a lot of copy & pasted code


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2617 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 21:11:29 +00:00
Giel van Schijndel 3446fb2b87 * Remove __FILE__ prefix in debug() call as debug() apparently adds __FILE__ already (noted by Per)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2616 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 19:40:39 +00:00
Giel van Schijndel 329c6637d8 * Check malloc's return value
* Don't perform assertions on the content of uninitialized memory, it's useless and annoying when they fail


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2615 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 17:20:29 +00:00
Giel van Schijndel e6827605e2 * Fix a rather large memory leak as reported in bug #10190
* In this bug-report calling free() twice (once on psRes->aID then on psRes) was proposed
   * Instead just ''over allocate'' the memory for psRes so that a single free() call on psRes will suffice

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2614 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 16:54:53 +00:00
Per Inge Mathisen 6cf0e01f0b Add write and read methods for bools to tagfile framework. Remove enum write macro.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2599 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 20:21:18 +00:00
Per Inge Mathisen 9ec705bd9c Add new debug tag LOG_MAP
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2597 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-23 18:18:48 +00:00
Giel van Schijndel 95caee7a1f * Don't (re)initialize the text render module upon calling iV_Reset() anymore
* Remove iV_Reset() call from src/levels.c which is there only to prevent a crash caused by the *OLD* font rendering code
 * Make sure to initalize the font rendering module (by calling iv_TextInit()) in init.c:systemInitialize()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2593 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 22:51:44 +00:00
Dennis Schridde d5601ebc91 Found a version of the STATIC_ASSERT which also works in global scope.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2592 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 20:53:27 +00:00
Per Inge Mathisen ffc1f75aac Silence asserts going off on working separator tags in tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2589 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 20:09:55 +00:00
Per Inge Mathisen 3bd357ed08 Fix some mistakes and remove debug printfs from tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2587 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 19:33:47 +00:00
Per Inge Mathisen c9b25c5738 Add the tagfile framework that we will use for our new savegame format, and related
unit tests. First sketch of new defined savegame format in tagfile_map.def.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2586 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 18:40:34 +00:00
Dennis Schridde eff43d1fa1 Spelling mistake
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2556 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 21:07:10 +00:00
Dennis Schridde 8151788f14 Giel wants this to be commented...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2555 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 20:57:55 +00:00
Dennis Schridde ceb1a432bc Proper fix for ICC warning "argument is incompatible with corresponding format string conversion".
The fix which silenced the warning in r2550 was wrong.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2553 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 20:51:34 +00:00
Dennis Schridde c7b00fadaf More work on the ICC front:
- Less strict warnings in debug-mode (still unusable, because ICC warns about _a lot_)
- Explicit conversions
- Clarify parameter evaluation order


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2550 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 18:09:18 +00:00
Roman C d042bb5203 Fixed c99-style variable declaration in script_lexer.l
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2536 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 14:21:09 +00:00
Giel van Schijndel ad3f3442f6 * Fix a segfault introduced in r2532 which was triggered when loading *.slo scripts with #define directives in them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2533 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-06 14:22:49 +00:00
Giel van Schijndel f7e793cf31 * Load SCRIPT files (*.slo) directly from their files rather than an intermediate memory buffer
* In function dataScriptLoad, make "printHack" a "static const" instead of a local non-const variable (emphasizes that it really is a compile-time constant; also towards the compiler btw, GCC treats a static const var as a preprocessor macro with static type checking)
 * Move global variables pScrInputFiles (formerly pScrInputBuffer), scr_include_stack_ptr, scr_num_macros, scr_macro_stack_ptr, pScrMacroBuffer and scrInclLine from script_parser.y to script_lexer.l and mark them static to disallow external linkage (to make it a little bit better encapsulated and localised)
 * Make function scriptCompile return a SCRIPT_CODE* pointer instead of a BOOL and writing the same pointer into an output pointer (instead upon failure it now returns NULL)
 * Move some of the functionality of scriptCompile to new function scriptSetInputFile instead (which is based upon scriptSetInputBuffer)
 * Modify script_lexer.l to read include files directly from the files rather than an intermediate memory buffer (by means of a modified YY_INPUT macro)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2532 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-05 22:44:18 +00:00
Giel van Schijndel 3ebad628ca * Allow QuesoGLC to fall back to a random font when we failed to load any fonts
* This should fix _the_symptoms_ of bug #10117

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2530 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-05 17:06:20 +00:00
Giel van Schijndel 9d9370e13c * Make anti-aliassing of text optional (for slower systems); it's turned on by default though (option "textantialiassing")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2529 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 21:29:16 +00:00
Giel van Schijndel 7835b437e7 * Wait until *after* font-selection (selection occurs after loading) with dumping the font-face list (otherwise an empty font-face list is always shown)
* Dump the font-face list on LOG_NEVER instead of LOG_ERROR
 * Write an error to LOG_ERROR when the required font couldn't be loaded (currently hardcoded as "DejaVu Sans Mono")

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2528 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 19:43:38 +00:00
Dennis Schridde 87d55b978b Basic buildfile support for ICC and silence one warning.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2524 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-02 21:43:43 +00:00
Giel van Schijndel d075832459 * Add font rendering and UTF-8 support through usage of QuesoGLC (an OpenGLC implementation);
* This _will_ require you to install http://quesoglc.sourceforge.net/ on your system to be able to compile (windows binaries are provided on the sourceforge download page as well; just dump them in wz's devpackage directory for now)
 * Currently the font render code is hard-coded to select two fonts: DejaVu Sans Mono regular style (aka "Book") or bold style; if you're package manager doesn't provide these fonts (Debian and derivatives have "ttf-dejavu"), you can get them from http://dejavu.sourceforge.net/

This closes #1 (https://trac.mortis.eu/warzone/ticket/1 I dumped/maintained my patch there)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2521 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 19:45:49 +00:00
Roman C e5f977e0f1 Scripting engine:
-increased possible length of a macro name

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2493 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-29 14:41:46 +00:00
Roman C 6daca4513a Fixed a C99-style for loop.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2482 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-27 12:23:23 +00:00
Giel van Schijndel 97192c00cb * Fix wrong indentation style used in r2480
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2481 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:57:06 +00:00
Giel van Schijndel a8bfacf6ed * Rename iV_DrawText to iV_DrawTextRotated and create a static inline function iV_DrawText which calls iV_DrawTextRotated with rotation=0.f
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2480 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:40:56 +00:00
Giel van Schijndel 470ea85417 * Remove lib/framework/utf8.c[ch] as we don't need it just right now (we can always revert this commit later on if necessary)
* This commit removes utf8.[ch] from all build systems (manual text-editing for the most of them)
 * For the removal from the XCode project I just reverted r2288

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2477 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 19:46:10 +00:00
Giel van Schijndel ebe882625f * Fix doxygen comment
* Fix indentation

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2468 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-23 21:43:57 +00:00
Dennis Schridde 47dc79ee1e Formating to match EvilGuru's current version. (14)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2463 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-21 20:43:15 +00:00
Dennis Schridde 6627ecbc6a Fix "incompatible declarations" found by batched compiling.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2460 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-16 14:05:01 +00:00
Giel van Schijndel 9db9ca51ea * Add Doxygen comments to lib/framework/strnlen1.h
* Fix some errors in lib/framework/utf8.h comments


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2459 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-15 23:37:32 +00:00
Roman C 5d39df302d Added more phrases recognized by 1.10 and Aivolution AIs as help requests.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2432 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-24 13:21:31 +00:00
Dennis Schridde 274abd14ca Fix WZ_DECL_FORMAT for non >=gcc-2.5
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2430 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-22 18:04:07 +00:00
Dennis Schridde 63a38d0da9 Include unistd.h for MinGW as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2428 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 14:52:50 +00:00
Dennis Schridde 20fe87c0f4 AM: Add lexers to BUILT_SOURCES and CLEAN_FILES as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2427 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 13:16:09 +00:00
Dennis Schridde e232e9a6b5 Yacc warning fixes by Pseudonym404 (http://forums.wz2100.net/index.php?topic=148.msg7837#msg7837):
- adding *.tab.c to BUILD_SOURCES and CLEANFILES before *.tab.h in applicable Makefile.am files causes *.tab.c to be the file that triggers the %.tab.h %.tab.c: %.y rule, resulting in the command run being "bison -y  -d -o[...].tab.c [...].y", not "bison -y  -d -o[...].tab.h [...].y", which (aside from being correct syntax Wink ) stops "warning: conflicting outputs to file `[...].tab.h'"
- chat_parser.y had %token _T_A declared twice, second instance removed
- audp_parser.y had trailing | signs (presumably from when NULL wasn't commented out)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2426 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 13:03:09 +00:00
Dennis Schridde fbd3a9c394 Use Unix PATH_MAX as default and thus move all "fixes" to Windows.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2425 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 12:59:05 +00:00
Dennis Schridde 08a43494fd - Clean up macros a bit more
- Use WZ_CC_GNU_PREREQ (copied from glibc's features.h) instead of custom code
- Move platform.h into wzglobal.h


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2424 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 12:30:00 +00:00
Dennis Schridde 3d6d40f5dd - Update WZ_OS_/WZ_CC_ definitions from Qt 4.3.1 and don't strip OS detection them anymore.
- Fix attribute prerequisites.
- Remove wz__attribute and add WZ_DECL_FORMAT.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2423 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 11:21:20 +00:00
Dennis Schridde 51a467d649 Remove CHAR_BIT check which is not needed anymore.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2422 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-21 10:43:16 +00:00
Giel van Schijndel b5e548e800 * Use a union instead of first casting to void* before casting to uint32_t* from float* (prevents type punning of pointers)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2412 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 22:17:16 +00:00
Giel van Schijndel 94db796167 * Fix a typo in nettypes.c this should fix bug #9791
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2405 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 17:54:26 +00:00
Giel van Schijndel 7e3d161574 * Add BOOL NETfloat(float* fp) to nettypes.h so that it can actually be used
* Fix a spelling error in a comment in nettypes.c


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2402 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 14:02:17 +00:00
Giel van Schijndel 52bc608d17 * Fix MSVC compilation by assuming all platforms supported by MSVC provide IEEE754 floats
This fixes bug #9791

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2401 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 11:37:39 +00:00
Dennis Schridde 8334d13138 Prevent a symbol conflict of our DATADIR with that from /usr/mingw32/mingw/include/objidl.h via lean-and-mean.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2389 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 20:12:46 +00:00
Giel van Schijndel 551aa55cb9 * Use SDL_EnableKeyRepeat to enable the repeation of key press events (this enables you to press your 'A' key once and get multiple 'A's if your in a textbox)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2380 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 09:30:50 +00:00
Giel van Schijndel 29c1229322 * Prevent a warning about "dereferencing type-punned pointer will break strict-aliasing rules" by casting a &float through a void* before casting it to uint32_t*
* Add an explanation about floats (that they're basically the same as 32bit integers as far as endianness conversions are concerned)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2379 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 09:09:30 +00:00
Giel van Schijndel 1ee0356036 * Adapt the writeFXData and readFXData functions to use the PHYSFS big endian swapping write and read functions
* Don't write directly from the memory of the EFFECTs (since this memory doesn't always have the same size on 32vs64bit systems)
 * Guarantee to always write the IMD's hash number as if it's a uint32_t (this fixes 64bit compatibility of these functions)
 * Add functions openLoadFile and openSaveFile which perform the file opening for loadFile2 and saveFile and now readFXData and writeFXData as well

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2378 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-15 21:26:05 +00:00
Giel van Schijndel 707e156265 * Fix warning about "null argument where non-null required"
* Turn macro ALLOC_VARIDENTDECL partially into a static inline function
 * Remove -Wno-nonnull since this warning shouldn't appear anymore now
Patch by pseudonym404 with some changes by me ( http://forums.wz2100.net/index.php?topic=148.msg7723#msg7723 )

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2377 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-14 19:24:29 +00:00
Roman C 65866c3012 Increase number of allowed texture pages from 64 to 128 for now.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2375 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-13 10:48:32 +00:00
Roman C c1f1288f53 Turn some ASSERTs into debug(LOG_ERROR, ... )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2371 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-13 10:35:18 +00:00
Dennis Schridde 0cf8a9af36 Update dbghelp.h to Wine 0.9.43.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2370 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-12 01:03:38 +00:00
Giel van Schijndel 74e64738fa * Add network primitives by Freddie Witherden <EvilGuru>
* Modify them slighly to use get/set functions for the package direction (instead of a global accessable to all files which forward declare it)
 * Add a NETfloat to the set of primitives
 * Modify NETstring to use strnlen1 instead of strnlen which is a GNU extension to the C library (strnlen1 has been copied from gettext 0.16.1 which is GPLv2+)
NB: rerun your buildsystems
NB2: Xcode requires an update

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2358 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 18:50:28 +00:00
Giel van Schijndel 0d901ea836 * Merge fixes for bug #9694 and bug #9704 which where fixed in r2349 and r2355 respectively from the 2.0 branch into trunk
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2356 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 11:23:21 +00:00
Giel van Schijndel 609d953a63 * Remove forward declarations for undefined functions iV_CreateFont, pie_StartTextExtents and pie_FillTextExtents
* Remove unused functions pie_SetFormattedTextFlags and pie_GetFormattedTextFlags
 * Move constants PIE_TEXT_WHITE_COLOUR, PIE_TEXT_LIGHTBLUE_COLOUR and PIE_TEXT_DARKBLUE_COLOUR from header file to implementation file
 * Remove global var FFlags which only ever had one value (FTEXT_SKIP_TRAILING_SPACES)
 * Remove global var ExtentsMode which only ever had one value (EXTENTS_USEMAXWIDTH) and remove all if-statements which never matched (remove the conditional part from the parts that always matched)
 * Remove #ifdef _TESTBED code since _TESTBED is never defined (not in commented out code either)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2346 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-06 11:22:31 +00:00
Giel van Schijndel 76057072e0 * remove function stringLen and replace all instances where it was used with strlen (can't see why anyone would want a custom string length function there in the first place)
* make strresStoreString const correct ("char*" -> "const char*")

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2345 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-05 12:06:56 +00:00
Per Inge Mathisen 33e7c70cc4 Cleanup. Remove another ton of unused code. Fix error message which is not an error.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2339 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-03 17:39:04 +00:00
Per Inge Mathisen 0266477bd9 Add new debug category: gui
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2338 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-03 16:24:17 +00:00
Per Inge Mathisen 8a7d09141c Hopefully fix a valgrind warning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2336 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-03 15:22:45 +00:00
Giel van Schijndel 33354163a9 * rename pie_DrawText and pie_DrawFromattedText to iV_DrawText and iV_DrawFormattedText respectively for consistency's sake (iV_DrawText already existed as a #define "alias")
* replace all usages of iV_DrawText270(...) with iV_DrawTextRotated(..., 270.f) and get rid of MACRO iV_DrawText270


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2333 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-03 13:14:34 +00:00