91c7638ddb
Check malloc's return value
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5294 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:35 +00:00
8987ee3aff
Slight refactoring to return as soon as possible, thus not damaging code-readability by large amounts of scope-nesting (specifically if-branches)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5293 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:29 +00:00
952cd00d05
Only iterator over the linked list `songList` once to determine the end. Then store a pointer to the last ->next pointer and use it to append to the list instead.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5292 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:26 +00:00
f7ead00bb0
* Don't use strtok to separate out lines from files as the line reading loop already takes care of that
...
* Remove now double variable filename and rename line_buf to filename
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5291 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:21 +00:00
d3123eaac4
Fix issue in patch #1075 - use "/" separator for physfs paths.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5282 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 16:35:24 +00:00
a1c47bccf8
patch #1075 : Simplify playlist code. Thanks to Giel for patch review.
...
The playlist file is no a simple list of files to play during the game.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5281 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 15:40:56 +00:00
c9b9e98dc9
Fix "Create default playlist file; This is an ugly HACK which should be FIXME'd into oblivion some other time" by adding a default playlist file to base.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5263 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:25:35 +00:00
925c3daced
Quick fix for crash if --nosound is used together with a soundtrack file
...
(which is now created by default). Someone should look more carefully at
this code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5262 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 16:29:10 +00:00
1c3835ce23
Add original music soundtracks. If you have a playlist already, you need to delete it
...
or add the music to it manually.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5261 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-17 19:32:17 +00:00
5828b26a10
* Add functions for changing the volume of an already created AUDIO_STREAM: sound_GetStreamVolume and sound_SetStreamVolume
...
* Use these functions in cdaudio.c to change the volume of the currently playing AUDIO_STREAM in function sound_SetMusicVolume
This fixes bug #11579 ("Music volume slider dont work")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5101 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 14:01:25 +00:00
44986c3473
* Make sure to actually set the volume of an AUDIO_STREAM we're creating
...
* Indentation fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5100 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 13:50:08 +00:00
4a17aeeec7
* Delete unused and empty function StartTacticalScroll()
...
* Mark the parameters for several functions as WZ_DECL_UNUSED (for those functions that require the parameter as part of their interface)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 17:17:50 +00:00
85d51e6a32
Rather than pretending that our UserMusicPath isn't hardcoded, lets just admit it and make it a `static const char`
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4576 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 21:31:29 +00:00
274ae7c9a4
Enforce strict function prototypes for autoconf builds, and fix function prototype problems.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:34:55 +00:00
35233a1f9b
Added a sound for beacons (based on ecmtower.ogg). Use f12 to make wz take you to the beacon location.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4450 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 18:25:58 +00:00
359efe39ac
Const fix
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:09:32 +00:00
10f2ccfd56
TRUE->true, FALSE->false (except in scripts)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4311 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:51:17 +00:00
a1008c093d
Reduce amount of junk in the MSVC compilation output by about 70%.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4279 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 22:15:28 +00:00
8d15dc2ba1
* Log a warning when we've just decoded an empty OggVorbis track
...
* On DEBUG builds free() the memory associated with that track and return NULL (which __will__ cause program termination if it occurs)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4254 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 16:14:28 +00:00
87f3224fa6
The preprocessor checks never really worked...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4249 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 15:16:29 +00:00
2537bfc61c
Cleanup #includes a bit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:39:08 +00:00
74bb1a185b
Revert r4061 (accidential commit)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 15:04:27 +00:00
7e93a664b8
Move packaging -> pkg
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:57:35 +00:00
cb2f0a30df
Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
33216b2e9d
Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:50:58 +00:00
d8409c9819
- Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
...
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
9f44219b1c
Move addition of CFLAGS from configure.ac to the places they are actually needed.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
3858daf4a1
Reset MSVC version from 9 to 8, since otherwise MSVC8 will refuse to load the project files. (bug #11219 )
...
Does MS provide some kind of templating system? Like autotools generate Makefiles from Makefile.am.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3950 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 11:28:40 +00:00
d3455b699a
Properly set include/library directories for MSVC
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3949 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 01:45:45 +00:00
da462b4511
More float specialisation and generic cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3937 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 12:42:42 +00:00
3e2af0fc87
Don't assert on unused sound IDs as that's a valid condition sound is disabled; fixes bug #10989
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3809 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 22:22:21 +00:00
491b968833
* Make cdAudio_PlayTrack work with an enum instead of "magic numbers"
...
* Use this enum's values throughout the src/* code
* Replace scripting function playCDAudio(int) by playIngameCDAudio() which is equivalent to cdAudio_PlayTrack(playlist_ingame)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:46:55 +00:00
8fe5f93991
Add a workaround/hack to prevent starting of new songs when we switch playlists
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3686 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:35:34 +00:00
1513ac41e2
Because g_apTrack's size is determined on compile time don't allocate it dynamically but statically
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3678 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 12:25:18 +00:00
cdb9b7bacc
Properly wrap the dummy reference. This issue does not only exist on the Mac and was fixed wrongly in r3659.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 21:38:43 +00:00
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
aafbc90945
Don't use C99 variable struct members
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3632 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 22:12:25 +00:00
7c204a47ac
Change file-specific comment in Doxygen comment
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3631 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:56:02 +00:00
6e74be4df9
Use C linkage for frameresource.h and debug.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3629 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 21:26:37 +00:00
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
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
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
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
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
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
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
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
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
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
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
Giel van Schijndel
Per Inge Mathisen
Dennis Schridde
Roman C